2319 files changed, 41222 insertions, 46671 deletions

diff --git a/helpcontent2/source/text/sbasic/guide/control_properties.xhp b/helpcontent2/source/text/sbasic/guide/control_properties.xhp
index cc97afaaf0..daf0423632 100755
--- a/helpcontent2/source/text/sbasic/guide/control_properties.xhp
+++ b/helpcontent2/source/text/sbasic/guide/control_properties.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: control_properties.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/guide/create_dialog.xhp b/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
index b8816ea03d..3b007cfda9 100755
--- a/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
+++ b/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: create_dialog.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/guide/insert_control.xhp b/helpcontent2/source/text/sbasic/guide/insert_control.xhp
index 1757e87e8a..58e0ccce9a 100755
--- a/helpcontent2/source/text/sbasic/guide/insert_control.xhp
+++ b/helpcontent2/source/text/sbasic/guide/insert_control.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_control.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/guide/makefile.mk b/helpcontent2/source/text/sbasic/guide/makefile.mk
index 25ae34a978..e5cfd3fe02 100644
--- a/helpcontent2/source/text/sbasic/guide/makefile.mk
+++ b/helpcontent2/source/text/sbasic/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,4 +54,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sbasic/guide/sample_code.xhp b/helpcontent2/source/text/sbasic/guide/sample_code.xhp
index d53693cf4e..dbb58a193b 100644
--- a/helpcontent2/source/text/sbasic/guide/sample_code.xhp
+++ b/helpcontent2/source/text/sbasic/guide/sample_code.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sample_code.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/guide/show_dialog.xhp b/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
index 03d0db05eb..131ac39702 100755
--- a/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
+++ b/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: show_dialog.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/guide/translation.xhp b/helpcontent2/source/text/sbasic/guide/translation.xhp
index 03e6ef33a6..28260118df 100644
--- a/helpcontent2/source/text/sbasic/guide/translation.xhp
+++ b/helpcontent2/source/text/sbasic/guide/translation.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: translation.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,11 +49,11 @@
 <paragraph role="paragraph" id="par_id4601940" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Language toolbar in the Basic IDE dialog editor shows controls to enable and manage localizable dialogs.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9538560" xml-lang="en-US" l10n="NEW">By default, any dialog that you create only contains string resources for one language. You may want to create dialogs that automatically show localized strings according to the user's language settings.</paragraph><comment>current language listbox</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:CurrentLanguage" id="bm_id9421979" localize="false"/><paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the language for the strings that you want to edit. Click the Manage Languages icon to add languages.</ahelp></paragraph><comment>Manage Language icon is in sbasic/shared/02/20000000.xhp</comment><comment>present languages box in manage user interface language dialog</comment>
-<bookmark xml-lang="en-US" branch="hid/basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE" id="bm_id1646778" localize="false"/><paragraph role="paragraph" id="par_id71413" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click a language, then click Default to set the language as default, or click Delete to remove the language from the list.</ahelp></paragraph><comment>add</comment>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_ADD_LANG" id="bm_id1228370" localize="false"/><paragraph role="paragraph" id="par_id2924283" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can add a language to the list.</ahelp></paragraph><comment>delete</comment>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_DEL_LANG" id="bm_id1601611" localize="false"/><paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a language in the list and click Delete to remove that language. When you remove all languages, the string resources for localizable dialogs are removed from all dialogs in the current library.</ahelp></paragraph><comment>default</comment>
-<bookmark xml-lang="en-US" branch="hid/1343590917" id="bm_id733359" localize="false"/><paragraph role="paragraph" id="par_id6942045" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a language in the list and click Default to set the language as default language.</ahelp></paragraph><comment>set default user interface dialog</comment>
-<bookmark xml-lang="en-US" branch="hid/basctl_ListBox_RID_DLG_SETDEF_LANGUAGE_LB_DEF_LANGUAGE" id="bm_id879848" localize="false"/><paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The default language will be used as a source for all other language strings.</ahelp></paragraph><comment>available languages box</comment>
+<bookmark xml-lang="en-US" branch="hid/basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE" id="bm_id1646778" localize="false"/><paragraph role="paragraph" id="par_id71413" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click a language, then click Default to set the language as default, or click Delete to remove the language from the list.</ahelp></paragraph><comment>add</comment>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG" id="bm_id1228370" localize="false"/><paragraph role="paragraph" id="par_id2924283" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can add a language to the list.</ahelp></paragraph><comment>delete</comment>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG" id="bm_id1601611" localize="false"/><paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a language in the list and click Delete to remove that language. When you remove all languages, the string resources for localizable dialogs are removed from all dialogs in the current library.</ahelp></paragraph><comment>default</comment>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT" id="bm_id733359" localize="false"/><paragraph role="paragraph" id="par_id6942045" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a language in the list and click Default to set the language as default language.</ahelp></paragraph><comment>set default user interface dialog</comment>
+<bookmark xml-lang="en-US" branch="hid/basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE" id="bm_id879848" localize="false"/><paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The default language will be used as a source for all other language strings.</ahelp></paragraph><comment>available languages box</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_ADDNEW_CONTROL" id="bm_id8675191" localize="false"/><paragraph role="paragraph" id="par_id5806756" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Add UI languages for your dialog strings.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6596881" xml-lang="en-US" level="2" l10n="NEW">To enable localizable dialogs</paragraph>
 <list type="ordered">
diff --git a/helpcontent2/source/text/sbasic/shared/00000002.xhp b/helpcontent2/source/text/sbasic/shared/00000002.xhp
index c44602ddee..832a5fe1c9 100755
--- a/helpcontent2/source/text/sbasic/shared/00000002.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000002.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ fpe: added sections and sort element</lastedited>
 </section>
 <section id="measurementunits">
 <paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="32">Measurement Units</paragraph>
-<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <emph>Tools - Options - (Document Type) - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - (Document Type) - General</emph>.</paragraph>
 </section>
 <section id="twips">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145801"><bookmark_value>twips; definition</bookmark_value>
diff --git a/helpcontent2/source/text/sbasic/shared/00000003.xhp b/helpcontent2/source/text/sbasic/shared/00000003.xhp
index 9b6555c96e..32716ba271 100755
--- a/helpcontent2/source/text/sbasic/shared/00000003.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000003.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000003.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <body>
 <paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="1" l10n="U" oldref="1">Information</paragraph>
 <section id="languageformat">
-<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <emph>Tools - Options - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph>
+<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph>
 <paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="103">The same applies to the locale settings for date, time and currency formats. The Basic format code will be interpreted and displayed according to your locale setting.</paragraph>
 </section>
 <section id="farbcodes">
diff --git a/helpcontent2/source/text/sbasic/shared/01/06130000.xhp b/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
index 090992be04..41dc97e002 100644
--- a/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01/06130100.xhp b/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
index ee9cd92b78..03e8c94886 100755
--- a/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01/06130500.xhp b/helpcontent2/source/text/sbasic/shared/01/06130500.xhp
index bce658d1f7..cf4fe4f528 100755
--- a/helpcontent2/source/text/sbasic/shared/01/06130500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01/06130500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01/makefile.mk b/helpcontent2/source/text/sbasic/shared/01/makefile.mk
index 5147038f19..c17f2a509f 100644
--- a/helpcontent2/source/text/sbasic/shared/01/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,4 +51,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sbasic/shared/01000000.xhp b/helpcontent2/source/text/sbasic/shared/01000000.xhp
index d5f08d6138..e9f738b09d 100755
--- a/helpcontent2/source/text/sbasic/shared/01000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01010210.xhp b/helpcontent2/source/text/sbasic/shared/01010210.xhp
index bee528d63a..fddc3d2f46 100755
--- a/helpcontent2/source/text/sbasic/shared/01010210.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01010210.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010210.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01020000.xhp b/helpcontent2/source/text/sbasic/shared/01020000.xhp
index 87d9636476..4d279767c8 100755
--- a/helpcontent2/source/text/sbasic/shared/01020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01020100.xhp b/helpcontent2/source/text/sbasic/shared/01020100.xhp
index 507ef93204..7bcd2aec69 100644
--- a/helpcontent2/source/text/sbasic/shared/01020100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01020200.xhp b/helpcontent2/source/text/sbasic/shared/01020200.xhp
index ea57d068db..fe16a12953 100644
--- a/helpcontent2/source/text/sbasic/shared/01020200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01020300.xhp b/helpcontent2/source/text/sbasic/shared/01020300.xhp
index cc98e3aa4a..1fdab31905 100644
--- a/helpcontent2/source/text/sbasic/shared/01020300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01020500.xhp b/helpcontent2/source/text/sbasic/shared/01020500.xhp
index 1c8f92c1cf..20f63a63d5 100755
--- a/helpcontent2/source/text/sbasic/shared/01020500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01030000.xhp b/helpcontent2/source/text/sbasic/shared/01030000.xhp
index d6f194ff91..d1e7029460 100755
--- a/helpcontent2/source/text/sbasic/shared/01030000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01030100.xhp b/helpcontent2/source/text/sbasic/shared/01030100.xhp
index 0f512cd206..852ba31eae 100755
--- a/helpcontent2/source/text/sbasic/shared/01030100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01030200.xhp b/helpcontent2/source/text/sbasic/shared/01030200.xhp
index 53eb10bbab..28a67a43ef 100644
--- a/helpcontent2/source/text/sbasic/shared/01030200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030200.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01030300.xhp b/helpcontent2/source/text/sbasic/shared/01030300.xhp
index c761434804..d4b837bea2 100755
--- a/helpcontent2/source/text/sbasic/shared/01030300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01030400.xhp b/helpcontent2/source/text/sbasic/shared/01030400.xhp
index 93cba25b83..e5511db637 100755
--- a/helpcontent2/source/text/sbasic/shared/01030400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030400.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01040000.xhp b/helpcontent2/source/text/sbasic/shared/01040000.xhp
index e6084ada87..abc97dffa8 100755
--- a/helpcontent2/source/text/sbasic/shared/01040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01040000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,215 +29,212 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsbasicshared01040000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Event-Driven Macros</title>
-<filename>/text/sbasic/shared/01040000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-31T11:55:04">converted from old format - fpe
-dedr: fixed #i30797#</lastedited>
-</history>
-</meta>
-<body>
-<section id="weitere">
+      <topic id="textsbasicshared01040000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Event-Driven Macros</title>
+         <filename>/text/sbasic/shared/01040000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="weitere">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154581"><bookmark_value>deleting; macro assignments to events</bookmark_value>
-<bookmark_value>macros; assigning to events</bookmark_value>
-<bookmark_value>assigning macros to events</bookmark_value>
-<bookmark_value>events; assigning macros</bookmark_value>
+         <bookmark_value>macros; assigning to events</bookmark_value>
+         <bookmark_value>assigning macros to events</bookmark_value>
+         <bookmark_value>events; assigning macros</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/01040000.xhp" name="Event-Driven Macros">Event-Driven Macros</link></paragraph>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="2">This section describes how to assign Basic programs to program events.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149263" xml-lang="en-US" l10n="U" oldref="4">You can automatically execute a macro when a specified software event occurs by assigning the desired macro to the event. The following table provides an overview of program events and at what point an assigned macro is executed.</paragraph>
-<table id="tbl_id3148646">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="5">Event</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="6">An assigned macro is executed...</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="7">Program Start</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="8">... after a $[officename] application is started.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146914" xml-lang="en-US" l10n="U" oldref="9">Program End</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153765" xml-lang="en-US" l10n="U" oldref="10">...before a $[officename] application is terminated.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145150" xml-lang="en-US" l10n="U" oldref="11">Create Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="12">...after a new document is created with <emph>File - New</emph> or with the <emph>New</emph> icon.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="13">Open Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154572" xml-lang="en-US" l10n="U" oldref="14">...after a document is opened with <emph>File - Open</emph> or with the <emph>Open</emph> icon.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153266" xml-lang="en-US" l10n="U" oldref="15">Save Document As</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150208" xml-lang="en-US" l10n="U" oldref="16">...before a document is saved under a specified name (with <emph>File - Save As</emph>, or with <emph>File - Save</emph> or the <emph>Save</emph> icon, if a document name has not yet been specified).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3158215" xml-lang="en-US" l10n="U" oldref="43">Document has been saved as</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150980" xml-lang="en-US" l10n="U" oldref="44">... after a document was saved under a specified name (with <emph>File - Save As</emph>, or with <emph>File - Save</emph> or with the <emph>Save</emph> icon, if a document name has not yet been specified).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="17">Save Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="18">...before a document is saved with <emph>File - Save</emph> or the <emph>Save</emph> icon, provided that a document name has already been specified.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149404" xml-lang="en-US" l10n="U" oldref="45">Document has been saved</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151332" xml-lang="en-US" l10n="U" oldref="46">...after a document is saved with <emph>File - Save</emph> or the <emph>Save</emph> icon, provided that a document name has already been specified.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="19">Close Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146868" xml-lang="en-US" l10n="U" oldref="20">...before a document is closed.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159097" xml-lang="en-US" l10n="U" oldref="47">Document is being closed</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148606" xml-lang="en-US" l10n="U" oldref="48">...after a document was closed. Note that the "Save Document" event may also occur when the document is saved before closing.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3144772" xml-lang="en-US" l10n="U" oldref="21">Activate Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149442" xml-lang="en-US" l10n="U" oldref="22">...after a document is brought to the foreground.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150888" xml-lang="en-US" l10n="U" oldref="23">Deactivate Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="24">...after another document is brought to the foreground.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152384" xml-lang="en-US" l10n="U" oldref="25">Print Document</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152873" xml-lang="en-US" l10n="U" oldref="26">...after the <emph>Print</emph> dialog is closed, but before the actual print process begins.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159227" xml-lang="en-US" l10n="U" oldref="49">JavaScript run-time error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145362" xml-lang="en-US" l10n="U" oldref="50">...when a JavaScript run-time error occurs.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154767" xml-lang="en-US" l10n="U" oldref="27">Print Mail Merge</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153555" xml-lang="en-US" l10n="U" oldref="28">...after the <emph>Print</emph> dialog is closed, but before the actual print process begins. This event occurs for each copy printed.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156366" xml-lang="en-US" l10n="U" oldref="51">Change of the page count</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154627" xml-lang="en-US" l10n="U" oldref="52">...when the page count changes.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154737" xml-lang="en-US" l10n="U" oldref="53">Message received</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150952" xml-lang="en-US" l10n="U" oldref="54">...if a message was received.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3147348" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/01040000.xhp" name="Event-Driven Macros">Event-Driven Macros</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146120" role="paragraph" l10n="U" oldref="2">This section describes how to assign Basic programs to program events.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149263" role="paragraph" l10n="U" oldref="4">You can automatically execute a macro when a specified software event occurs by assigning the desired macro to the event. The following table provides an overview of program events and at what point an assigned macro is executed.</paragraph>
+      <table id="tbl_id3148646">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148455" role="tablehead" l10n="U" oldref="5">Event</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145799" role="tablehead" l10n="U" oldref="6">An assigned macro is executed...</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149379" role="tablecontent" l10n="U" oldref="7">Program Start</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150715" role="tablecontent" l10n="U" oldref="8">... after a $[officename] application is started.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146914" role="tablecontent" l10n="U" oldref="9">Program End</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153765" role="tablecontent" l10n="U" oldref="10">...before a $[officename] application is terminated.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145150" role="tablecontent" l10n="U" oldref="11">Create Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3163808" role="tablecontent" l10n="U" oldref="12">...after a new document is created with <emph>File - New</emph> or with the <emph>New</emph> icon.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145790" role="tablecontent" l10n="U" oldref="13">Open Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154572" role="tablecontent" l10n="U" oldref="14">...after a document is opened with <emph>File - Open</emph> or with the <emph>Open</emph> icon.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153266" role="tablecontent" l10n="U" oldref="15">Save Document As</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150208" role="tablecontent" l10n="U" oldref="16">...before a document is saved under a specified name (with <emph>File - Save As</emph>, or with <emph>File - Save</emph> or the <emph>Save</emph> icon, if a document name has not yet been specified).</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3158215" role="tablecontent" l10n="U" oldref="43">Document has been saved as</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150980" role="tablecontent" l10n="U" oldref="44">... after a document was saved under a specified name (with <emph>File - Save As</emph>, or with <emph>File - Save</emph> or with the <emph>Save</emph> icon, if a document name has not yet been specified).</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150519" role="tablecontent" l10n="U" oldref="17">Save Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="18">...before a document is saved with <emph>File - Save</emph> or the <emph>Save</emph> icon, provided that a document name has already been specified.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149404" role="tablecontent" l10n="U" oldref="45">Document has been saved</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151332" role="tablecontent" l10n="U" oldref="46">...after a document is saved with <emph>File - Save</emph> or the <emph>Save</emph> icon, provided that a document name has already been specified.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159171" role="tablecontent" l10n="CHG" oldref="19">Document is closing<comment>i104852</comment></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146868" role="tablecontent" l10n="U" oldref="20">...before a document is closed.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159097" role="tablecontent" l10n="CHG" oldref="47">Document closed</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148606" role="tablecontent" l10n="U" oldref="48">...after a document was closed. Note that the "Save Document" event may also occur when the document is saved before closing.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144772" role="tablecontent" l10n="U" oldref="21">Activate Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149442" role="tablecontent" l10n="U" oldref="22">...after a document is brought to the foreground.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150888" role="tablecontent" l10n="U" oldref="23">Deactivate Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154060" role="tablecontent" l10n="U" oldref="24">...after another document is brought to the foreground.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152384" role="tablecontent" l10n="U" oldref="25">Print Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152873" role="tablecontent" l10n="U" oldref="26">...after the <emph>Print</emph> dialog is closed, but before the actual print process begins.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159227" role="tablecontent" l10n="U" oldref="49">JavaScript run-time error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145362" role="tablecontent" l10n="U" oldref="50">...when a JavaScript run-time error occurs.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154767" role="tablecontent" l10n="U" oldref="27">Print Mail Merge</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153555" role="tablecontent" l10n="U" oldref="28">...after the <emph>Print</emph> dialog is closed, but before the actual print process begins. This event occurs for each copy printed.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156366" role="tablecontent" l10n="U" oldref="51">Change of the page count</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154627" role="tablecontent" l10n="U" oldref="52">...when the page count changes.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154737" role="tablecontent" l10n="U" oldref="53">Message received</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150952" role="tablecontent" l10n="U" oldref="54">...if a message was received.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3153299" xml-lang="en-US" level="2" l10n="U" oldref="30">Assigning a Macro to an Event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147244" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Tools - Customize</emph> and click the <emph>Events</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146098" xml-lang="en-US" l10n="CHG" oldref="55">Select whether you want the assignment to be globally valid or just valid in the current document in the <emph>Save In</emph> listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="32">Select the event from the <emph>Event</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148742" xml-lang="en-US" l10n="CHG" oldref="33">Click <emph>Macro</emph> and select the macro to be assigned to the selected event.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146321" xml-lang="en-US" l10n="CHG" oldref="35">Click <emph>OK</emph> to assign the macro.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147414" xml-lang="en-US" l10n="U" oldref="56">Click <emph>OK</emph> to close the dialog.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154581" xml-lang="en-US" level="2" l10n="U" oldref="36">Removing the Assignment of a Macro to an Event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>Tools - Customize</emph> and click the <emph>Events</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155909" xml-lang="en-US" l10n="CHG" oldref="58">Select whether you want to remove a global assignment or an assignment that is just valid in the current document by selecting the option in the <emph>Save In</emph> listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159129" xml-lang="en-US" l10n="U" oldref="59">Select the event that contains the assignment to be removed from the <emph>Event</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149143" xml-lang="en-US" l10n="U" oldref="37">Click <emph>Remove</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149351" xml-lang="en-US" l10n="U" oldref="60">Click <emph>OK</emph> to close the dialog.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3153299" role="heading" level="2" l10n="U"
+                 oldref="30">Assigning a Macro to an Event</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147244" role="listitem" l10n="U" oldref="31">Choose <emph>Tools - Customize</emph> and click the <emph>Events</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146098" role="listitem" l10n="CHG" oldref="55">Select whether you want the assignment to be globally valid or just valid in the current document in the <emph>Save In</emph> listbox.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150431" role="listitem" l10n="U" oldref="32">Select the event from the <emph>Event</emph> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148742" role="listitem" l10n="CHG" oldref="33">Click <emph>Macro</emph> and select the macro to be assigned to the selected event.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146321" role="listitem" l10n="CHG" oldref="35">Click <emph>OK</emph> to assign the macro.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147414" role="listitem" l10n="U" oldref="56">Click <emph>OK</emph> to close the dialog.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154581" role="heading" level="2" l10n="U"
+                 oldref="36">Removing the Assignment of a Macro to an Event</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146883" role="listitem" l10n="U" oldref="57">Choose <emph>Tools - Customize</emph> and click the <emph>Events</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155909" role="listitem" l10n="CHG" oldref="58">Select whether you want to remove a global assignment or an assignment that is just valid in the current document by selecting the option in the <emph>Save In</emph> listbox.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159129" role="listitem" l10n="U" oldref="59">Select the event that contains the assignment to be removed from the <emph>Event</emph> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149143" role="listitem" l10n="U" oldref="37">Click <emph>Remove</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149351" role="listitem" l10n="U" oldref="60">Click <emph>OK</emph> to close the dialog.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/01050000.xhp b/helpcontent2/source/text/sbasic/shared/01050000.xhp
index a7680e7114..125f60f256 100644
--- a/helpcontent2/source/text/sbasic/shared/01050000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01050100.xhp b/helpcontent2/source/text/sbasic/shared/01050100.xhp
index 7d5f1b980a..6050c02b78 100644
--- a/helpcontent2/source/text/sbasic/shared/01050100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01050200.xhp b/helpcontent2/source/text/sbasic/shared/01050200.xhp
index c191661ca8..78cef525c0 100755
--- a/helpcontent2/source/text/sbasic/shared/01050200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01050200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01050300.xhp b/helpcontent2/source/text/sbasic/shared/01050300.xhp
index 137537170d..a5f1005263 100755
--- a/helpcontent2/source/text/sbasic/shared/01050300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01050300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,20 +46,20 @@
 <paragraph role="heading" id="hd_id3154927" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
 <paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_BASICIDE_BRKPROPS">Specifies the options for breakpoints.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_COMBOBOX_RID_BASICIDE_BREAKPOINTDLG_RID_CB_BRKPOINTS" id="bm_id3149656" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS" id="bm_id3149656" localize="false"/>
 <paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="3">Breakpoints</paragraph>
 <paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_COMBOBOX_RID_BASICIDE_BREAKPOINTDLG_RID_CB_BRKPOINTS">Enter the line number for a new breakpoint, then click <emph>New</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_CHECKBOX_RID_BASICIDE_BREAKPOINTDLG_RID_CHKB_ACTIVE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE" id="bm_id3156422" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_ACTIV" id="bm_id3150870" localize="false"/>
 <paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="6">Active</paragraph>
 <paragraph role="paragraph" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_BASICIDE_ACTIV">Activates or deactivates the current breakpoint.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_NUMERICFIELD_RID_BASICIDE_BREAKPOINTDLG_RID_FLD_PASS" id="bm_id3153768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS" id="bm_id3153768" localize="false"/>
 <paragraph role="heading" id="hd_id3144500" xml-lang="en-US" level="2" l10n="U" oldref="8">Pass Count</paragraph>
 <paragraph role="paragraph" id="par_id3161831" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="BASCTL_NUMERICFIELD_RID_BASICIDE_BREAKPOINTDLG_RID_FLD_PASS">Specify the number of loops to perform before the breakpoint takes effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_BASICIDE_BREAKPOINTDLG_RID_PB_NEW" id="bm_id3150012" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW" id="bm_id3150012" localize="false"/>
 <paragraph role="heading" id="hd_id3152579" xml-lang="en-US" level="2" l10n="U" oldref="10">New</paragraph>
 <paragraph role="paragraph" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="BASCTL_PUSHBUTTON_RID_BASICIDE_BREAKPOINTDLG_RID_PB_NEW">Creates a breakpoint on the line number specified.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_BASICIDE_BREAKPOINTDLG_RID_PB_DEL" id="bm_id3159156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL" id="bm_id3159156" localize="false"/>
 <paragraph role="heading" id="hd_id3147319" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="BASCTL_PUSHBUTTON_RID_BASICIDE_BREAKPOINTDLG_RID_PB_DEL">Deletes the selected breakpoint.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/sbasic/shared/01170100.xhp b/helpcontent2/source/text/sbasic/shared/01170100.xhp
index c25abe72aa..e57e5ca761 100755
--- a/helpcontent2/source/text/sbasic/shared/01170100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/01170101.xhp b/helpcontent2/source/text/sbasic/shared/01170101.xhp
index fe1b244344..2aa3008ded 100755
--- a/helpcontent2/source/text/sbasic/shared/01170101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170101.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01170101.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,7 +45,7 @@
 <paragraph role="paragraph" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="2">Define the properties for the selected control or dialog. The available properties depend on the type of control selected. The following properties therefore are not available for every type of control.</paragraph>
 </section>
 <sort order="asc"><section id="Section64">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_ALIGN" id="bm_id3153144" localize="false"/><paragraph role="heading" id="hd_id3148647" xml-lang="en-US" level="2" l10n="U" oldref="11">Alignment</paragraph>
+<!-- removed HID HID_PROP_IMAGE_ALIGN --><paragraph role="heading" id="hd_id3148647" xml-lang="en-US" level="2" l10n="U" oldref="11">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_PROP_IMAGE_ALIGN">Specify the alignment option for the selected control.</ahelp></paragraph>
 </section>
 <section id="Section63">
@@ -101,7 +98,7 @@
 <paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="CHG" oldref="145"><ahelp hid=".">Select "Yes" to make the current button control the default selection. Pressing <emph>Return</emph> in the dialog activates the default button.</ahelp></paragraph>
 </section>
 <section id="Section66">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="par_idN108BA" xml-lang="en-US" level="2" l10n="NEW">Delay<comment>UFI: see http://dba.openoffice.org/specifications/forms/scrollbar_form_control.sxw</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="par_idN108BA" xml-lang="en-US" level="2" l10n="NEW">Delay</paragraph>
 <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the delay in milliseconds between scrollbar trigger events.</ahelp> A trigger event occurs when you click a scrollbar arrow or click the background area in a scrollbar. Repeated trigger events occur if you keep the mouse button pressed when you click a scrollbar arrow or background area in a scrollbar. If you want, you can include valid time units with the number that you enter, for example, 2 s or 500 ms.</paragraph>
 </section>
 <section id="Section51"><comment>UFI: removed help id</comment><paragraph role="heading" id="hd_id3151278" xml-lang="en-US" level="2" l10n="U" oldref="19">Dropdown</paragraph>
@@ -191,7 +188,7 @@
 </table>
 </section>
 <section id="Section72">
-<bookmark xml-lang="en-US" branch="hid/38025" id="bm_id533463" localize="false"/><paragraph role="heading" id="hd_id2128971" xml-lang="en-US" level="2" l10n="NEW">Editable</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_EDITABLE" id="bm_id533463" localize="false"/><paragraph role="heading" id="hd_id2128971" xml-lang="en-US" level="2" l10n="NEW">Editable</paragraph>
 <paragraph role="paragraph" id="par_id6519974" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies whether the nodes of the tree control are editable.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id4591814" xml-lang="en-US" l10n="NEW">The default value is FALSE.</paragraph>
 </section>
@@ -216,7 +213,7 @@
 <paragraph role="paragraph" id="par_id3145233" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid=".">Specify the increment and decrement interval for spin button controls.</ahelp></paragraph>
 </section>
 <section id="Section73">
-<bookmark xml-lang="en-US" branch="hid/38026" id="bm_id9407025" localize="false"/><paragraph role="heading" id="hd_id539262" xml-lang="en-US" level="2" l10n="NEW">Invokes stop mode editing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_INVOKES_STOP_NOT_EDITING" id="bm_id9407025" localize="false"/><paragraph role="heading" id="hd_id539262" xml-lang="en-US" level="2" l10n="NEW">Invokes stop mode editing</paragraph>
 <paragraph role="paragraph" id="par_id234382" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies what happens when editing is interrupted by selecting another node in the tree, a change in the tree's data, or by some other means.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id6591082" xml-lang="en-US" l10n="NEW">Setting this property to TRUE causes the changes to be automatically saved when editing is interrupted. FALSE means that editing is canceled and changes are lost.</paragraph>
 <paragraph role="paragraph" id="par_id9298074" xml-lang="en-US" l10n="NEW">The default value is FALSE.</paragraph>
@@ -315,7 +312,7 @@
 <paragraph role="paragraph" id="par_idN11128" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Repeats trigger events when you keep the mouse button pressed on a control such as a spin button.</ahelp></paragraph>
 </section>
 <section id="Section71">
-<bookmark xml-lang="en-US" branch="hid/38022" id="bm_id1578722" localize="false"/><paragraph role="heading" id="hd_id9579149" xml-lang="en-US" level="2" l10n="NEW">Root displayed<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ROOT_DISPLAYED" id="bm_id1578722" localize="false"/><paragraph role="heading" id="hd_id9579149" xml-lang="en-US" level="2" l10n="NEW">Root displayed<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
 <paragraph role="paragraph" id="par_id7126987" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if the root node of the tree control is displayed.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9174779" xml-lang="en-US" l10n="NEW">If Root displayed is set to FALSE, the root node of a model is no longer a valid node for the tree control and can't be used with any method of XTreeControl.</paragraph>
 <paragraph role="paragraph" id="par_id594195" xml-lang="en-US" l10n="NEW">The default value is TRUE.</paragraph>
@@ -349,13 +346,13 @@
 <paragraph role="paragraph" id="par_idN111E8" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specify the minimum value of a scrollbar control.</ahelp></paragraph>
 </section>
 <section id="Section69">
-<bookmark xml-lang="en-US" branch="hid/38023" id="bm_id7286904" localize="false"/><paragraph role="heading" id="hd_id543534" xml-lang="en-US" level="2" l10n="NEW">Show handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWS_HANDLES" id="bm_id7286904" localize="false"/><paragraph role="heading" id="hd_id543534" xml-lang="en-US" level="2" l10n="NEW">Show handles</paragraph>
 <paragraph role="paragraph" id="par_id5060884" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies whether the handles of the nodes should be displayed.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id4974822" xml-lang="en-US" l10n="NEW">The handles are dotted lines that visualize the hierarchy of the tree control.</paragraph>
 <paragraph role="paragraph" id="par_id7687307" xml-lang="en-US" l10n="NEW">The default value is TRUE.</paragraph>
 </section>
 <section id="Section70">
-<bookmark xml-lang="en-US" branch="hid/38024" id="bm_id2047486" localize="false"/><paragraph role="heading" id="hd_id4062013" xml-lang="en-US" level="2" l10n="NEW">Show root handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWS_ROOT_HANDLES" id="bm_id2047486" localize="false"/><paragraph role="heading" id="hd_id4062013" xml-lang="en-US" level="2" l10n="NEW">Show root handles</paragraph>
 <paragraph role="paragraph" id="par_id3314004" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies whether the handles of the nodes should also be displayed at root level.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id2396313" xml-lang="en-US" l10n="NEW">The default value is TRUE.</paragraph>
 </section>
@@ -366,7 +363,7 @@
 <paragraph role="paragraph" id="par_idN10F0A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click the item or items that you want to select. To select more than one item, ensure that the Multiselection option is selected.</ahelp></paragraph>
 </section>
 <section id="Section68">
-<bookmark xml-lang="en-US" branch="hid/38021" id="bm_id2208929" localize="false"/><paragraph role="heading" id="hd_id5026093" xml-lang="en-US" level="2" l10n="NEW">Selection type<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SELECTION_TYPE" id="bm_id2208929" localize="false"/><paragraph role="heading" id="hd_id5026093" xml-lang="en-US" level="2" l10n="NEW">Selection type<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
 <paragraph role="paragraph" id="par_id1134067" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the selection mode that is enabled for this tree control.</ahelp></paragraph>
 </section>
 <section id="Section16"><comment>UFI: removed help id</comment><paragraph role="heading" id="hd_id3154193" xml-lang="en-US" level="2" l10n="U" oldref="87">Spin Button</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/01170103.xhp b/helpcontent2/source/text/sbasic/shared/01170103.xhp
index f255beb079..adbe5ca9a5 100755
--- a/helpcontent2/source/text/sbasic/shared/01170103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170103.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11010000.xhp b/helpcontent2/source/text/sbasic/shared/02/11010000.xhp
index deeeb0558b..5ea61326b6 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11010000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11020000.xhp b/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
index bd19b8b2e2..34f37861a3 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11030000.xhp b/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
index 4d7b41b1be..5d800481ca 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
index 39a172cf97..b23c434db3 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11050000.xhp b/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
index eb288cbb97..a37ff4d290 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11060000.xhp b/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
index 9a34c9333b..066b09da06 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11070000.xhp b/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
index 760b28dd80..c8d2186b92 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11070000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11080000.xhp b/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
index 1ee3ee2bd1..30c8fb05af 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11080000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11090000.xhp b/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
index 85b378bfc9..6e4aee385b 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11090000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11100000.xhp b/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
index aecb850ccb..0a8c142c43 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11100000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11110000.xhp b/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
index d6bb4cdcb1..36efc10670 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11110000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11120000.xhp b/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
index 695f71c7c5..7451047757 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11120000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11140000.xhp b/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
index 72179614b1..a0744d5b20 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11140000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11150000.xhp b/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
index 3dc05d892e..bb8f72b54f 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11150000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11160000.xhp b/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
index 248b253e18..fb3d15a849 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11160000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
index 1404317cb9..d1bcd99c4a 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11170000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,41 +27,39 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Manage Breakpoints</title>
-<filename>/text/sbasic/shared/02/11170000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-13T10:20:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="manage_breakpoints">
-<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
-<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
-</section>
-<section id="sybreakpoints">
-<table id="tbl_id3153750">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3155339" xml-lang="en-US">Icon</alt>
+      <topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Manage Breakpoints</title>
+         <filename>/text/sbasic/shared/02/11170000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="manage_breakpoints">
+<bookmark xml-lang="en-US" branch="hid/.uno:ManageBreakPoints" id="bm_id0929200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
+      </section>
+      <section id="sybreakpoints">
+         <table id="tbl_id3153750">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="3">Manage Breakpoints</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Manage Breakpoints</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11180000.xhp b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
new file mode 100644
index 0000000000..3bafa39354
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textsbasicshared0211180000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Import Dialog</title>
+         <filename>/text/sbasic/shared/02/11180000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="import">
+<bookmark xml-lang="en-US" branch="hid/.uno:ImportDialog" id="bm_id092920903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11180000.xhp" name="Import Dialog">Import Dialog</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls an "Open" dialog to import a BASIC dialog file.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0929200903505211" role="paragraph" l10n="NEW">If the imported dialog has a name that already exists in the library, you see a message box where you can decide to rename the imported dialog. In this case the dialog will be renamed to the next free "automatic" name like when creating a new dialog. Or you can replace the existing dialog by the imported dialog. If you click Cancel the dialog is not imported.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0929200903505360" role="paragraph" l10n="NEW">Dialogs can contain localization data. When importing a dialog, a mismatch of the dialogs' localization status can occur.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0929200903505320" role="paragraph" l10n="NEW">If the library contains additional languages compared to the imported dialog, or if the imported dialog is not localized at all, then the additional languages will silently be added to the imported dialog using the strings of the dialog's default locale.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0929200903505383" role="paragraph" l10n="NEW">If the imported dialog contains additional languages compared to the library, or if the library is not localized at all, then you see a message box with Add, Omit, and Cancel buttons.</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0929200903505340" role="paragraph" l10n="NEW">Add: The additional languages from the imported dialog will be added to the already existing dialog. The resources from the library's default language will be used for the new languages. This is the same as if you add these languages manually.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0929200903505367" role="paragraph" l10n="NEW">Omit: The library's language settings will stay unchanged. The imported dialog's resources for the omitted languages are not copied into the library, but they remain in the imported dialog's source files.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <section id="syimport">
+         <table id="tbl_id3153750">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_importdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+	</image></paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Import Dialog</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11190000.xhp b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
new file mode 100644
index 0000000000..a78a4d2809
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textsbasicshared0211190000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Export Dialog</title>
+         <filename>/text/sbasic/shared/02/11190000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="export">
+<bookmark xml-lang="en-US" branch="hid/.uno:ExportDialog" id="bm_id099200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11190000.xhp" name="Export Dialog">Export Dialog</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">In the dialog editor, this command calls a "Save as" dialog to export the current BASIC dialog.</ahelp></paragraph>
+      </section>
+      <section id="syexport">
+         <table id="tbl_id3153750">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_exportdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+	</image></paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Export Dialog</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
index c2d09090e7..ebdfe664cd 100644
--- a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 20000000.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -443,5 +440,5 @@
 <paragraph role="paragraph" id="par_id9961851" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp></paragraph>
 </tablecell>
 </tablerow>
-</table><comment>tree control see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></body>
+</table></body>
 </helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/02/makefile.mk b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
index 1acf4753bd..28fa37d1fa 100644
--- a/helpcontent2/source/text/sbasic/shared/02/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,9 +60,11 @@ XHPFILES = \
    11150000.xhp \
    11160000.xhp \
    11170000.xhp \
+   11180000.xhp \
+   11190000.xhp \
    20000000.xhp 
     
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sbasic/shared/03000000.xhp b/helpcontent2/source/text/sbasic/shared/03000000.xhp
index 90621eafd0..c711057ae5 100755
--- a/helpcontent2/source/text/sbasic/shared/03000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03000000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010000.xhp b/helpcontent2/source/text/sbasic/shared/03010000.xhp
index a69fa3a5fe..3933cc1127 100755
--- a/helpcontent2/source/text/sbasic/shared/03010000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010100.xhp b/helpcontent2/source/text/sbasic/shared/03010100.xhp
index eac5ceebdf..7576321a2d 100755
--- a/helpcontent2/source/text/sbasic/shared/03010100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010101.xhp b/helpcontent2/source/text/sbasic/shared/03010101.xhp
index 469a62d157..ea55124c10 100755
--- a/helpcontent2/source/text/sbasic/shared/03010101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010102.xhp b/helpcontent2/source/text/sbasic/shared/03010102.xhp
index 8284fa46a6..1fb2282ed9 100755
--- a/helpcontent2/source/text/sbasic/shared/03010102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010102.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010103.xhp b/helpcontent2/source/text/sbasic/shared/03010103.xhp
index 4421b00733..95f050461c 100644
--- a/helpcontent2/source/text/sbasic/shared/03010103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010103.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010103.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010200.xhp b/helpcontent2/source/text/sbasic/shared/03010200.xhp
index 3fdfe0e50a..6e345d5594 100755
--- a/helpcontent2/source/text/sbasic/shared/03010200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010201.xhp b/helpcontent2/source/text/sbasic/shared/03010201.xhp
index ee429d5805..4444a852d6 100755
--- a/helpcontent2/source/text/sbasic/shared/03010201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010300.xhp b/helpcontent2/source/text/sbasic/shared/03010300.xhp
index bf301983db..dfa213c87a 100755
--- a/helpcontent2/source/text/sbasic/shared/03010300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010300.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010301.xhp b/helpcontent2/source/text/sbasic/shared/03010301.xhp
index cfc56990ce..cd47e2f444 100755
--- a/helpcontent2/source/text/sbasic/shared/03010301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010302.xhp b/helpcontent2/source/text/sbasic/shared/03010302.xhp
index 81c03013ad..173a357f27 100755
--- a/helpcontent2/source/text/sbasic/shared/03010302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010303.xhp b/helpcontent2/source/text/sbasic/shared/03010303.xhp
index 5728254678..b494ac3e87 100755
--- a/helpcontent2/source/text/sbasic/shared/03010303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010303.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010303.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010304.xhp b/helpcontent2/source/text/sbasic/shared/03010304.xhp
index 87d0558e41..92eaedf6fc 100755
--- a/helpcontent2/source/text/sbasic/shared/03010304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010304.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010304.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03010305.xhp b/helpcontent2/source/text/sbasic/shared/03010305.xhp
index c0131a70c6..32d8275ad9 100755
--- a/helpcontent2/source/text/sbasic/shared/03010305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010305.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010305.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020000.xhp b/helpcontent2/source/text/sbasic/shared/03020000.xhp
index fa900c73c2..0506ee551d 100755
--- a/helpcontent2/source/text/sbasic/shared/03020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020100.xhp b/helpcontent2/source/text/sbasic/shared/03020100.xhp
index 4dc85444bf..1da4f62aeb 100755
--- a/helpcontent2/source/text/sbasic/shared/03020100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020101.xhp b/helpcontent2/source/text/sbasic/shared/03020101.xhp
index fa6d11cb5a..90ea0073a8 100755
--- a/helpcontent2/source/text/sbasic/shared/03020101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020101.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020102.xhp b/helpcontent2/source/text/sbasic/shared/03020102.xhp
index 774de7bac0..24a5371b44 100755
--- a/helpcontent2/source/text/sbasic/shared/03020102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020102.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020103.xhp b/helpcontent2/source/text/sbasic/shared/03020103.xhp
index 9f462ef23d..9a18db0205 100644
--- a/helpcontent2/source/text/sbasic/shared/03020103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020103.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020104.xhp b/helpcontent2/source/text/sbasic/shared/03020104.xhp
index e3485e4664..3148bd7837 100755
--- a/helpcontent2/source/text/sbasic/shared/03020104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020104.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020104.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020200.xhp b/helpcontent2/source/text/sbasic/shared/03020200.xhp
index 6ab3643b0b..56399f99a5 100755
--- a/helpcontent2/source/text/sbasic/shared/03020200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020201.xhp b/helpcontent2/source/text/sbasic/shared/03020201.xhp
index 50a82e0688..abdadef468 100755
--- a/helpcontent2/source/text/sbasic/shared/03020201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020202.xhp b/helpcontent2/source/text/sbasic/shared/03020202.xhp
index 31dd274380..c54904f41a 100755
--- a/helpcontent2/source/text/sbasic/shared/03020202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020202.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020202.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020203.xhp b/helpcontent2/source/text/sbasic/shared/03020203.xhp
index 4d8ce262f7..f1f589fa53 100755
--- a/helpcontent2/source/text/sbasic/shared/03020203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020203.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020203.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020204.xhp b/helpcontent2/source/text/sbasic/shared/03020204.xhp
index 92fc702d22..6abfac8191 100755
--- a/helpcontent2/source/text/sbasic/shared/03020204.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020204.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020204.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020205.xhp b/helpcontent2/source/text/sbasic/shared/03020205.xhp
index d5f62402cc..adeafa7a8c 100755
--- a/helpcontent2/source/text/sbasic/shared/03020205.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020205.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020205.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020301.xhp b/helpcontent2/source/text/sbasic/shared/03020301.xhp
index 383b0379b3..7d688e8709 100755
--- a/helpcontent2/source/text/sbasic/shared/03020301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020302.xhp b/helpcontent2/source/text/sbasic/shared/03020302.xhp
index baad8b85d3..ab52b90844 100755
--- a/helpcontent2/source/text/sbasic/shared/03020302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020303.xhp b/helpcontent2/source/text/sbasic/shared/03020303.xhp
index 6dcba44ba7..9eab0766f5 100644
--- a/helpcontent2/source/text/sbasic/shared/03020303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020303.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020303.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020304.xhp b/helpcontent2/source/text/sbasic/shared/03020304.xhp
index 26bd91a80a..3c7af7086a 100755
--- a/helpcontent2/source/text/sbasic/shared/03020304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020304.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020304.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020305.xhp b/helpcontent2/source/text/sbasic/shared/03020305.xhp
index 583e5a9125..97fee841d3 100755
--- a/helpcontent2/source/text/sbasic/shared/03020305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020305.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020305.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020400.xhp b/helpcontent2/source/text/sbasic/shared/03020400.xhp
index 52f80bf02f..9229c77f82 100755
--- a/helpcontent2/source/text/sbasic/shared/03020400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020401.xhp b/helpcontent2/source/text/sbasic/shared/03020401.xhp
index e4851bc21f..5a37097d3b 100644
--- a/helpcontent2/source/text/sbasic/shared/03020401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020401.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020401.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020402.xhp b/helpcontent2/source/text/sbasic/shared/03020402.xhp
index 8d5407bc59..bdf367d13b 100755
--- a/helpcontent2/source/text/sbasic/shared/03020402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020402.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020402.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020403.xhp b/helpcontent2/source/text/sbasic/shared/03020403.xhp
index 381c29d796..7fc3aba96d 100755
--- a/helpcontent2/source/text/sbasic/shared/03020403.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020403.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020403.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020404.xhp b/helpcontent2/source/text/sbasic/shared/03020404.xhp
index 580f0a9878..1039e79afa 100755
--- a/helpcontent2/source/text/sbasic/shared/03020404.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020404.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020404.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020405.xhp b/helpcontent2/source/text/sbasic/shared/03020405.xhp
index 62675ad61a..29c37a8d63 100644
--- a/helpcontent2/source/text/sbasic/shared/03020405.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020405.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020405.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020406.xhp b/helpcontent2/source/text/sbasic/shared/03020406.xhp
index 949022f6b9..19ff88ae19 100644
--- a/helpcontent2/source/text/sbasic/shared/03020406.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020406.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020406.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020407.xhp b/helpcontent2/source/text/sbasic/shared/03020407.xhp
index 5af0daaf17..24ae04ddd5 100755
--- a/helpcontent2/source/text/sbasic/shared/03020407.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020407.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020407.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020408.xhp b/helpcontent2/source/text/sbasic/shared/03020408.xhp
index 9131d9bcdc..ca2e86c9b9 100755
--- a/helpcontent2/source/text/sbasic/shared/03020408.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020408.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020408.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020409.xhp b/helpcontent2/source/text/sbasic/shared/03020409.xhp
index d8198cee8d..4c2a38bbfc 100755
--- a/helpcontent2/source/text/sbasic/shared/03020409.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020409.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020409.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020410.xhp b/helpcontent2/source/text/sbasic/shared/03020410.xhp
index e26aa0f062..8d135b15fc 100755
--- a/helpcontent2/source/text/sbasic/shared/03020410.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020410.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020410.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020411.xhp b/helpcontent2/source/text/sbasic/shared/03020411.xhp
index 213ba55b29..0b44caf346 100755
--- a/helpcontent2/source/text/sbasic/shared/03020411.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020411.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020411.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020412.xhp b/helpcontent2/source/text/sbasic/shared/03020412.xhp
index 8ce88598ed..9e663f0471 100755
--- a/helpcontent2/source/text/sbasic/shared/03020412.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020412.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020412.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020413.xhp b/helpcontent2/source/text/sbasic/shared/03020413.xhp
index 8345708cba..9dbb1e0425 100755
--- a/helpcontent2/source/text/sbasic/shared/03020413.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020413.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020413.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020414.xhp b/helpcontent2/source/text/sbasic/shared/03020414.xhp
index 504a30b53a..a2dbedb627 100755
--- a/helpcontent2/source/text/sbasic/shared/03020414.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020414.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020414.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03020415.xhp b/helpcontent2/source/text/sbasic/shared/03020415.xhp
index 508e9a448b..4b1e4fd9c2 100755
--- a/helpcontent2/source/text/sbasic/shared/03020415.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020415.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020415.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030000.xhp b/helpcontent2/source/text/sbasic/shared/03030000.xhp
index 900c335d2b..c0dcde2efe 100644
--- a/helpcontent2/source/text/sbasic/shared/03030000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030100.xhp b/helpcontent2/source/text/sbasic/shared/03030100.xhp
index 6fb69bd734..1489f80a32 100755
--- a/helpcontent2/source/text/sbasic/shared/03030100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030101.xhp b/helpcontent2/source/text/sbasic/shared/03030101.xhp
index b407499896..9fe3295c8b 100755
--- a/helpcontent2/source/text/sbasic/shared/03030101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030101.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030101.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030102.xhp b/helpcontent2/source/text/sbasic/shared/03030102.xhp
index 21d920fa9c..917e95ef23 100755
--- a/helpcontent2/source/text/sbasic/shared/03030102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030102.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030103.xhp b/helpcontent2/source/text/sbasic/shared/03030103.xhp
index b1bff5ba1f..045f688bf8 100755
--- a/helpcontent2/source/text/sbasic/shared/03030103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030103.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030104.xhp b/helpcontent2/source/text/sbasic/shared/03030104.xhp
index 03c97c59f3..989f0af76b 100755
--- a/helpcontent2/source/text/sbasic/shared/03030104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030104.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030104.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030105.xhp b/helpcontent2/source/text/sbasic/shared/03030105.xhp
index 869dbbc2a6..aa9070caf0 100755
--- a/helpcontent2/source/text/sbasic/shared/03030105.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030105.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030106.xhp b/helpcontent2/source/text/sbasic/shared/03030106.xhp
index 749d9109b9..e1690c69b5 100755
--- a/helpcontent2/source/text/sbasic/shared/03030106.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030106.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030106.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030107.xhp b/helpcontent2/source/text/sbasic/shared/03030107.xhp
index 83be61c61e..4ea3d4dd1c 100755
--- a/helpcontent2/source/text/sbasic/shared/03030107.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030107.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030107.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030108.xhp b/helpcontent2/source/text/sbasic/shared/03030108.xhp
index dde344b539..3d92632be8 100755
--- a/helpcontent2/source/text/sbasic/shared/03030108.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030108.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030108.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030110.xhp b/helpcontent2/source/text/sbasic/shared/03030110.xhp
index 645e1fa4a5..465e018dcf 100755
--- a/helpcontent2/source/text/sbasic/shared/03030110.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030110.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030110.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030120.xhp b/helpcontent2/source/text/sbasic/shared/03030120.xhp
index 48d4fbf76b..cdde5b22e2 100755
--- a/helpcontent2/source/text/sbasic/shared/03030120.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030120.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030120.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030130.xhp b/helpcontent2/source/text/sbasic/shared/03030130.xhp
index 2365b961bd..6f4177a00e 100755
--- a/helpcontent2/source/text/sbasic/shared/03030130.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030130.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030130.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030200.xhp b/helpcontent2/source/text/sbasic/shared/03030200.xhp
index 2c63bb568b..c6b8fea8f7 100755
--- a/helpcontent2/source/text/sbasic/shared/03030200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030201.xhp b/helpcontent2/source/text/sbasic/shared/03030201.xhp
index 4d2506906f..2164fb0f6c 100755
--- a/helpcontent2/source/text/sbasic/shared/03030201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030201.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,41 +27,39 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsbasicshared03030201xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hour Function [Runtime]</title>
-<filename>/text/sbasic/shared/03030201.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T12:46:45">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hour">
+      <topic id="textsbasicshared03030201xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Hour Function [Runtime]</title>
+         <filename>/text/sbasic/shared/03030201.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="hour">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156042"><bookmark_value>Hour function</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03030201.xhp" name="Hour Function [Runtime]">Hour Function [Runtime]</link></paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="2">Returns the hour from a time value that is generated by the TimeSerial or the TimeValue function.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="4">Hour (Number)</paragraph>
-<paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="2" l10n="U" oldref="5">Return value:</paragraph>
-<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="6">Integer</paragraph>
-<paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Number:</emph> Numeric expression that contains the serial time value that is used to return the hour value.</paragraph>
-<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="U" oldref="9">This function is the opposite of the <emph>TimeSerial</emph> function. It returns an integer value that represents the hour from a time value that is generated by the <emph>TimeSerial</emph> or the <emph>TimeValue </emph>function. For example, the expression</paragraph>
-<paragraph role="paragraph" id="par_id3163798" xml-lang="en-US" l10n="U" oldref="10">Print Hour(TimeSerial(12:30:41))</paragraph>
-<paragraph role="paragraph" id="par_id3155132" xml-lang="en-US" l10n="U" oldref="11">returns the value 12.</paragraph>
-<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
-<embed href="text/sbasic/shared/00000003.xhp#err5"/>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="2" l10n="U" oldref="12">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3146985" xml-lang="en-US" l10n="U" oldref="13">Sub ExampleHour</paragraph>
-<paragraph role="paragraph" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="14">Print "The current hour is " &amp; Hour( Now )</paragraph>
-<paragraph role="paragraph" id="par_id3153145" xml-lang="en-US" l10n="U" oldref="15">End Sub</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156042" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03030201.xhp" name="Hour Function [Runtime]">Hour Function [Runtime]</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="U" oldref="2">Returns the hour from a time value that is generated by the TimeSerial or the TimeValue function.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3147574" role="heading" level="2" l10n="U" oldref="3">Syntax:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="4">Hour (Number)</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145069" role="heading" level="2" l10n="U" oldref="5">Return value:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149670" role="paragraph" l10n="U" oldref="6">Integer</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150359" role="heading" level="2" l10n="U" oldref="7">Parameters:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="8">
+         <emph>Number:</emph> Numeric expression that contains the serial time value that is used to return the hour value.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154909" role="paragraph" l10n="U" oldref="9">This function is the opposite of the <emph>TimeSerial</emph> function. It returns an integer value that represents the hour from a time value that is generated by the <emph>TimeSerial</emph> or the <emph>TimeValue </emph>function. For example, the expression</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163798" role="paragraph" l10n="CHG" oldref="10">Print Hour(TimeSerial(12,30,41))</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155132" role="paragraph" l10n="U" oldref="11">returns the value 12.</paragraph>
+      <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
+      <embed href="text/sbasic/shared/00000003.xhp#err5"/>
+      <paragraph xml-lang="en-US" id="hd_id3147348" role="heading" level="2" l10n="U"
+                 oldref="12">Example:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146985" role="paragraph" l10n="U" oldref="13">Sub ExampleHour</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156441" role="paragraph" l10n="U" oldref="14">Print "The current hour is " &amp; Hour( Now )</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153145" role="paragraph" l10n="U" oldref="15">End Sub</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/03030202.xhp b/helpcontent2/source/text/sbasic/shared/03030202.xhp
index 2366caa49a..3369b16cb3 100755
--- a/helpcontent2/source/text/sbasic/shared/03030202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030202.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,41 +27,39 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsbasicshared03030202xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Minute Function [Runtime]</title>
-<filename>/text/sbasic/shared/03030202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T13:34:29">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="minute">
+      <topic id="textsbasicshared03030202xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Minute Function [Runtime]</title>
+         <filename>/text/sbasic/shared/03030202.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="minute">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155419"><bookmark_value>Minute function</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03030202.xhp" name="Minute Function [Runtime]">Minute Function [Runtime]</link></paragraph>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="U" oldref="2">Returns the minute of the hour that corresponds to the serial time value that is generated by the TimeSerial or the TimeValue function.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154758" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
-<paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="4">Minute (Number)</paragraph>
-<paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="5">Return value:</paragraph>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="6">Integer</paragraph>
-<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Number:</emph> Numeric expression that contains the serial time value that is used to return the minute value.</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="9">This function is the opposite of the <emph>TimeSerial </emph>function. It returns the minute of the serial time value that is generated by the <emph>TimeSerial</emph> or the <emph>TimeValue </emph>function. For example, the expression:</paragraph>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="10">Print Minute(TimeSerial(12:30:41))</paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="11">returns the value 30.</paragraph>
-<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
-<embed href="text/sbasic/shared/00000003.xhp#err5"/>
-<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="13">Sub ExampleMinute</paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="14">MsgBox "The current minute is "&amp; Minute(Now)&amp; "."</paragraph>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="15">end sub</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3155419" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03030202.xhp" name="Minute Function [Runtime]">Minute Function [Runtime]</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="U" oldref="2">Returns the minute of the hour that corresponds to the serial time value that is generated by the TimeSerial or the TimeValue function.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154758" role="heading" level="2" l10n="U" oldref="3">Syntax:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149656" role="paragraph" l10n="U" oldref="4">Minute (Number)</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148798" role="heading" level="2" l10n="U" oldref="5">Return value:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="6">Integer</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153193" role="heading" level="2" l10n="U" oldref="7">Parameters:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153969" role="paragraph" l10n="U" oldref="8">
+         <emph>Number:</emph> Numeric expression that contains the serial time value that is used to return the minute value.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="U" oldref="9">This function is the opposite of the <emph>TimeSerial </emph>function. It returns the minute of the serial time value that is generated by the <emph>TimeSerial</emph> or the <emph>TimeValue </emph>function. For example, the expression:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149262" role="paragraph" l10n="CHG" oldref="10">Print Minute(TimeSerial(12,30,41))</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="11">returns the value 30.</paragraph>
+      <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
+      <embed href="text/sbasic/shared/00000003.xhp#err5"/>
+      <paragraph xml-lang="en-US" id="hd_id3150010" role="heading" level="2" l10n="U"
+                 oldref="12">Example:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="13">Sub ExampleMinute</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146119" role="paragraph" l10n="U" oldref="14">MsgBox "The current minute is "&amp; Minute(Now)&amp; "."</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153726" role="paragraph" l10n="U" oldref="15">end sub</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/03030203.xhp b/helpcontent2/source/text/sbasic/shared/03030203.xhp
index 60a31b189d..a487c3aad2 100755
--- a/helpcontent2/source/text/sbasic/shared/03030203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030203.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030204.xhp b/helpcontent2/source/text/sbasic/shared/03030204.xhp
index 18b566d39d..d75415cee2 100755
--- a/helpcontent2/source/text/sbasic/shared/03030204.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030204.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030204.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030205.xhp b/helpcontent2/source/text/sbasic/shared/03030205.xhp
index 947a3ed484..cc9488b1c1 100755
--- a/helpcontent2/source/text/sbasic/shared/03030205.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030205.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030205.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030206.xhp b/helpcontent2/source/text/sbasic/shared/03030206.xhp
index 478afb1621..38e122ce1b 100755
--- a/helpcontent2/source/text/sbasic/shared/03030206.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030206.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030206.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030300.xhp b/helpcontent2/source/text/sbasic/shared/03030300.xhp
index e6b0a8d30b..8d06a2cb0d 100755
--- a/helpcontent2/source/text/sbasic/shared/03030300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030300.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030301.xhp b/helpcontent2/source/text/sbasic/shared/03030301.xhp
index 3ec5cede2a..e2ce260e26 100755
--- a/helpcontent2/source/text/sbasic/shared/03030301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030302.xhp b/helpcontent2/source/text/sbasic/shared/03030302.xhp
index c753a4a54e..6aa8ec82d0 100755
--- a/helpcontent2/source/text/sbasic/shared/03030302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03030303.xhp b/helpcontent2/source/text/sbasic/shared/03030303.xhp
index 6706efbea6..1d673ef380 100644
--- a/helpcontent2/source/text/sbasic/shared/03030303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030303.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03030303.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03050000.xhp b/helpcontent2/source/text/sbasic/shared/03050000.xhp
index f09b60446c..cd3b0e5576 100755
--- a/helpcontent2/source/text/sbasic/shared/03050000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03050100.xhp b/helpcontent2/source/text/sbasic/shared/03050100.xhp
index f14ec1e80f..657da7ef59 100644
--- a/helpcontent2/source/text/sbasic/shared/03050100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03050200.xhp b/helpcontent2/source/text/sbasic/shared/03050200.xhp
index d291bb8a5e..dbde24b186 100755
--- a/helpcontent2/source/text/sbasic/shared/03050200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03050300.xhp b/helpcontent2/source/text/sbasic/shared/03050300.xhp
index 8d292d532d..c49ea8698c 100755
--- a/helpcontent2/source/text/sbasic/shared/03050300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03050500.xhp b/helpcontent2/source/text/sbasic/shared/03050500.xhp
index 8f3e819c92..9655b6c27e 100755
--- a/helpcontent2/source/text/sbasic/shared/03050500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050500.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03050500.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsbasicshared03050500xml" indexer="include" status="PUBLISH">
@@ -51,14 +48,14 @@
 <paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="2">Enables an error-handling routine after an error occurs, or resumes program execution.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3151212" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="4">On {Error GoTo Labelname | GoTo 0 | Resume Next}</paragraph>
+<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="4">On {[Local] Error GoTo Labelname | GoTo 0 | Resume Next}</paragraph>
 <paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="5">Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="7">
-<emph>GoTo Labelname:</emph> If an error occurs, enables the error-handling routine that starts at the line "Labelname".</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Resume Next:</emph> If an error occurs, program execution continues with the statement that follows the statement in which the error occurred.</paragraph>
-<paragraph role="paragraph" id="par_id3149482" xml-lang="en-US" l10n="U" oldref="9">
-<emph>GoTo 0: </emph>Disables the error handler in the current procedure.</paragraph>
+<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="7"><emph>GoTo Labelname:</emph> If an error occurs, enables the error-handling routine that starts at the line "Labelname".</paragraph>
+<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="8"><emph>Resume Next:</emph> If an error occurs, program execution continues with the statement that follows the statement in which the error occurred.</paragraph>
+<paragraph role="paragraph" id="par_id3149482" xml-lang="en-US" l10n="U" oldref="9"><emph>GoTo 0:</emph> Disables the error handler in the current procedure.</paragraph>
+
+<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="9"><emph>Local:</emph> "On error" is global in scope, and remains active until canceled by another "On error" statement. "On Local error" is local to the routine which invokes it. Local error handling overrides any previous global setting. When the invoking routine exits, the local error handling is canceled automatically, and any previous global setting is restored.</paragraph>
+
 <paragraph role="paragraph" id="par_id3148619" xml-lang="en-US" l10n="U" oldref="10">The On Error GoTo statement is used to react to errors that occur in a macro. The statement must be inserted at the start of a procedure (in a local error-handling routine) or at the start of a module.</paragraph>
 <paragraph role="heading" id="hd_id3146985" xml-lang="en-US" level="2" l10n="U" oldref="11">Example:</paragraph>
 <paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="42">Sub ExampleReset</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03060000.xhp b/helpcontent2/source/text/sbasic/shared/03060000.xhp
index 7ea04278fd..bf34d09cdb 100755
--- a/helpcontent2/source/text/sbasic/shared/03060000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060100.xhp b/helpcontent2/source/text/sbasic/shared/03060100.xhp
index 3699480925..d7f81d5f0c 100755
--- a/helpcontent2/source/text/sbasic/shared/03060100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060200.xhp b/helpcontent2/source/text/sbasic/shared/03060200.xhp
index 69440fd376..77980f7b59 100755
--- a/helpcontent2/source/text/sbasic/shared/03060200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060300.xhp b/helpcontent2/source/text/sbasic/shared/03060300.xhp
index 0568ca2651..c891476a31 100755
--- a/helpcontent2/source/text/sbasic/shared/03060300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060400.xhp b/helpcontent2/source/text/sbasic/shared/03060400.xhp
index 668c673287..996cfcc457 100755
--- a/helpcontent2/source/text/sbasic/shared/03060400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060500.xhp b/helpcontent2/source/text/sbasic/shared/03060500.xhp
index c39236e86a..d0d7e83718 100755
--- a/helpcontent2/source/text/sbasic/shared/03060500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03060600.xhp b/helpcontent2/source/text/sbasic/shared/03060600.xhp
index 7c0cae6d72..89630ce40e 100755
--- a/helpcontent2/source/text/sbasic/shared/03060600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070000.xhp b/helpcontent2/source/text/sbasic/shared/03070000.xhp
index 5ead2d2eeb..92c235dad3 100755
--- a/helpcontent2/source/text/sbasic/shared/03070000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070100.xhp b/helpcontent2/source/text/sbasic/shared/03070100.xhp
index d631be2aa4..2b3eca0877 100755
--- a/helpcontent2/source/text/sbasic/shared/03070100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070200.xhp b/helpcontent2/source/text/sbasic/shared/03070200.xhp
index 0f07ec3167..d159319b31 100755
--- a/helpcontent2/source/text/sbasic/shared/03070200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070300.xhp b/helpcontent2/source/text/sbasic/shared/03070300.xhp
index f3b1c19f20..c0cdd58fb6 100755
--- a/helpcontent2/source/text/sbasic/shared/03070300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070400.xhp b/helpcontent2/source/text/sbasic/shared/03070400.xhp
index 9fc6d5f9f9..187a92dc46 100755
--- a/helpcontent2/source/text/sbasic/shared/03070400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070500.xhp b/helpcontent2/source/text/sbasic/shared/03070500.xhp
index e0ad54f985..7e713b71bf 100755
--- a/helpcontent2/source/text/sbasic/shared/03070500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03070600.xhp b/helpcontent2/source/text/sbasic/shared/03070600.xhp
index 6fec268366..731a6e699c 100755
--- a/helpcontent2/source/text/sbasic/shared/03070600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080000.xhp b/helpcontent2/source/text/sbasic/shared/03080000.xhp
index 33122ccbf3..7326dd2f4b 100755
--- a/helpcontent2/source/text/sbasic/shared/03080000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080100.xhp b/helpcontent2/source/text/sbasic/shared/03080100.xhp
index d7a5b87512..beab2747ba 100755
--- a/helpcontent2/source/text/sbasic/shared/03080100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080101.xhp b/helpcontent2/source/text/sbasic/shared/03080101.xhp
index 39a608ccbc..3961f03df0 100755
--- a/helpcontent2/source/text/sbasic/shared/03080101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080101.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080102.xhp b/helpcontent2/source/text/sbasic/shared/03080102.xhp
index 3d27bb011d..64c45466b1 100755
--- a/helpcontent2/source/text/sbasic/shared/03080102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080102.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080103.xhp b/helpcontent2/source/text/sbasic/shared/03080103.xhp
index c9738a42ba..15a0eec358 100755
--- a/helpcontent2/source/text/sbasic/shared/03080103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080103.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080104.xhp b/helpcontent2/source/text/sbasic/shared/03080104.xhp
index 3cf56c82d5..2ddf64330d 100755
--- a/helpcontent2/source/text/sbasic/shared/03080104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080104.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080104.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080200.xhp b/helpcontent2/source/text/sbasic/shared/03080200.xhp
index b96ffdf990..1b26e8576b 100755
--- a/helpcontent2/source/text/sbasic/shared/03080200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080201.xhp b/helpcontent2/source/text/sbasic/shared/03080201.xhp
index 5cfd896cb5..47b1b8af17 100755
--- a/helpcontent2/source/text/sbasic/shared/03080201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080201.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080202.xhp b/helpcontent2/source/text/sbasic/shared/03080202.xhp
index 3e29495243..1eb316b05e 100755
--- a/helpcontent2/source/text/sbasic/shared/03080202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080300.xhp b/helpcontent2/source/text/sbasic/shared/03080300.xhp
index d50c272ab5..bb638cb99a 100755
--- a/helpcontent2/source/text/sbasic/shared/03080300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080300.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080301.xhp b/helpcontent2/source/text/sbasic/shared/03080301.xhp
index 85c6d3025c..dbccfb655b 100755
--- a/helpcontent2/source/text/sbasic/shared/03080301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080302.xhp b/helpcontent2/source/text/sbasic/shared/03080302.xhp
index aae1af4f06..9a983886d2 100755
--- a/helpcontent2/source/text/sbasic/shared/03080302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080400.xhp b/helpcontent2/source/text/sbasic/shared/03080400.xhp
index 4330b06341..6873e25b0f 100755
--- a/helpcontent2/source/text/sbasic/shared/03080400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080401.xhp b/helpcontent2/source/text/sbasic/shared/03080401.xhp
index c3522520c8..09fb2f79b9 100755
--- a/helpcontent2/source/text/sbasic/shared/03080401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080401.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080500.xhp b/helpcontent2/source/text/sbasic/shared/03080500.xhp
index f4364c4336..b1a83c9aa5 100755
--- a/helpcontent2/source/text/sbasic/shared/03080500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080500.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080501.xhp b/helpcontent2/source/text/sbasic/shared/03080501.xhp
index 7fa3caa831..1248c4a2e1 100755
--- a/helpcontent2/source/text/sbasic/shared/03080501.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080501.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080501.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080502.xhp b/helpcontent2/source/text/sbasic/shared/03080502.xhp
index 4bb43398a9..a5f2933a79 100755
--- a/helpcontent2/source/text/sbasic/shared/03080502.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080502.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03080502.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,9 +57,9 @@
 <embed href="text/sbasic/shared/00000003.xhp#err5"/>
 <paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:</paragraph>
 <paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="10">sub ExampleINT</paragraph>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="CHG" oldref="11">Print Int(3.99) REM returns the value 3.0</paragraph>
-<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="CHG" oldref="12">Print Int(0) REM returns the value 0.0</paragraph>
-<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="CHG" oldref="13">Print Int(-3.14159) REM returns the value -4.0</paragraph>
+<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="CHG" oldref="11">Print Int(3.99) REM returns the value 3</paragraph>
+<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="CHG" oldref="12">Print Int(0) REM returns the value 0</paragraph>
+<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="CHG" oldref="13">Print Int(-3.14159) REM returns the value -4</paragraph>
 <paragraph role="paragraph" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="14">end sub</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/03080600.xhp b/helpcontent2/source/text/sbasic/shared/03080600.xhp
index 37a95b637c..ab667dc1de 100755
--- a/helpcontent2/source/text/sbasic/shared/03080600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080600.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080601.xhp b/helpcontent2/source/text/sbasic/shared/03080601.xhp
index 7a79d7f453..140794fdf1 100755
--- a/helpcontent2/source/text/sbasic/shared/03080601.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080601.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080601.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080700.xhp b/helpcontent2/source/text/sbasic/shared/03080700.xhp
index 0de6eafa95..380030c70c 100755
--- a/helpcontent2/source/text/sbasic/shared/03080700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080700.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080701.xhp b/helpcontent2/source/text/sbasic/shared/03080701.xhp
index e8ef18c8c2..447ce29eac 100755
--- a/helpcontent2/source/text/sbasic/shared/03080701.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080701.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080701.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080800.xhp b/helpcontent2/source/text/sbasic/shared/03080800.xhp
index 576f1cdbc9..a5de8cab8b 100755
--- a/helpcontent2/source/text/sbasic/shared/03080800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080800.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080801.xhp b/helpcontent2/source/text/sbasic/shared/03080801.xhp
index 33f6e7df1c..7d751a1fdd 100755
--- a/helpcontent2/source/text/sbasic/shared/03080801.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080801.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080801.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03080802.xhp b/helpcontent2/source/text/sbasic/shared/03080802.xhp
index 46854f0645..4c506bd2da 100755
--- a/helpcontent2/source/text/sbasic/shared/03080802.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080802.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080802.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090000.xhp b/helpcontent2/source/text/sbasic/shared/03090000.xhp
index 0a4a3f4cc8..e80019e2ca 100755
--- a/helpcontent2/source/text/sbasic/shared/03090000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090100.xhp b/helpcontent2/source/text/sbasic/shared/03090100.xhp
index 6896862aba..5e2d431e5f 100755
--- a/helpcontent2/source/text/sbasic/shared/03090100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090101.xhp b/helpcontent2/source/text/sbasic/shared/03090101.xhp
index 9825231c00..409372d2d4 100644
--- a/helpcontent2/source/text/sbasic/shared/03090101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090101.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090102.xhp b/helpcontent2/source/text/sbasic/shared/03090102.xhp
index 53165b923c..80fdedca72 100755
--- a/helpcontent2/source/text/sbasic/shared/03090102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090102.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090103.xhp b/helpcontent2/source/text/sbasic/shared/03090103.xhp
index d17b58fec9..4c9f803f62 100755
--- a/helpcontent2/source/text/sbasic/shared/03090103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090103.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090200.xhp b/helpcontent2/source/text/sbasic/shared/03090200.xhp
index 377aef22cc..df0cc09fe1 100755
--- a/helpcontent2/source/text/sbasic/shared/03090200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090201.xhp b/helpcontent2/source/text/sbasic/shared/03090201.xhp
index 90cf6b6d37..14f2bae5e8 100755
--- a/helpcontent2/source/text/sbasic/shared/03090201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090202.xhp b/helpcontent2/source/text/sbasic/shared/03090202.xhp
index dd7d40362e..04131b1f1f 100755
--- a/helpcontent2/source/text/sbasic/shared/03090202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090203.xhp b/helpcontent2/source/text/sbasic/shared/03090203.xhp
index b5108bbb7e..92464b0c7c 100755
--- a/helpcontent2/source/text/sbasic/shared/03090203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090203.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090300.xhp b/helpcontent2/source/text/sbasic/shared/03090300.xhp
index 78f611956c..50a44c5bdd 100755
--- a/helpcontent2/source/text/sbasic/shared/03090300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090300.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090301.xhp b/helpcontent2/source/text/sbasic/shared/03090301.xhp
index f575d068f2..63bdcb0e6c 100644
--- a/helpcontent2/source/text/sbasic/shared/03090301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090302.xhp b/helpcontent2/source/text/sbasic/shared/03090302.xhp
index 348d01c10b..f2681432c4 100644
--- a/helpcontent2/source/text/sbasic/shared/03090302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090302.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090302.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090303.xhp b/helpcontent2/source/text/sbasic/shared/03090303.xhp
index 6d7d8917f3..18d6d2da97 100644
--- a/helpcontent2/source/text/sbasic/shared/03090303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090303.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090303.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090400.xhp b/helpcontent2/source/text/sbasic/shared/03090400.xhp
index 4bfd4c84b7..bf9957b45f 100755
--- a/helpcontent2/source/text/sbasic/shared/03090400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090401.xhp b/helpcontent2/source/text/sbasic/shared/03090401.xhp
index 71e2b5fcd3..d1e08a6af2 100644
--- a/helpcontent2/source/text/sbasic/shared/03090401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090401.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090402.xhp b/helpcontent2/source/text/sbasic/shared/03090402.xhp
index 6226539490..5eda3d85b1 100755
--- a/helpcontent2/source/text/sbasic/shared/03090402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090402.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090402.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090403.xhp b/helpcontent2/source/text/sbasic/shared/03090403.xhp
index 2bc20e1f85..26cfa055ab 100644
--- a/helpcontent2/source/text/sbasic/shared/03090403.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090403.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090403.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090404.xhp b/helpcontent2/source/text/sbasic/shared/03090404.xhp
index 24448a3d02..93b9fd167b 100755
--- a/helpcontent2/source/text/sbasic/shared/03090404.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090404.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090404.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090405.xhp b/helpcontent2/source/text/sbasic/shared/03090405.xhp
index bac5164cfb..56c0817ddb 100644
--- a/helpcontent2/source/text/sbasic/shared/03090405.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090405.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090405.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090406.xhp b/helpcontent2/source/text/sbasic/shared/03090406.xhp
index 166182d61a..c6f24dc8cf 100755
--- a/helpcontent2/source/text/sbasic/shared/03090406.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090406.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090406.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090407.xhp b/helpcontent2/source/text/sbasic/shared/03090407.xhp
index 87fa21d266..a041e0fc6d 100644
--- a/helpcontent2/source/text/sbasic/shared/03090407.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090407.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090407.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090408.xhp b/helpcontent2/source/text/sbasic/shared/03090408.xhp
index f12d5e6b8e..ff2f3de86a 100755
--- a/helpcontent2/source/text/sbasic/shared/03090408.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090408.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090408.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090409.xhp b/helpcontent2/source/text/sbasic/shared/03090409.xhp
index 3bbd317726..137f6f7ed6 100755
--- a/helpcontent2/source/text/sbasic/shared/03090409.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090409.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090409.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090410.xhp b/helpcontent2/source/text/sbasic/shared/03090410.xhp
index 97aba7eb33..9a6b0833d9 100755
--- a/helpcontent2/source/text/sbasic/shared/03090410.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090410.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090410.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090411.xhp b/helpcontent2/source/text/sbasic/shared/03090411.xhp
index 78a3d86154..27f0d54f6f 100755
--- a/helpcontent2/source/text/sbasic/shared/03090411.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090411.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090411.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03090412.xhp b/helpcontent2/source/text/sbasic/shared/03090412.xhp
index e2c6a74f96..13557ee7c6 100644
--- a/helpcontent2/source/text/sbasic/shared/03090412.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090412.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090412.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100000.xhp b/helpcontent2/source/text/sbasic/shared/03100000.xhp
index dcc354ec54..221b239ba6 100755
--- a/helpcontent2/source/text/sbasic/shared/03100000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100050.xhp b/helpcontent2/source/text/sbasic/shared/03100050.xhp
index ffcebb3155..553c6dd6a2 100755
--- a/helpcontent2/source/text/sbasic/shared/03100050.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100050.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100050.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100060.xhp b/helpcontent2/source/text/sbasic/shared/03100060.xhp
index 89ecea27d6..2c4f6de731 100755
--- a/helpcontent2/source/text/sbasic/shared/03100060.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100060.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100060.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100070.xhp b/helpcontent2/source/text/sbasic/shared/03100070.xhp
index e27c03707e..a1db6c4139 100755
--- a/helpcontent2/source/text/sbasic/shared/03100070.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100070.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100070.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100080.xhp b/helpcontent2/source/text/sbasic/shared/03100080.xhp
index b9c8bb1a51..fc66d023f0 100755
--- a/helpcontent2/source/text/sbasic/shared/03100080.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100080.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100080.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100100.xhp b/helpcontent2/source/text/sbasic/shared/03100100.xhp
index 7049f599ca..f8fd76636d 100755
--- a/helpcontent2/source/text/sbasic/shared/03100100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100300.xhp b/helpcontent2/source/text/sbasic/shared/03100300.xhp
index d5ff59cf44..2b203d3634 100755
--- a/helpcontent2/source/text/sbasic/shared/03100300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100400.xhp b/helpcontent2/source/text/sbasic/shared/03100400.xhp
index 0f7e0e964a..f454264895 100755
--- a/helpcontent2/source/text/sbasic/shared/03100400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100500.xhp b/helpcontent2/source/text/sbasic/shared/03100500.xhp
index d156ab2856..ce93b797cb 100755
--- a/helpcontent2/source/text/sbasic/shared/03100500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100600.xhp b/helpcontent2/source/text/sbasic/shared/03100600.xhp
index a086746ce0..335ff9e8f3 100755
--- a/helpcontent2/source/text/sbasic/shared/03100600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100700.xhp b/helpcontent2/source/text/sbasic/shared/03100700.xhp
index 814f60378c..e5c70dc0ff 100755
--- a/helpcontent2/source/text/sbasic/shared/03100700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03100900.xhp b/helpcontent2/source/text/sbasic/shared/03100900.xhp
index 19f35f9f21..399c343a66 100755
--- a/helpcontent2/source/text/sbasic/shared/03100900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101000.xhp b/helpcontent2/source/text/sbasic/shared/03101000.xhp
index 7cab93d701..2526f059e6 100755
--- a/helpcontent2/source/text/sbasic/shared/03101000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101100.xhp b/helpcontent2/source/text/sbasic/shared/03101100.xhp
index bc87e8939a..7cd0976459 100755
--- a/helpcontent2/source/text/sbasic/shared/03101100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101110.xhp b/helpcontent2/source/text/sbasic/shared/03101110.xhp
index e3fbd48e8c..ac0682cfff 100755
--- a/helpcontent2/source/text/sbasic/shared/03101110.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101110.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101110.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101120.xhp b/helpcontent2/source/text/sbasic/shared/03101120.xhp
index 60b4bde568..5477e07623 100755
--- a/helpcontent2/source/text/sbasic/shared/03101120.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101120.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101120.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101130.xhp b/helpcontent2/source/text/sbasic/shared/03101130.xhp
index 4e5bf6e591..be99de3a82 100755
--- a/helpcontent2/source/text/sbasic/shared/03101130.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101130.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101130.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101140.xhp b/helpcontent2/source/text/sbasic/shared/03101140.xhp
index d88043daec..5654e043bf 100755
--- a/helpcontent2/source/text/sbasic/shared/03101140.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101140.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101140.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101300.xhp b/helpcontent2/source/text/sbasic/shared/03101300.xhp
index 50dad4766b..fa8828313d 100755
--- a/helpcontent2/source/text/sbasic/shared/03101300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101400.xhp b/helpcontent2/source/text/sbasic/shared/03101400.xhp
index e675f17f7f..88146bebbb 100755
--- a/helpcontent2/source/text/sbasic/shared/03101400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101500.xhp b/helpcontent2/source/text/sbasic/shared/03101500.xhp
index 21ddbe9a78..4b59301441 100755
--- a/helpcontent2/source/text/sbasic/shared/03101500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101600.xhp b/helpcontent2/source/text/sbasic/shared/03101600.xhp
index 0df869d243..8e236758d3 100755
--- a/helpcontent2/source/text/sbasic/shared/03101600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03101700.xhp b/helpcontent2/source/text/sbasic/shared/03101700.xhp
index 298e0fcb98..eb631019b0 100755
--- a/helpcontent2/source/text/sbasic/shared/03101700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03101700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102000.xhp b/helpcontent2/source/text/sbasic/shared/03102000.xhp
index b62fb5290f..6402243a69 100755
--- a/helpcontent2/source/text/sbasic/shared/03102000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102100.xhp b/helpcontent2/source/text/sbasic/shared/03102100.xhp
index cb9c126aa4..25dfe8903a 100644
--- a/helpcontent2/source/text/sbasic/shared/03102100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102101.xhp b/helpcontent2/source/text/sbasic/shared/03102101.xhp
index 64c10377cf..54df46fb07 100755
--- a/helpcontent2/source/text/sbasic/shared/03102101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102101.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102200.xhp b/helpcontent2/source/text/sbasic/shared/03102200.xhp
index a308cad892..8fc1189909 100755
--- a/helpcontent2/source/text/sbasic/shared/03102200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102300.xhp b/helpcontent2/source/text/sbasic/shared/03102300.xhp
index 49ce88d258..b5507de522 100755
--- a/helpcontent2/source/text/sbasic/shared/03102300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102400.xhp b/helpcontent2/source/text/sbasic/shared/03102400.xhp
index 32f519afc6..6f9789a2a9 100755
--- a/helpcontent2/source/text/sbasic/shared/03102400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102450.xhp b/helpcontent2/source/text/sbasic/shared/03102450.xhp
index 818d97694e..08a8a48e40 100755
--- a/helpcontent2/source/text/sbasic/shared/03102450.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102450.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102450.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102600.xhp b/helpcontent2/source/text/sbasic/shared/03102600.xhp
index d05e5a93ad..750c23b8a5 100755
--- a/helpcontent2/source/text/sbasic/shared/03102600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102600.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102700.xhp b/helpcontent2/source/text/sbasic/shared/03102700.xhp
index 354fba67d2..8c31eed8e8 100755
--- a/helpcontent2/source/text/sbasic/shared/03102700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102700.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102800.xhp b/helpcontent2/source/text/sbasic/shared/03102800.xhp
index 051ea98b8c..8c7724ccaa 100755
--- a/helpcontent2/source/text/sbasic/shared/03102800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102800.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03102900.xhp b/helpcontent2/source/text/sbasic/shared/03102900.xhp
index 958d10fce3..d0662a78f2 100755
--- a/helpcontent2/source/text/sbasic/shared/03102900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03102900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103000.xhp b/helpcontent2/source/text/sbasic/shared/03103000.xhp
index b816a69715..997edf5be1 100755
--- a/helpcontent2/source/text/sbasic/shared/03103000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103100.xhp b/helpcontent2/source/text/sbasic/shared/03103100.xhp
index 7d83e81e47..38c8b3bf95 100644
--- a/helpcontent2/source/text/sbasic/shared/03103100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103200.xhp b/helpcontent2/source/text/sbasic/shared/03103200.xhp
index 0b7cbac0fe..1f21efc8f6 100644
--- a/helpcontent2/source/text/sbasic/shared/03103200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103300.xhp b/helpcontent2/source/text/sbasic/shared/03103300.xhp
index 56339e568a..bfa8d875e7 100644
--- a/helpcontent2/source/text/sbasic/shared/03103300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103400.xhp b/helpcontent2/source/text/sbasic/shared/03103400.xhp
index 5867172e54..b73e28bdd2 100755
--- a/helpcontent2/source/text/sbasic/shared/03103400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103450.xhp b/helpcontent2/source/text/sbasic/shared/03103450.xhp
index d7e35dfee2..c9e5d8e41c 100755
--- a/helpcontent2/source/text/sbasic/shared/03103450.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103450.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103450.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103500.xhp b/helpcontent2/source/text/sbasic/shared/03103500.xhp
index 1741127d35..25abc383cb 100644
--- a/helpcontent2/source/text/sbasic/shared/03103500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103500.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103600.xhp b/helpcontent2/source/text/sbasic/shared/03103600.xhp
index 968b09efd8..7f09ef0a5f 100755
--- a/helpcontent2/source/text/sbasic/shared/03103600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103700.xhp b/helpcontent2/source/text/sbasic/shared/03103700.xhp
index 73a73d3b45..6d7fe49280 100755
--- a/helpcontent2/source/text/sbasic/shared/03103700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103700.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103800.xhp b/helpcontent2/source/text/sbasic/shared/03103800.xhp
index 87a1ada5a9..f592aa7387 100755
--- a/helpcontent2/source/text/sbasic/shared/03103800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103800.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03103900.xhp b/helpcontent2/source/text/sbasic/shared/03103900.xhp
index a91ecb58ff..738a06fd5f 100755
--- a/helpcontent2/source/text/sbasic/shared/03103900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03103900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104000.xhp b/helpcontent2/source/text/sbasic/shared/03104000.xhp
index 093f0e5692..08dfb3bc81 100755
--- a/helpcontent2/source/text/sbasic/shared/03104000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104100.xhp b/helpcontent2/source/text/sbasic/shared/03104100.xhp
index 08bcb9b48f..14cfd9885a 100755
--- a/helpcontent2/source/text/sbasic/shared/03104100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104200.xhp b/helpcontent2/source/text/sbasic/shared/03104200.xhp
index 55fd06760f..258e10da24 100755
--- a/helpcontent2/source/text/sbasic/shared/03104200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104300.xhp b/helpcontent2/source/text/sbasic/shared/03104300.xhp
index 2c31a30747..d0b1dd4360 100755
--- a/helpcontent2/source/text/sbasic/shared/03104300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104400.xhp b/helpcontent2/source/text/sbasic/shared/03104400.xhp
index 5adcf7d43e..158530170f 100755
--- a/helpcontent2/source/text/sbasic/shared/03104400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104500.xhp b/helpcontent2/source/text/sbasic/shared/03104500.xhp
index a4b980f53c..88c8393dcf 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104500.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03104500.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsbasicshared03104500xml" indexer="include" status="PUBLISH">
@@ -55,7 +52,7 @@
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="6">Bool</paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph>
 <paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="CHG" oldref="8">Uno type : A UnoObject</paragraph>
-<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:<comment>UFI: copied from dev guide http://api.openoffice.org/docs/DevelopersGuide/ProfUNO/ProfUNO.htm#1+4+3+OpenOffice.org+Basic</comment></paragraph>
+<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:</paragraph>
 <paragraph role="code" id="par_idN10632" xml-lang="en-US" l10n="NEW">Sub Main</paragraph>
 <paragraph role="code" id="par_idN10635" xml-lang="en-US" l10n="NEW">Dim bIsStruct</paragraph>
 <paragraph role="code" id="par_idN10638" xml-lang="en-US" l10n="NEW">' Instantiate a service</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03104600.xhp b/helpcontent2/source/text/sbasic/shared/03104600.xhp
index 42e3beabec..0232d2d45e 100755
--- a/helpcontent2/source/text/sbasic/shared/03104600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03104700.xhp b/helpcontent2/source/text/sbasic/shared/03104700.xhp
index 9912050396..6ebf6c920a 100755
--- a/helpcontent2/source/text/sbasic/shared/03104700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03104700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03110000.xhp b/helpcontent2/source/text/sbasic/shared/03110000.xhp
index b0689a73b9..959142886c 100755
--- a/helpcontent2/source/text/sbasic/shared/03110000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03110100.xhp b/helpcontent2/source/text/sbasic/shared/03110100.xhp
index ed7eb5ab3f..c59cdbc92a 100755
--- a/helpcontent2/source/text/sbasic/shared/03110100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03110100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03110100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120000.xhp b/helpcontent2/source/text/sbasic/shared/03120000.xhp
index fff2a18d64..82356acb6d 100755
--- a/helpcontent2/source/text/sbasic/shared/03120000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120100.xhp b/helpcontent2/source/text/sbasic/shared/03120100.xhp
index 67dabb8c21..8dc81f6c12 100755
--- a/helpcontent2/source/text/sbasic/shared/03120100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120101.xhp b/helpcontent2/source/text/sbasic/shared/03120101.xhp
index ea4f6afdcd..39f9b6e0d1 100755
--- a/helpcontent2/source/text/sbasic/shared/03120101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120101.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120102.xhp b/helpcontent2/source/text/sbasic/shared/03120102.xhp
index e2e2f9505d..590668b1ad 100755
--- a/helpcontent2/source/text/sbasic/shared/03120102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120102.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120103.xhp b/helpcontent2/source/text/sbasic/shared/03120103.xhp
index bc6932fd78..725610b571 100755
--- a/helpcontent2/source/text/sbasic/shared/03120103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120103.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120104.xhp b/helpcontent2/source/text/sbasic/shared/03120104.xhp
index a092c35b75..4053a9a5d8 100755
--- a/helpcontent2/source/text/sbasic/shared/03120104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120104.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120104.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120105.xhp b/helpcontent2/source/text/sbasic/shared/03120105.xhp
index ab38007903..e7594f0514 100755
--- a/helpcontent2/source/text/sbasic/shared/03120105.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120105.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120200.xhp b/helpcontent2/source/text/sbasic/shared/03120200.xhp
index 812d51896e..54d7402f4f 100755
--- a/helpcontent2/source/text/sbasic/shared/03120200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120201.xhp b/helpcontent2/source/text/sbasic/shared/03120201.xhp
index 707f92cd44..128cdf3620 100755
--- a/helpcontent2/source/text/sbasic/shared/03120201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120202.xhp b/helpcontent2/source/text/sbasic/shared/03120202.xhp
index d30ba6e74f..249fe5004b 100755
--- a/helpcontent2/source/text/sbasic/shared/03120202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120300.xhp b/helpcontent2/source/text/sbasic/shared/03120300.xhp
index 8753aa08fb..35b220c429 100755
--- a/helpcontent2/source/text/sbasic/shared/03120300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120301.xhp b/helpcontent2/source/text/sbasic/shared/03120301.xhp
index 20525beb3e..f5435495f2 100755
--- a/helpcontent2/source/text/sbasic/shared/03120301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120301.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120302.xhp b/helpcontent2/source/text/sbasic/shared/03120302.xhp
index e9619d6615..a4eb0af31f 100755
--- a/helpcontent2/source/text/sbasic/shared/03120302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120303.xhp b/helpcontent2/source/text/sbasic/shared/03120303.xhp
index b7729ee77e..a96828cee1 100755
--- a/helpcontent2/source/text/sbasic/shared/03120303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120303.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120303.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120304.xhp b/helpcontent2/source/text/sbasic/shared/03120304.xhp
index 9eb3da50a2..d4ac846723 100755
--- a/helpcontent2/source/text/sbasic/shared/03120304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120304.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120304.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120305.xhp b/helpcontent2/source/text/sbasic/shared/03120305.xhp
index 80b531cb69..90b9e7e36c 100755
--- a/helpcontent2/source/text/sbasic/shared/03120305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120305.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120305.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120306.xhp b/helpcontent2/source/text/sbasic/shared/03120306.xhp
index ec1243c799..aa27f9f7d4 100755
--- a/helpcontent2/source/text/sbasic/shared/03120306.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120306.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120306.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120307.xhp b/helpcontent2/source/text/sbasic/shared/03120307.xhp
index 3f49b5ae95..88bd2d6dc5 100755
--- a/helpcontent2/source/text/sbasic/shared/03120307.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120307.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120307.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120308.xhp b/helpcontent2/source/text/sbasic/shared/03120308.xhp
index c2f150e7ce..3fcea46178 100755
--- a/helpcontent2/source/text/sbasic/shared/03120308.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120308.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120308.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120309.xhp b/helpcontent2/source/text/sbasic/shared/03120309.xhp
index 1c5e096f12..cfdc43abe5 100755
--- a/helpcontent2/source/text/sbasic/shared/03120309.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120309.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120309.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120310.xhp b/helpcontent2/source/text/sbasic/shared/03120310.xhp
index b3de603ce5..5cd4875be7 100755
--- a/helpcontent2/source/text/sbasic/shared/03120310.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120310.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120310.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120311.xhp b/helpcontent2/source/text/sbasic/shared/03120311.xhp
index e591c2815f..367c2ed9d8 100755
--- a/helpcontent2/source/text/sbasic/shared/03120311.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120311.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120311.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120312.xhp b/helpcontent2/source/text/sbasic/shared/03120312.xhp
index 3a9df1dc3c..0c610ab041 100755
--- a/helpcontent2/source/text/sbasic/shared/03120312.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120312.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120312.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120313.xhp b/helpcontent2/source/text/sbasic/shared/03120313.xhp
index 0b0e837f5f..dbf641cae3 100755
--- a/helpcontent2/source/text/sbasic/shared/03120313.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120313.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120313.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120314.xhp b/helpcontent2/source/text/sbasic/shared/03120314.xhp
index 0e98c4a392..fcd61b6598 100755
--- a/helpcontent2/source/text/sbasic/shared/03120314.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120314.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120314.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120315.xhp b/helpcontent2/source/text/sbasic/shared/03120315.xhp
index 0f242e6f9c..35b8e37fa8 100755
--- a/helpcontent2/source/text/sbasic/shared/03120315.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120315.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120315.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120400.xhp b/helpcontent2/source/text/sbasic/shared/03120400.xhp
index 8486b646f6..2149ad51b6 100755
--- a/helpcontent2/source/text/sbasic/shared/03120400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120401.xhp b/helpcontent2/source/text/sbasic/shared/03120401.xhp
index fc2b6e0d79..8bb9400287 100755
--- a/helpcontent2/source/text/sbasic/shared/03120401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120401.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@ DEDR: Reviewed</lastedited>
 <paragraph role="paragraph" id="par_id3153990" xml-lang="en-US" l10n="U" oldref="2">Returns the position of a string within another string.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="U" oldref="3">The Instr function returns the position at which the match was found. If the string was not found, the function returns 0.</paragraph>
-<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1" l10n="U" oldref="4">Syntax:</paragraph>
+<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="4">Syntax:</paragraph>
 <paragraph role="code" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">InStr ([Start As Long,] Text1 As String, Text2 As String[, Compare])</paragraph>
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="6">Return value:</paragraph>
 <paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="7">Integer</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03120402.xhp b/helpcontent2/source/text/sbasic/shared/03120402.xhp
index 262dbf0e95..d3957d4fef 100755
--- a/helpcontent2/source/text/sbasic/shared/03120402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120402.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120402.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03120403.xhp b/helpcontent2/source/text/sbasic/shared/03120403.xhp
index 96f7f2d31b..6b6a17acd5 100755
--- a/helpcontent2/source/text/sbasic/shared/03120403.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120403.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120403.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130000.xhp b/helpcontent2/source/text/sbasic/shared/03130000.xhp
index 2d7388bba7..d3dd1711e7 100755
--- a/helpcontent2/source/text/sbasic/shared/03130000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130100.xhp b/helpcontent2/source/text/sbasic/shared/03130100.xhp
index ee8823d124..e89c6c5e65 100755
--- a/helpcontent2/source/text/sbasic/shared/03130100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130500.xhp b/helpcontent2/source/text/sbasic/shared/03130500.xhp
index 47ab60f8bd..82ac7a14f9 100755
--- a/helpcontent2/source/text/sbasic/shared/03130500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130600.xhp b/helpcontent2/source/text/sbasic/shared/03130600.xhp
index ce91b468a7..e871a9e800 100755
--- a/helpcontent2/source/text/sbasic/shared/03130600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130700.xhp b/helpcontent2/source/text/sbasic/shared/03130700.xhp
index f8a32c40fc..da0b5f6cc7 100755
--- a/helpcontent2/source/text/sbasic/shared/03130700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03130800.xhp b/helpcontent2/source/text/sbasic/shared/03130800.xhp
index d10d1e736f..d0590c2309 100755
--- a/helpcontent2/source/text/sbasic/shared/03130800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130800.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131000.xhp b/helpcontent2/source/text/sbasic/shared/03131000.xhp
index 4c3618a5cd..286021e969 100755
--- a/helpcontent2/source/text/sbasic/shared/03131000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131300.xhp b/helpcontent2/source/text/sbasic/shared/03131300.xhp
index f7f4aa0b70..01d730012d 100755
--- a/helpcontent2/source/text/sbasic/shared/03131300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131400.xhp b/helpcontent2/source/text/sbasic/shared/03131400.xhp
index 2a2e7ee8eb..35d90c75b6 100755
--- a/helpcontent2/source/text/sbasic/shared/03131400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131400.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131500.xhp b/helpcontent2/source/text/sbasic/shared/03131500.xhp
index 5e0eb658c3..a20e071e64 100755
--- a/helpcontent2/source/text/sbasic/shared/03131500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131600.xhp b/helpcontent2/source/text/sbasic/shared/03131600.xhp
index 4101acf7b3..258f3a8a36 100755
--- a/helpcontent2/source/text/sbasic/shared/03131600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131700.xhp b/helpcontent2/source/text/sbasic/shared/03131700.xhp
index 718995afed..e01f900ecb 100755
--- a/helpcontent2/source/text/sbasic/shared/03131700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131800.xhp b/helpcontent2/source/text/sbasic/shared/03131800.xhp
index a4338bdc50..86f5893aeb 100755
--- a/helpcontent2/source/text/sbasic/shared/03131800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131800.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03131900.xhp b/helpcontent2/source/text/sbasic/shared/03131900.xhp
index 147a713491..64acd20e27 100755
--- a/helpcontent2/source/text/sbasic/shared/03131900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03131900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03132000.xhp b/helpcontent2/source/text/sbasic/shared/03132000.xhp
index e2f1216599..edaaa28088 100644
--- a/helpcontent2/source/text/sbasic/shared/03132000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03132100.xhp b/helpcontent2/source/text/sbasic/shared/03132100.xhp
index 148b5611aa..7f5d32edad 100755
--- a/helpcontent2/source/text/sbasic/shared/03132100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132100.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,38 +27,35 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsbasicshared03132100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">GetGuiType Function [Runtime]</title>
-<filename>/text/sbasic/shared/03132100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T12:25:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="getguitype">
+      <topic id="textsbasicshared03132100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">GetGuiType Function [Runtime]</title>
+         <filename>/text/sbasic/shared/03132100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="getguitype">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147143"><bookmark_value>GetGuiType function</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155310" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03132100.xhp" name="GetGuiType Function [Runtime]">GetGuiType Function [Runtime]</link></paragraph>
-<paragraph role="paragraph" id="par_id3152459" xml-lang="en-US" l10n="U" oldref="2">Returns a numerical value that specifies the graphical user interface.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="3">This runtime function is only provided for downward compatibility to previous versions. The return value is not defined in client-server environments.</paragraph>
-<paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="2" l10n="U" oldref="4">Syntax:</paragraph>
-<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="5">GetGUIType()</paragraph>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="6">Return value:</paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="7">Integer</paragraph>
-<paragraph role="heading" id="hd_id3149177" xml-lang="en-US" level="2" l10n="U" oldref="8">Return values:</paragraph>
-<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="9">1: Windows</paragraph>
-<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="10">3: Mac OS</paragraph>
-<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="11">4: UNIX</paragraph>
-<paragraph role="heading" id="hd_id3148685" xml-lang="en-US" level="2" l10n="U" oldref="12">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="13">Sub ExampleEnvironment</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="14">MsgBox GetGUIType</paragraph>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="15">End Sub</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3155310" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03132100.xhp" name="GetGuiType Function [Runtime]">GetGuiType Function [Runtime]</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152459" role="paragraph" l10n="U" oldref="2">Returns a numerical value that specifies the graphical user interface.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153323" role="paragraph" l10n="U" oldref="3">This runtime function is only provided for downward compatibility to previous versions. The return value is not defined in client-server environments.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154894" role="heading" level="2" l10n="U" oldref="4">Syntax:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="5">GetGUIType()</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="2" l10n="U" oldref="6">Return value:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="7">Integer</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149177" role="heading" level="2" l10n="U" oldref="8">Return values:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147242" role="paragraph" l10n="U" oldref="9">1: Windows</paragraph><comment>removed 3: Mac OS, see i95717</comment>
+<paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="11">4: UNIX</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148685" role="heading" level="2" l10n="U"
+                 oldref="12">Example:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="13">Sub ExampleEnvironment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145609" role="paragraph" l10n="U" oldref="14">MsgBox GetGUIType</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="15">End Sub</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/03132200.xhp b/helpcontent2/source/text/sbasic/shared/03132200.xhp
index 7bdf2aecb5..6e62c94cac 100755
--- a/helpcontent2/source/text/sbasic/shared/03132200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03132300.xhp b/helpcontent2/source/text/sbasic/shared/03132300.xhp
index 45596ec18e..51c0e87e93 100644
--- a/helpcontent2/source/text/sbasic/shared/03132300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03132400.xhp b/helpcontent2/source/text/sbasic/shared/03132400.xhp
index 3f7031b7f5..b16ccbdd94 100644
--- a/helpcontent2/source/text/sbasic/shared/03132400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/03132500.xhp b/helpcontent2/source/text/sbasic/shared/03132500.xhp
index 48e9da1e38..b5addb33c4 100644
--- a/helpcontent2/source/text/sbasic/shared/03132500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03132500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/05060700.xhp b/helpcontent2/source/text/sbasic/shared/05060700.xhp
index d76bdcc75a..332d569cc1 100755
--- a/helpcontent2/source/text/sbasic/shared/05060700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/05060700.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/keys.xhp b/helpcontent2/source/text/sbasic/shared/keys.xhp
index dd631b4921..16bf7a5ab6 100755
--- a/helpcontent2/source/text/sbasic/shared/keys.xhp
+++ b/helpcontent2/source/text/sbasic/shared/keys.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keys.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sbasic/shared/main0211.xhp b/helpcontent2/source/text/sbasic/shared/main0211.xhp
index cba6fc0644..4978c28232 100644
--- a/helpcontent2/source/text/sbasic/shared/main0211.xhp
+++ b/helpcontent2/source/text/sbasic/shared/main0211.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0211.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
   
   
   <section id="makro">
-  <bookmark id="bm_id3150543" branch="index" xml-lang="en-US"><bookmark_value>toolbars; Basic IDE</bookmark_value><bookmark_value>macro toolbar</bookmark_value></bookmark><bookmark branch="hid/HID_BASICIDE_TOOLBOX" xml-lang="en-US" id="bm_id3148453"/><bookmark branch="hid/.uno:MacroBarVisible" xml-lang="en-US" id="bm_id3153539"/><paragraph id="hd_id3150543" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/sbasic/shared/main0211.xhp" name="Macro Toolbar">Macro Toolbar</link></paragraph>
+  <bookmark id="bm_id3150543" branch="index" xml-lang="en-US"><bookmark_value>toolbars; Basic IDE</bookmark_value><bookmark_value>macro toolbar</bookmark_value></bookmark><!-- removed HID HID_BASICIDE_TOOLBOX --><bookmark branch="hid/.uno:MacroBarVisible" xml-lang="en-US" id="bm_id3153539"/><paragraph id="hd_id3150543" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/sbasic/shared/main0211.xhp" name="Macro Toolbar">Macro Toolbar</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147288" xml-lang="en-US" oldref="2"><ahelp visibility="visible" hid=".uno:MacroBarVisible">The <emph>Macro Toolbar </emph>contains commands to create, edit, and run macros.</ahelp></paragraph>
   </section>
   <embed href="text/sbasic/shared/02/11010000.xhp#bibliothek"/>
@@ -75,11 +72,13 @@
   <embed href="text/sbasic/shared/02/11110000.xhp#symodule"/>
   <embed href="text/sbasic/shared/02/11120000.xhp#klammer"/>
   <embed href="text/sbasic/shared/02/11120000.xhp#syklammer"/>
-  <embed href="text/sbasic/shared/02/20000000.xhp#kontrollfelder"/>
-  <embed href="text/sbasic/shared/02/20000000.xhp#sykontrollfelder"/>
   <embed href="text/sbasic/shared/02/11140000.xhp#laden"/>
   <embed href="text/sbasic/shared/02/11140000.xhp#syladen"/>
   <embed href="text/sbasic/shared/02/11150000.xhp#speichern"/>
   <embed href="text/sbasic/shared/02/11150000.xhp#syspeichern"/>
+  <embed href="text/sbasic/shared/02/11180000.xhp#import"/>
+  <embed href="text/sbasic/shared/02/11180000.xhp#syimport"/>
+  <embed href="text/sbasic/shared/02/11190000.xhp#export"/>
+  <embed href="text/sbasic/shared/02/11190000.xhp#syexport"/>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/main0601.xhp b/helpcontent2/source/text/sbasic/shared/main0601.xhp
index 31ff313cfa..b2e387962b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/main0601.xhp
+++ b/helpcontent2/source/text/sbasic/shared/main0601.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0601.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,7 +28,7 @@
  *
  ************************************************************************-->
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsbasicsharedmain0601xml" indexer="include" status="PUBLISH">
@@ -48,7 +45,6 @@
 <paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/main0601.xhp" name="$[officename] Basic Help">%PRODUCTNAME Basic Help</link></paragraph>
 <section id="basicalt">
 <paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="4">%PRODUCTNAME %PRODUCTVERSION provides an Application Programming Interface (API) that allows controlling the $[officename] components with different programming languages by using the $[officename] Software Development Kit (SDK). For more information about the $[officename] API and the Software Development Kit, visit <link href="http://api.openoffice.org/" name="http://api.openoffice.org">http://api.openoffice.org</link></paragraph>
-<paragraph role="paragraph" id="par_id3150713" xml-lang="en-US" l10n="CHG" oldref="6">Due to changes to the API, any macros created with StarOffice 5.2 or before are no longer supported by later versions.</paragraph>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="http://wiki.services.openoffice.org/wiki/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="3" l10n="U" oldref="9">Working with %PRODUCTNAME Basic</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/makefile.mk b/helpcontent2/source/text/sbasic/shared/makefile.mk
index 1ae2d0bf4d..1bc1ea679a 100644
--- a/helpcontent2/source/text/sbasic/shared/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -323,4 +319,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/00/00000004.xhp b/helpcontent2/source/text/scalc/00/00000004.xhp
index 428df299c2..9dfc242af6 100755
--- a/helpcontent2/source/text/scalc/00/00000004.xhp
+++ b/helpcontent2/source/text/scalc/00/00000004.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000402.xhp b/helpcontent2/source/text/scalc/00/00000402.xhp
index c9a8c55f0a..aef592156e 100755
--- a/helpcontent2/source/text/scalc/00/00000402.xhp
+++ b/helpcontent2/source/text/scalc/00/00000402.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000402.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000403.xhp b/helpcontent2/source/text/scalc/00/00000403.xhp
index 9f9a81903b..2fc66f406a 100755
--- a/helpcontent2/source/text/scalc/00/00000403.xhp
+++ b/helpcontent2/source/text/scalc/00/00000403.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000403.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000404.xhp b/helpcontent2/source/text/scalc/00/00000404.xhp
index 389164e91f..53cc548826 100644
--- a/helpcontent2/source/text/scalc/00/00000404.xhp
+++ b/helpcontent2/source/text/scalc/00/00000404.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000404.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000405.xhp b/helpcontent2/source/text/scalc/00/00000405.xhp
index dfb7e8e923..706ba56461 100644
--- a/helpcontent2/source/text/scalc/00/00000405.xhp
+++ b/helpcontent2/source/text/scalc/00/00000405.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000405.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000406.xhp b/helpcontent2/source/text/scalc/00/00000406.xhp
index 372d527b28..8796b4245c 100755
--- a/helpcontent2/source/text/scalc/00/00000406.xhp
+++ b/helpcontent2/source/text/scalc/00/00000406.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000407.xhp b/helpcontent2/source/text/scalc/00/00000407.xhp
index cf8c0fa378..f36bbdccd7 100755
--- a/helpcontent2/source/text/scalc/00/00000407.xhp
+++ b/helpcontent2/source/text/scalc/00/00000407.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000407.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/00000412.xhp b/helpcontent2/source/text/scalc/00/00000412.xhp
index 9254a4aa93..a432a91a4f 100644
--- a/helpcontent2/source/text/scalc/00/00000412.xhp
+++ b/helpcontent2/source/text/scalc/00/00000412.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000412.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/00/makefile.mk b/helpcontent2/source/text/scalc/00/makefile.mk
index 464c9fdb32..cb08d8fd97 100644
--- a/helpcontent2/source/text/scalc/00/makefile.mk
+++ b/helpcontent2/source/text/scalc/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,4 +56,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/01/01120000.xhp b/helpcontent2/source/text/scalc/01/01120000.xhp
index 075833d26c..31aaf24f1a 100644
--- a/helpcontent2/source/text/scalc/01/01120000.xhp
+++ b/helpcontent2/source/text/scalc/01/01120000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp
index 828a6bccbc..d30cc6e423 100644
--- a/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/helpcontent2/source/text/scalc/01/02110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,7 +67,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="E">
-<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -86,7 +83,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152994" xml-lang="en-US" l10n="E">
-<image id="img_id3150515" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150515" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -102,7 +99,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="E">
-<image id="img_id3148871" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148871" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -118,7 +115,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="E">
-<image id="img_id3149126" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149126" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -134,7 +131,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155597" xml-lang="en-US" l10n="E">
-<image id="img_id3154738" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154738" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -150,7 +147,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148745" xml-lang="en-US" l10n="E">
-<image id="img_id3159256" src="sc/res/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159256" src="sc/res/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -173,7 +170,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="E">
-<image id="img_id3159119" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159119" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/scalc/01/02120000.xhp b/helpcontent2/source/text/scalc/01/02120000.xhp
index 32cb20f0d0..6c516ffb02 100644
--- a/helpcontent2/source/text/scalc/01/02120000.xhp
+++ b/helpcontent2/source/text/scalc/01/02120000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02120000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,29 +29,25 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalc0102120000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Headers &amp; Footers</title>
-<filename>/text/scalc/01/02120000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-20T15:25:29">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalc0102120000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Headers &amp; Footers</title>
+         <filename>/text/scalc/01/02120000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_HFEDIT" id="bm_id6105651" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EditHeaderAndFooter" id="bm_id3149960" localize="false"/><comment>mw deleted two index entries</comment>
-<paragraph role="heading" id="hd_id3145251" xml-lang="en-US" level="1" l10n="U" oldref="1">Headers &amp; Footers</paragraph>
-<paragraph role="paragraph" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="2"><variable id="kopfundfusszeilentext"><ahelp hid=".uno:EditHeaderAndFooter">Allows you to define and format headers and footers.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3145251" role="heading" level="1" l10n="U" oldref="1">Headers &amp; Footers</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151073" role="paragraph" l10n="U" oldref="2"><variable id="kopfundfusszeilentext"><ahelp hid=".uno:EditHeaderAndFooter">Allows you to define and format headers and footers.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="3">The<emph> Headers/Footers </emph>dialog contains the tabs for defining headers and footers. There will be separate tabs for the left and right page headers and footers if the <emph>Same content left/right</emph> option was marked in the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog.</paragraph>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000402.xhp#kopffuss"/>
-</section>
-<embed href="text/scalc/01/02120100.xhp#kopfzeile"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="CHG" oldref="3">The<emph> Headers/Footers </emph>dialog contains the tabs for defining headers and footers. There will be separate tabs for the left and right page headers and footers if the <emph>Same content left/right</emph> option was not marked in the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog.</paragraph>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000402.xhp#kopffuss"/>
+      </section>
+      <embed href="text/scalc/01/02120100.xhp#kopfzeile"/>
+      <embed href="text/shared/00/00000001.xhp#zurueck"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/02120100.xhp b/helpcontent2/source/text/scalc/01/02120100.xhp
index 182dfbbccd..4aaf30bc72 100644
--- a/helpcontent2/source/text/scalc/01/02120100.xhp
+++ b/helpcontent2/source/text/scalc/01/02120100.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02120100.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,172 +29,173 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textscalc0102120100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Header/Footer</title>
-<filename>/text/scalc/01/02120100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-12T11:35:40">UFI: new list box added, spec "Enhanced header/footer dialog feature"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="kopfzeile">
+      <topic id="textscalc0102120100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Header/Footer</title>
+         <filename>/text/scalc/01/02120100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="kopfzeile">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153360"><bookmark_value>page styles; headers</bookmark_value>
-<bookmark_value>page styles; footers</bookmark_value>
-<bookmark_value>headers; defining</bookmark_value>
-<bookmark_value>footers; defining</bookmark_value>
-<bookmark_value>file names in headers/footers</bookmark_value>
-<bookmark_value>changing;dates, automatically</bookmark_value>
-<bookmark_value>dates;updating automatically</bookmark_value>
-<bookmark_value>automatic date updates</bookmark_value>
+         <bookmark_value>page styles; footers</bookmark_value>
+         <bookmark_value>headers; defining</bookmark_value>
+         <bookmark_value>footers; defining</bookmark_value>
+         <bookmark_value>file names in headers/footers</bookmark_value>
+         <bookmark_value>changing;dates, automatically</bookmark_value>
+         <bookmark_value>dates;updating automatically</bookmark_value>
+         <bookmark_value>automatic date updates</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_HFED_HR" id="bm_id3149655" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_HFED_FR" id="bm_id3150541" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_HFED_HL" id="bm_id3148799" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_HFED_FL" id="bm_id3156422" localize="false"/>
-<paragraph role="heading" id="hd_id3153360" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02120100.xhp" name="Header/Footer">Header/Footer</link></paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_HFED_FL">Defines or formats a header or footer for a Page Style.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000402.xhp#bkopfzeile"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3153360" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02120100.xhp" name="Header/Footer">Header/Footer</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_HFED_FL">Defines or formats a header or footer for a Page Style.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000402.xhp#bkopfzeile"/>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HRL" id="bm_id3156444" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HLL" id="bm_id3152578" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FRL" id="bm_id3155854" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FLL" id="bm_id3153726" localize="false"/>
-<paragraph role="heading" id="hd_id3145748" xml-lang="en-US" level="2" l10n="U" oldref="3">Left Area</paragraph>
-<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_SC_HF_FLL">Enter the text to be displayed at the left side of the header or footer.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145748" role="heading" level="2" l10n="U" oldref="3">Left Area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_SC_HF_FLL">Enter the text to be displayed at the left side of the header or footer.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HRC" id="bm_id3159153" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HLC" id="bm_id3159156" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FRC" id="bm_id3145273" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FLC" id="bm_id3153951" localize="false"/>
-<paragraph role="heading" id="hd_id3148648" xml-lang="en-US" level="2" l10n="U" oldref="5">Center Area</paragraph>
-<paragraph role="paragraph" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_SC_HF_FLC">Enter the text to be displayed at the center of the header or footer</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148648" role="heading" level="2" l10n="U" oldref="5">Center Area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="CHG" oldref="6"><ahelp hid=".">Enter the text to be displayed at the center of the header or footer.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HRR" id="bm_id3153159" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HLR" id="bm_id3149413" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FRR" id="bm_id3148457" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FLR" id="bm_id3155418" localize="false"/>
-<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="2" l10n="U" oldref="7">Right Area</paragraph>
-<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_SC_HF_FLR">Enter the text to be displayed at the right side of the header or footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/957992477" id="bm_id8357493" localize="false"/>
-<paragraph role="heading" id="par_idN10811" xml-lang="en-US" level="2" l10n="NEW">Header/Footer</paragraph>
-<paragraph role="paragraph" id="par_idN10815" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a predefined header or footer from the list.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154942" role="heading" level="2" l10n="U" oldref="7">Right Area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147126" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_SC_HF_FLR">Enter the text to be displayed at the right side of the header or footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HR_DEFINED" id="bm_id0609200910173918" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10811" role="heading" level="2" l10n="NEW">Header/Footer</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10815" role="paragraph" l10n="NEW"><ahelp hid=".">Select a predefined header or footer from the list.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_TEXT" id="bm_id3144766" localize="false"/>
-<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="9">Text attributes</paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_SC_HF_TEXT">Opens a dialog to assign formats to new or selected text.</ahelp> The <emph>Text Attributes </emph>dialog contains the tab pages <link href="text/shared/01/05020100.xhp" name="Font">Font</link>, <link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link> and <link href="text/shared/01/05020500.xhp" name="Font Position">Font Position</link>.</paragraph>
-<table id="tbl_id3149018">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159266" xml-lang="en-US" l10n="E">
-<image id="img_id3156386" src="sc/res/text.png" width="0.25inch" height="0.222inch"><alt id="alt_id3156386" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3154729" role="heading" level="2" l10n="U" oldref="9">Text attributes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_SC_HF_TEXT">Opens a dialog to assign formats to new or selected text.</ahelp> The <emph>Text Attributes </emph>dialog contains the tab pages <link href="text/shared/01/05020100.xhp" name="Font">Font</link>, <link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link> and <link href="text/shared/01/05020500.xhp" name="Font Position">Font Position</link>.</paragraph>
+      <table id="tbl_id3149018">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159266" role="paragraph" l10n="E">
+<image id="img_id3156386" src="sc/res/text.png" width="0.1874in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156386">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="U" oldref="25">Text Attributes</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155336" role="paragraph" l10n="U" oldref="25">Text Attributes</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FILE" id="bm_id3154020" localize="false"/>
-<paragraph role="heading" id="hd_id3145792" xml-lang="en-US" level="2" l10n="U" oldref="11">File Name </paragraph>
-<paragraph role="paragraph" id="par_id3150206" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_SC_HF_FILE">Inserts a file name placeholder in the selected area.</ahelp> Click to insert the title. Long-click <comment>UFI: this is still a long-click</comment>to select either title, file name or path/file name from the submenu. If a title has not be assigned (see <emph>File - Properties</emph>), the file name will be inserted instead.</paragraph>
-<table id="tbl_id3149529">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150369" xml-lang="en-US" l10n="E">
-<image id="img_id3150518" src="res/folderop.png" width="0.222inch" height="0.1665inch"><alt id="alt_id3150518" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3145792" role="heading" level="2" l10n="U"
+                 oldref="11">File Name </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150206" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="HID_SC_HF_FILE">Inserts a file name placeholder in the selected area.</ahelp> Click to insert the title. Long-click <comment>UFI: this is still a long-click</comment>to select either title, file name or path/file name from the submenu. If a title has not be assigned (see <emph>File - Properties</emph>), the file name will be inserted instead.</paragraph>
+      <table id="tbl_id3149529">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="E">
+<image id="img_id3150518" src="res/folderop.png" width="0.1665in" height="0.1252in"><alt xml-lang="en-US" id="alt_id3150518">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154487" xml-lang="en-US" l10n="U" oldref="26">File Name</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154487" role="paragraph" l10n="U" oldref="26">File Name</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_TABLE" id="bm_id3149408" localize="false"/>
-<paragraph role="heading" id="hd_id3155812" xml-lang="en-US" level="2" l10n="U" oldref="13">Sheet Name</paragraph>
-<paragraph role="paragraph" id="par_id3148842" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_SC_HF_TABLE">Inserts a placeholder in the selected header/footer area, which is replaced by the sheet name in the header/footer of the actual document.</ahelp></paragraph>
-<table id="tbl_id3159174">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146870" xml-lang="en-US" l10n="E">
-<image id="img_id3148870" src="sc/res/table.png" width="0.25inch" height="0.222inch"><alt id="alt_id3148870" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3155812" role="heading" level="2" l10n="U"
+                 oldref="13">Sheet Name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148842" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_SC_HF_TABLE">Inserts a placeholder in the selected header/footer area, which is replaced by the sheet name in the header/footer of the actual document.</ahelp></paragraph>
+      <table id="tbl_id3159174">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146870" role="paragraph" l10n="E">
+<image id="img_id3148870" src="sc/res/table.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148870">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147071" xml-lang="en-US" l10n="U" oldref="27">Sheet Name</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147071" role="paragraph" l10n="U" oldref="27">Sheet Name</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_PAGE" id="bm_id3153288" localize="false"/>
-<paragraph role="heading" id="hd_id3144768" xml-lang="en-US" level="2" l10n="U" oldref="15">Page</paragraph>
-<paragraph role="paragraph" id="par_id3154960" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_SC_HF_PAGE">Inserts a placeholder in the selected header/footer area, which is replaced by page numbering. This allows continuous page numbering in a document.</ahelp></paragraph>
-<table id="tbl_id3153246">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151304" xml-lang="en-US" l10n="E">
-<image id="img_id3155386" src="sc/res/page.png" width="0.25inch" height="0.222inch"><alt id="alt_id3155386" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3144768" role="heading" level="2" l10n="U"
+                 oldref="15">Page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154960" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_SC_HF_PAGE">Inserts a placeholder in the selected header/footer area, which is replaced by page numbering. This allows continuous page numbering in a document.</ahelp></paragraph>
+      <table id="tbl_id3153246">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151304" role="paragraph" l10n="E">
+<image id="img_id3155386" src="sc/res/page.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155386">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="28">Page</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150048" role="paragraph" l10n="U" oldref="28">Page</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_PAGES" id="bm_id3153012" localize="false"/>
-<paragraph role="heading" id="hd_id3146962" xml-lang="en-US" level="2" l10n="U" oldref="17">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3153812" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_SC_HF_PAGES">Inserts a placeholder in the selected header/footer area, which is replaced by the total number of pages in the document.</ahelp></paragraph>
-<table id="tbl_id3154737">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149315" xml-lang="en-US" l10n="E">
-<image id="img_id3155757" src="sc/res/pages.png" width="0.25inch" height="0.222inch"><alt id="alt_id3155757" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3146962" role="heading" level="2" l10n="U"
+                 oldref="17">Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153812" role="paragraph" l10n="U" oldref="18"><ahelp hid="HID_SC_HF_PAGES">Inserts a placeholder in the selected header/footer area, which is replaced by the total number of pages in the document.</ahelp></paragraph>
+      <table id="tbl_id3154737">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149315" role="paragraph" l10n="E">
+<image id="img_id3155757" src="sc/res/pages.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155757">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="U" oldref="29">Pages</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147499" role="paragraph" l10n="U" oldref="29">Pages</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_DATE" id="bm_id3150438" localize="false"/>
-<paragraph role="heading" id="hd_id3149050" xml-lang="en-US" level="2" l10n="U" oldref="19">Date</paragraph>
-<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_SC_HF_DATE">Inserts a placeholder in the selected header/footer area, which is replaced by the current date which will be repeated in the header/footer on each page of the document.</ahelp></paragraph>
-<table id="tbl_id3147406">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="E">
-<image id="img_id3150394" src="sc/res/date.png" width="0.25inch" height="0.25inch"><alt id="alt_id3150394" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149050" role="heading" level="2" l10n="U"
+                 oldref="19">Date</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_SC_HF_DATE">Inserts a placeholder in the selected header/footer area, which is replaced by the current date which will be repeated in the header/footer on each page of the document.</ahelp></paragraph>
+      <table id="tbl_id3147406">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147299" role="paragraph" l10n="E">
+<image id="img_id3150394" src="sc/res/date.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150394">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150540" xml-lang="en-US" l10n="U" oldref="30">Date</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150540" role="paragraph" l10n="U" oldref="30">Date</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_SC_HF_TIME" id="bm_id3147412" localize="false"/>
-<paragraph role="heading" id="hd_id3147610" xml-lang="en-US" level="2" l10n="U" oldref="21">Time</paragraph>
-<paragraph role="paragraph" id="par_id3145638" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_SC_HF_TIME">Inserts a placeholder in the selected header/footer area, which is replaced by the current time in the header/footer on each page of the document.</ahelp></paragraph>
-<table id="tbl_id3157875">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153122" xml-lang="en-US" l10n="E">
-<image id="img_id3146884" src="sc/res/time.png" width="0.25inch" height="0.222inch"><alt id="alt_id3146884" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3147610" role="heading" level="2" l10n="U"
+                 oldref="21">Time</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145638" role="paragraph" l10n="U" oldref="22"><ahelp hid="HID_SC_HF_TIME">Inserts a placeholder in the selected header/footer area, which is replaced by the current time in the header/footer on each page of the document.</ahelp></paragraph>
+      <table id="tbl_id3157875">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153122" role="paragraph" l10n="E">
+<image id="img_id3146884" src="sc/res/time.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3146884">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157904" xml-lang="en-US" l10n="U" oldref="31">Time</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157904" role="paragraph" l10n="U" oldref="31">Time</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/02140000.xhp b/helpcontent2/source/text/scalc/01/02140000.xhp
index e413292280..f712e6b94f 100644
--- a/helpcontent2/source/text/scalc/01/02140000.xhp
+++ b/helpcontent2/source/text/scalc/01/02140000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,54 +29,50 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalc0102140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fill</title>
-<filename>/text/scalc/01/02140000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T15:06:33">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="ausfuellen">
+      <topic id="textscalc0102140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Fill</title>
+         <filename>/text/scalc/01/02140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="ausfuellen">
 <bookmark xml-lang="en-US" branch="hid/.uno:FillCellsMenu" id="bm_id2939237" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id8473769"><bookmark_value>filling;selection lists</bookmark_value>
-<bookmark_value>selection lists;filling cells</bookmark_value>
+         <bookmark_value>selection lists;filling cells</bookmark_value>
 </bookmark><comment>MW inserted 2 index entries</comment>
-<paragraph role="heading" id="hd_id3153876" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02140000.xhp" name="Fill">Fill</link></paragraph>
-<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Automatically fills cells with content.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000402.xhp#bausfullen"/>
-</section>
-<paragraph role="note" id="par_id3147343" xml-lang="en-US" l10n="CHG" oldref="9">The $[officename] Calc context menus have <link href="text/scalc/01/02140000.xhp" name="other options">additional options</link> for filling the cells.</paragraph>
-<embed href="text/scalc/01/02140100.xhp#unten"/>
-<embed href="text/scalc/01/02140200.xhp#rechts"/>
-<embed href="text/scalc/01/02140300.xhp#oben"/>
-<embed href="text/scalc/01/02140400.xhp#links"/>
-<paragraph role="heading" id="hd_id3149207" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/scalc/01/02140500.xhp" name="Sheet">Sheet</link></paragraph>
-<embed href="text/scalc/01/02140500.xhp#tabellenfuellentext"/>
-<paragraph role="heading" id="hd_id3155111" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/scalc/01/02140600.xhp" name="Rows">Rows</link></paragraph>
-<embed href="text/scalc/01/02140600.xhp#reihenfuellentext"/>
-<paragraph role="paragraph" id="par_id3152994" xml-lang="en-US" l10n="U" oldref="3">
+<paragraph xml-lang="en-US" id="hd_id3153876" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/01/02140000.xhp" name="Fill">Fill</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156285" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Automatically fills cells with content.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000402.xhp#bausfullen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3147343" role="note" l10n="CHG" oldref="9">The $[officename] Calc context menus have <link href="text/scalc/01/02140000.xhp" name="other options">additional options</link> for filling the cells.</paragraph>
+      <embed href="text/scalc/01/02140100.xhp#unten"/>
+      <embed href="text/scalc/01/02140200.xhp#rechts"/>
+      <embed href="text/scalc/01/02140300.xhp#oben"/>
+      <embed href="text/scalc/01/02140400.xhp#links"/>
+      <paragraph xml-lang="en-US" id="hd_id3149207" role="heading" level="2" l10n="U" oldref="7"><link href="text/scalc/01/02140500.xhp" name="Sheet">Sheet</link></paragraph>
+      <embed href="text/scalc/01/02140500.xhp#tabellenfuellentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3155111" role="heading" level="2" l10n="U" oldref="8"><link href="text/scalc/01/02140600.xhp" name="Rows">Series</link></paragraph>
+      <embed href="text/scalc/01/02140600.xhp#reihenfuellentext"/>
+      <paragraph xml-lang="en-US" id="par_id3152994" role="paragraph" l10n="U" oldref="3">
 <emph>Filling cells using context menus:</emph>
 </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="4">Call the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link> when positioned in a cell and choose <emph>Selection List</emph>.</paragraph>
-</listitem>
-<listitem>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145384" role="listitem" l10n="U" oldref="4">Call the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link> when positioned in a cell and choose <emph>Selection List</emph>.</paragraph>
+         </listitem>
+         <listitem>
 <bookmark xml-lang="en-US" branch="hid/SID_DATA_SELECT" id="bm_id4369249" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DataSelect" id="bm_id3155810" localize="false"/>
-<paragraph role="listitem" id="par_id3156450" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".uno:DataSelect">A list box containing all text found in the current column is displayed.</ahelp> The text is sorted alphabetically and multiple entries are listed only once.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="6">Click one of the listed entries to copy it to the cell.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3156450" role="listitem" l10n="U" oldref="5"><ahelp hid=".uno:DataSelect">A list box containing all text found in the current column is displayed.</ahelp> The text is sorted alphabetically and multiple entries are listed only once.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148699" role="listitem" l10n="U" oldref="6">Click one of the listed entries to copy it to the cell.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/02140100.xhp b/helpcontent2/source/text/scalc/01/02140100.xhp
index 78478c5d27..94605533a2 100644
--- a/helpcontent2/source/text/scalc/01/02140100.xhp
+++ b/helpcontent2/source/text/scalc/01/02140100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02140200.xhp b/helpcontent2/source/text/scalc/01/02140200.xhp
index 7ff1af7cab..c98fe695d8 100644
--- a/helpcontent2/source/text/scalc/01/02140200.xhp
+++ b/helpcontent2/source/text/scalc/01/02140200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02140300.xhp b/helpcontent2/source/text/scalc/01/02140300.xhp
index bbfb1f5744..610896424a 100644
--- a/helpcontent2/source/text/scalc/01/02140300.xhp
+++ b/helpcontent2/source/text/scalc/01/02140300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02140400.xhp b/helpcontent2/source/text/scalc/01/02140400.xhp
index 70b7f8f466..e8c5f9842f 100644
--- a/helpcontent2/source/text/scalc/01/02140400.xhp
+++ b/helpcontent2/source/text/scalc/01/02140400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02140500.xhp b/helpcontent2/source/text/scalc/01/02140500.xhp
index 575697b0d1..33a41f5243 100644
--- a/helpcontent2/source/text/scalc/01/02140500.xhp
+++ b/helpcontent2/source/text/scalc/01/02140500.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02140500.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,34 +26,31 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
 <meta>
 <topic id="textscalc0102140500xml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Fill Sheet</title>
 <filename>/text/scalc/01/02140500.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>
-  
-  
+
+
   <bookmark xml-lang="en-US" branch="hid/FID_FILL_TAB" id="bm_id3912388" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:FillTable" xml-lang="en-US" id="bm_id3148664"/><paragraph role="heading" level="1" id="hd_id3153897" l10n="U" xml-lang="en-US" oldref="1">Fill Sheet</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3150791" xml-lang="en-US" oldref="2"><variable id="tabellenfuellentext"><ahelp hid=".uno:FillTable" visibility="visible">Specifies the options for transferring spreadsheets or ranges of a certain spreadsheet.</ahelp></variable></paragraph>
+  <paragraph l10n="CHG" role="paragraph" id="par_id3150791" xml-lang="en-US" oldref="2"><variable id="tabellenfuellentext"><ahelp hid=".uno:FillTable" visibility="visible">Specifies the options for transferring sheets or ranges of a certain sheet.</ahelp></variable></paragraph>
   <section id="howtoget">
   <embed href="text/scalc/00/00000402.xhp#baustab"/>
 </section>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3150767" l10n="U" oldref="3">In contrast to copying an area to the clipboard, you can filter certain information and calculate values. This command is only visible if you have selected two sheets in the document. To select multiple sheets, click each sheet tab while pressing <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> or Shift.</paragraph>
-  <paragraph role="heading" level="2" id="hd_id3155131" l10n="U" xml-lang="en-US" oldref="4">Filling a Spreadsheet</paragraph>
+  <paragraph role="heading" level="2" id="hd_id3155131" l10n="CHG" xml-lang="en-US" oldref="4">Filling a Sheet</paragraph>
   <list type="unordered">
    <listitem>
-    <paragraph role="listitem" id="par_id3146119" l10n="U" xml-lang="en-US" oldref="5">Select the entire sheet by clicking the empty gray box in the upper left of the spreadsheet. You can also select an area of the sheet to be copied.</paragraph>
+    <paragraph role="listitem" id="par_id3146119" l10n="CHG" xml-lang="en-US" oldref="5">Select the entire sheet by clicking the empty gray box in the upper left of the sheet. You can also select an area of the sheet to be copied.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" role="listitem" id="par_id3153726" l10n="U" oldref="6">Press <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> and click the tab of the worksheet where you want to insert the contents.</paragraph>
+    <paragraph xml-lang="en-US" role="listitem" id="par_id3153726" l10n="U" oldref="6">Press <switchinline select="sys"> <caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and click the tab of the sheet where you want to insert the contents.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" oldref="7" l10n="U" role="listitem" id="par_id3147436">Select the command <emph>Edit - Fill - Sheet</emph>. In the dialog which appears, the check box <emph>Numbers</emph> must be selected (or <emph>Paste All</emph>) if you want to combine operations with the values. You can also choose the desired operation here.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/02140600.xhp b/helpcontent2/source/text/scalc/01/02140600.xhp
index 376d2117ac..62bfd5566a 100644
--- a/helpcontent2/source/text/scalc/01/02140600.xhp
+++ b/helpcontent2/source/text/scalc/01/02140600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,57 +52,57 @@
 <paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="3">To automatically continue a series using the assumed completion rules, choose the <emph>AutoFill</emph> option after opening the <emph>Fill Series</emph> dialog.</paragraph>
 <paragraph role="heading" id="hd_id3147435" xml-lang="en-US" level="2" l10n="U" oldref="4">Direction</paragraph>
 <paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="U" oldref="5">Determines the direction of series creation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_BOTTOM" id="bm_id3147124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_BOTTOM" id="bm_id3147124" localize="false"/>
 <paragraph role="heading" id="hd_id3145253" xml-lang="en-US" level="3" l10n="U" oldref="6">Down</paragraph>
 <paragraph role="paragraph" id="par_id3155418" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_BOTTOM">Creates a downward series in the selected cell range for the column using the defined increment to the end value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_RIGHT" id="bm_id3153415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_RIGHT" id="bm_id3153415" localize="false"/>
 <paragraph role="heading" id="hd_id3155738" xml-lang="en-US" level="3" l10n="U" oldref="8">Right</paragraph>
 <paragraph role="paragraph" id="par_id3149402" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_RIGHT">Creates a series running from left to right within the selected cell range using the defined increment to the end value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_TOP" id="bm_id3155067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_TOP" id="bm_id3155067" localize="false"/>
 <paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="3" l10n="U" oldref="10">Up</paragraph>
 <paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_TOP">Creates an upward series in the cell range of the column using the defined increment to the end value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_LEFT" id="bm_id3147341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_LEFT" id="bm_id3147341" localize="false"/>
 <paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="3" l10n="U" oldref="12">Left</paragraph>
 <paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_LEFT">Creates a series running from right to left in the selected cell range using the defined increment to the end value.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147344" xml-lang="en-US" level="2" l10n="U" oldref="14">Series Type</paragraph>
 <paragraph role="paragraph" id="par_id3149257" xml-lang="en-US" l10n="U" oldref="15">Defines the series type. Choose between <emph>Linear, Growth, Date </emph>and <emph>AutoFill</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC" id="bm_id3150298" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC" id="bm_id3150298" localize="false"/>
 <paragraph role="heading" id="hd_id3148488" xml-lang="en-US" level="3" l10n="U" oldref="16">Linear</paragraph>
 <paragraph role="paragraph" id="par_id3159238" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC">Creates a linear number series using the defined increment and end value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC" id="bm_id3150784" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC" id="bm_id3150784" localize="false"/>
 <paragraph role="heading" id="hd_id3149210" xml-lang="en-US" level="3" l10n="U" oldref="18">Growth</paragraph>
 <paragraph role="paragraph" id="par_id3150364" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC">Creates a growth series using the defined increment and end value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DATE" id="bm_id3155378" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DATE" id="bm_id3155378" localize="false"/>
 <paragraph role="heading" id="hd_id3149528" xml-lang="en-US" level="3" l10n="U" oldref="20">Date</paragraph>
 <paragraph role="paragraph" id="par_id3150887" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DATE">Creates a date series using the defined increment and end date.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL" id="bm_id3152985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_AUTOFILL" id="bm_id3152985" localize="false"/>
 <paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="3" l10n="U" oldref="22">AutoFill</paragraph>
-<paragraph role="paragraph" id="par_id3156288" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL">Forms a series directly in the sheet.</ahelp> The AutoFill function takes account of customized lists. For example, by entering <emph>January</emph> in the first cell, the series is completed using the list defined under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156288" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL">Forms a series directly in the sheet.</ahelp> The AutoFill function takes account of customized lists. For example, by entering <emph>January</emph> in the first cell, the series is completed using the list defined under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3155811" xml-lang="en-US" l10n="U" oldref="24">AutoFill tries to complete a value series by using a defined pattern. The series 1,3,5 is automatically completed with 7,9,11,13, and so on. Date and time series are completed accordingly; for example, after 01.01.99 and 15.01.99, an interval of 14 days is used.</paragraph>
 <paragraph role="paragraph" id="par_id2956483" xml-lang="en-US" l10n="NEW" localize="false">
 <embedvar href="text/scalc/guide/calc_series.xhp#calc_series"/>
 </paragraph>
 <paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="2" l10n="U" oldref="25">Unit of Time</paragraph>
 <paragraph role="paragraph" id="par_id3153308" xml-lang="en-US" l10n="U" oldref="26">In this area you can specify the desired unit of time. This area is only active if the <emph>Date</emph> option has been chosen in the <emph>Series type</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY" id="bm_id3153913" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY" id="bm_id3153913" localize="false"/>
 <paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="3" l10n="U" oldref="27">Day</paragraph>
 <paragraph role="paragraph" id="par_id3148605" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY">Use the <emph>Date</emph> series type and this option to create a series using seven days.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK" id="bm_id3145074" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK" id="bm_id3145074" localize="false"/>
 <paragraph role="heading" id="hd_id3144771" xml-lang="en-US" level="3" l10n="U" oldref="29">Weekday</paragraph>
 <paragraph role="paragraph" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK">Use the <emph>Date</emph> series type and this option to create a series of five day sets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_MONTH" id="bm_id3159204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_MONTH" id="bm_id3159204" localize="false"/>
 <paragraph role="heading" id="hd_id3154957" xml-lang="en-US" level="3" l10n="U" oldref="31">Month</paragraph>
 <paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_MONTH">Use the <emph>Date</emph> series type and this option to form a series from the names or abbreviations of the months.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_YEAR" id="bm_id3146777" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_YEAR" id="bm_id3146777" localize="false"/>
 <paragraph role="heading" id="hd_id3152870" xml-lang="en-US" level="3" l10n="U" oldref="33">Year</paragraph>
 <paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_YEAR">Use the <emph>Date</emph> series type and this option to create a series of years.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FILLSERIES:ED_START_VALUES" id="bm_id3145357" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_FILLSERIES:ED_START_VALUES" id="bm_id3145357" localize="false"/>
 <paragraph role="heading" id="hd_id3154762" xml-lang="en-US" level="2" l10n="U" oldref="35">Start Value</paragraph>
 <paragraph role="paragraph" id="par_id3149381" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SC:EDIT:RID_SCDLG_FILLSERIES:ED_START_VALUES">Determines the start value for the series.</ahelp> Use numbers, dates or times.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FILLSERIES:ED_END_VALUES" id="bm_id3153557" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_FILLSERIES:ED_END_VALUES" id="bm_id3153557" localize="false"/>
 <paragraph role="heading" id="hd_id3153013" xml-lang="en-US" level="2" l10n="U" oldref="37">End Value</paragraph>
 <paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SC:EDIT:RID_SCDLG_FILLSERIES:ED_END_VALUES">Determines the end value for the series.</ahelp> Use numbers, dates or times.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FILLSERIES:ED_INCREMENT" id="bm_id3151196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_FILLSERIES:ED_INCREMENT" id="bm_id3151196" localize="false"/>
 <paragraph role="heading" id="hd_id3149312" xml-lang="en-US" level="2" l10n="U" oldref="39">Increment</paragraph>
 <paragraph role="paragraph" id="par_id3154739" xml-lang="en-US" l10n="U" oldref="40">The term "increment" denotes the amount by which a given value increases.<ahelp hid="SC:EDIT:RID_SCDLG_FILLSERIES:ED_INCREMENT"> Determines the value by which the series of the selected type increases by each step.</ahelp> Entries can only be made if the linear, growth or date series types have been selected.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp
index 109e6dd4e4..6ccb1e4f5d 100644
--- a/helpcontent2/source/text/scalc/01/02150000.xhp
+++ b/helpcontent2/source/text/scalc/01/02150000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02150000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,21 +57,21 @@
 <paragraph role="tip" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="23">Use <emph>Cut</emph> on the Standard bar to delete contents and formats without the dialog.</paragraph>
 <paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
 <paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="4">This area lists the options for deleting contents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELALL" id="bm_id3144766" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="5">Delete All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL" id="bm_id3144766" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="5">Delete All</paragraph>
 <paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELALL">Deletes all content from the selected cell range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELSTRINGS" id="bm_id3147394" localize="false"/><paragraph role="heading" id="hd_id3156286" xml-lang="en-US" level="3" l10n="CHG" oldref="7">Text<comment>i50439</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS" id="bm_id3147394" localize="false"/><paragraph role="heading" id="hd_id3156286" xml-lang="en-US" level="3" l10n="CHG" oldref="7">Text<comment>i50439</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154015" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELSTRINGS">Deletes text only. Formats, formulas, numbers and dates are not affected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNUMBERS" id="bm_id3156276" localize="false"/><paragraph role="heading" id="hd_id3153840" xml-lang="en-US" level="3" l10n="U" oldref="9">Numbers</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS" id="bm_id3156276" localize="false"/><paragraph role="heading" id="hd_id3153840" xml-lang="en-US" level="3" l10n="U" oldref="9">Numbers</paragraph>
 <paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNUMBERS">Deletes numbers only. Formats and formulas remain unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELDATETIME" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="11">Date &amp; time</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="11">Date &amp; time</paragraph>
 <paragraph role="paragraph" id="par_id3149567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELDATETIME">Deletes date and time values. Formats, text, numbers and formulas remain unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELFORMULAS" id="bm_id3149256" localize="false"/><paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="13">Formulas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS" id="bm_id3149256" localize="false"/><paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="13">Formulas</paragraph>
 <paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELFORMULAS">Deletes formulas. Text, numbers, formats, dates and times remain unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES" id="bm_id3152775" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="3" l10n="U" oldref="15">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES">Deletes notes added to cells. All other elements remain unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELATTRS" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="3" l10n="U" oldref="17">Formats</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES" id="bm_id3152775" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="3" l10n="U" oldref="15">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES">Deletes comments added to cells. All other elements remain unchanged.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="3" l10n="U" oldref="17">Formats</paragraph>
 <paragraph role="paragraph" id="par_id3146134" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELATTRS">Deletes format attributes applied to cells. All cell content remains unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELOBJECTS" id="bm_id3152582" localize="false"/><paragraph role="heading" id="hd_id3150088" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS" id="bm_id3152582" localize="false"/><paragraph role="heading" id="hd_id3150088" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects</paragraph>
 <paragraph role="paragraph" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELOBJECTS">Deletes objects. All cell content remains unchanged.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/02160000.xhp b/helpcontent2/source/text/scalc/01/02160000.xhp
index cf75986115..c23e3d0ca1 100644
--- a/helpcontent2/source/text/scalc/01/02160000.xhp
+++ b/helpcontent2/source/text/scalc/01/02160000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,15 +65,15 @@
   <paragraph xml-lang="en-US" id="hd_id3149121" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
   <paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" oldref="4">This area contains options for specifying how sheets are displayed after deleting cells.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSUP" id="bm_id3154755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP" id="bm_id3154755" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155767" role="heading" level="3" l10n="U" oldref="5">Shift cells up</paragraph>
   <paragraph xml-lang="en-US" id="par_id3153714" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSUP">Fills the space produced by the deleted cells with the cells underneath it.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSLEFT" id="bm_id3147346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT" id="bm_id3147346" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="3" l10n="U" oldref="7">Shift cells left</paragraph>
   <paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSLEFT">Fills the resulting space by the cells to the right of the deleted cells.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_DELROWS" id="bm_id3149566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS" id="bm_id3149566" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/SID_DEL_ROWS" id="bm_id167872" localize="false"/>
   
@@ -84,7 +81,7 @@
   <paragraph xml-lang="en-US" id="hd_id3146918" role="heading" level="3" l10n="U" oldref="9">Delete entire row(s)</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148487" role="paragraph" l10n="U" oldref="10"><ahelp hid=".uno:DeleteRows">After selecting at least one cell, deletes the entire row from the sheet.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_DELCOLS" id="bm_id3150342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS" id="bm_id3150342" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/SID_DEL_COLS" id="bm_id8964231" localize="false"/>
   
diff --git a/helpcontent2/source/text/scalc/01/02170000.xhp b/helpcontent2/source/text/scalc/01/02170000.xhp
index e660b427bf..9a7d6d95d2 100644
--- a/helpcontent2/source/text/scalc/01/02170000.xhp
+++ b/helpcontent2/source/text/scalc/01/02170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02170000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,9 +53,9 @@ YJ: checked</lastedited>
 <section id="howtoget">
   <embed href="text/scalc/00/00000402.xhp#btaloes"/>
 </section>
-<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet if changes to the document are being recorded, as in when <emph>Edit - Changes - Record</emph> is activated.</paragraph>
+<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet while <emph>Edit - Changes - Record</emph> is activated.</paragraph>
 <paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="2" l10n="U" oldref="3">Yes</paragraph>
-<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Permanently deletes the active sheet.</paragraph>
+<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Deletes the current sheet.</paragraph>
 <paragraph role="heading" id="hd_id3149412" xml-lang="en-US" level="2" l10n="U" oldref="5">No</paragraph>
 <paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="6">Cancels the dialog. No delete is performed.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/02180000.xhp b/helpcontent2/source/text/scalc/01/02180000.xhp
index f1e4e16311..0bc4e1b5cd 100644
--- a/helpcontent2/source/text/scalc/01/02180000.xhp
+++ b/helpcontent2/source/text/scalc/01/02180000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02180000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,13 +56,13 @@
   <embed href="text/scalc/00/00000402.xhp#btaverko"/>
 </section>
 <paragraph role="warning" id="par_id2282479" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing <link href="text/scalc/01/04060102.xhp">date values</link> between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_MOVETAB:LB_DEST" id="bm_id3146119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_MOVETAB:LB_DEST" id="bm_id3146119" localize="false"/>
 <paragraph role="heading" id="hd_id3163710" xml-lang="en-US" level="2" l10n="U" oldref="3">To Document</paragraph>
 <paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_DEST">Indicates where the current sheet is to be moved or copied to.</ahelp> Select <emph>new document</emph> if you want to create a new location for the sheet to be moved or copied.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_MOVETAB:LB_INSERT" id="bm_id3147350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_MOVETAB:LB_INSERT" id="bm_id3147350" localize="false"/>
 <paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="2" l10n="U" oldref="5">Insert Before</paragraph>
 <paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_INSERT">The current sheet is moved or copied in front of the selected sheet.</ahelp> The <emph>move to end position</emph> option places the current sheet at the end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_MOVETAB:BTN_COPY" id="bm_id3156283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY" id="bm_id3156283" localize="false"/>
 <paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="7">Copy</paragraph>
 <paragraph role="paragraph" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_MOVETAB:BTN_COPY">Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved.</ahelp> Moving sheets is the default.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/02190000.xhp b/helpcontent2/source/text/scalc/01/02190000.xhp
index 76c3e56f6b..b3adc19a43 100755
--- a/helpcontent2/source/text/scalc/01/02190000.xhp
+++ b/helpcontent2/source/text/scalc/01/02190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02190000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02190100.xhp b/helpcontent2/source/text/scalc/01/02190100.xhp
index 8fab0dab17..8e9ea2a189 100644
--- a/helpcontent2/source/text/scalc/01/02190100.xhp
+++ b/helpcontent2/source/text/scalc/01/02190100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02190100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02190200.xhp b/helpcontent2/source/text/scalc/01/02190200.xhp
index eac16e39e9..794d053cb1 100644
--- a/helpcontent2/source/text/scalc/01/02190200.xhp
+++ b/helpcontent2/source/text/scalc/01/02190200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02190200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02200000.xhp b/helpcontent2/source/text/scalc/01/02200000.xhp
index 59e5a32f4f..a57f8b1bcb 100755
--- a/helpcontent2/source/text/scalc/01/02200000.xhp
+++ b/helpcontent2/source/text/scalc/01/02200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02200000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/02210000.xhp b/helpcontent2/source/text/scalc/01/02210000.xhp
index 9932eaa2c7..977831d990 100644
--- a/helpcontent2/source/text/scalc/01/02210000.xhp
+++ b/helpcontent2/source/text/scalc/01/02210000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02210000.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
   
   <bookmark xml-lang="en-US" branch="hid/SID_SELECT_TABLES" id="bm_id6707893" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:SelectTables" xml-lang="en-US" id="bm_id3154758"/><paragraph role="heading" level="1" id="hd_id3156023" l10n="U" xml-lang="en-US" oldref="5">Selecting Sheets</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3147265" xml-lang="en-US" oldref="1"><variable id="tabellenauswaehlen"><ahelp hid=".uno:SelectTables" visibility="visible">Selects multiple sheets.</ahelp>.</variable></paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3147265" xml-lang="en-US" oldref="1"><variable id="tabellenauswaehlen"><ahelp hid=".uno:SelectTables" visibility="visible">Selects multiple sheets.</ahelp></variable></paragraph>
   <bookmark branch="hid/HID_SELECTTABLES" xml-lang="en-US" id="bm_id3154126"/><paragraph role="heading" level="2" id="hd_id3125863" l10n="U" xml-lang="en-US" oldref="2">Selected Sheets</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153969" xml-lang="en-US" oldref="3"><ahelp hid="HID_SELECTTABLES" visibility="visible">Lists the sheets in the current document. To select a sheet, press the up or down arrow keys to move to a sheet in the list. To add a sheet to the selection, hold down Ctrl (Mac: Command) while pressing the arrow keys and then press Spacebar. To select a range of sheets, hold down Shift and press the arrow keys. </ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/scalc/01/03070000.xhp b/helpcontent2/source/text/scalc/01/03070000.xhp
index 7962e49bf5..b4d934f560 100644
--- a/helpcontent2/source/text/scalc/01/03070000.xhp
+++ b/helpcontent2/source/text/scalc/01/03070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
 </section>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View"><emph>Tools - Options - %PRODUCTNAME Calc - View</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></emph>.</paragraph>
 </listitem>
 </list>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/03080000.xhp b/helpcontent2/source/text/scalc/01/03080000.xhp
index 53bf5b1129..86e3d7fbb1 100644
--- a/helpcontent2/source/text/scalc/01/03080000.xhp
+++ b/helpcontent2/source/text/scalc/01/03080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,13 +48,13 @@
 <bookmark xml-lang="en-US" branch="hid/FID_TOGGLESYNTAX" id="bm_id6436040" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ViewValueHighlighting" id="bm_id3145068" localize="false"/>
 <paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="1" l10n="C"><link href="text/scalc/01/03080000.xhp" name="Value Highlighting">Value Highlighting</link></paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ViewValueHighlighting">Highlights numerical values in your sheet.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ViewValueHighlighting">Displays cell contents in different colors, depending on type.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="5">To remove the highlighting, unmark the menu entry.</paragraph>
 <section id="howtoget">
   <embed href="text/scalc/00/00000403.xhp#awehe"/>
 </section>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, number cells in blue, and all other types of cells, such as formulas, logical values, and dates, are formatted in green.</paragraph>
+<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</paragraph>
 <paragraph role="warning" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="3">If this function is active, colors that you define in the document will not be displayed. When you deactivate the function, the user-defined colors are displayed again.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/03090000.xhp b/helpcontent2/source/text/scalc/01/03090000.xhp
index fb54f04be3..e5dc1b61c4 100644
--- a/helpcontent2/source/text/scalc/01/03090000.xhp
+++ b/helpcontent2/source/text/scalc/01/03090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/03100000.xhp b/helpcontent2/source/text/scalc/01/03100000.xhp
index 5aa05544d3..e165871f46 100644
--- a/helpcontent2/source/text/scalc/01/03100000.xhp
+++ b/helpcontent2/source/text/scalc/01/03100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04010000.xhp b/helpcontent2/source/text/scalc/01/04010000.xhp
index a3a60fc2c6..2d0d408141 100755
--- a/helpcontent2/source/text/scalc/01/04010000.xhp
+++ b/helpcontent2/source/text/scalc/01/04010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04010100.xhp b/helpcontent2/source/text/scalc/01/04010100.xhp
index 9bba4836c6..381bf7cd92 100644
--- a/helpcontent2/source/text/scalc/01/04010100.xhp
+++ b/helpcontent2/source/text/scalc/01/04010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04010200.xhp b/helpcontent2/source/text/scalc/01/04010200.xhp
index fdf5bf54b7..5bfe2c78cb 100644
--- a/helpcontent2/source/text/scalc/01/04010200.xhp
+++ b/helpcontent2/source/text/scalc/01/04010200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04020000.xhp b/helpcontent2/source/text/scalc/01/04020000.xhp
index 93558010bd..5859974d85 100644
--- a/helpcontent2/source/text/scalc/01/04020000.xhp
+++ b/helpcontent2/source/text/scalc/01/04020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,21 +55,21 @@
 <paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="4">This area contains the options available for inserting cells into a sheet. The cell quantity and position is defined by selecting a cell range in the sheet beforehand.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FID_INS_CELLSDOWN" id="bm_id6210706" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertCellsDown" id="bm_id3152578" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSDOWN" id="bm_id3145271" localize="false"/><paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="3" l10n="U" oldref="5">Shift cells down</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSDOWN" id="bm_id3145271" localize="false"/><paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="3" l10n="U" oldref="5">Shift cells down</paragraph>
 <paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="6"><variable id="zellenuntentext"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSDOWN">Moves the contents of the selected range downward when cells are inserted.</ahelp>
 </variable></paragraph>
 <embed href="text/scalc/00/00000404.xhp#syzellenunten"/>
 <bookmark xml-lang="en-US" branch="hid/FID_INS_CELLSRIGHT" id="bm_id7689959" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertCellsRight" id="bm_id3151118" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSRIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="3" l10n="U" oldref="7">Shift cells right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSRIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="3" l10n="U" oldref="7">Shift cells right</paragraph>
 <paragraph role="paragraph" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="8"><variable id="zellenrechtstext"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_CELLSRIGHT">Moves the contents of the selected range to the right when cells are inserted.</ahelp>
 </variable></paragraph>
 <embed href="text/scalc/00/00000404.xhp#syzellenrechts"/>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_INSROWS" id="bm_id3154731" localize="false"/><paragraph role="heading" id="hd_id3153877" xml-lang="en-US" level="3" l10n="U" oldref="9">Entire row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSROWS" id="bm_id3154731" localize="false"/><paragraph role="heading" id="hd_id3153877" xml-lang="en-US" level="3" l10n="U" oldref="9">Entire row</paragraph>
 <paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="10"><variable id="zeilenganzetext"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_INSROWS">Inserts an entire row. The position of the row is determined by the selection on the sheet.</ahelp>
 </variable> The number of rows inserted depends on how many rows are selected. The contents of the original rows are moved downward.</paragraph>
 <embed href="text/scalc/00/00000404.xhp#syzeilenganze"/>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_INSCOLS" id="bm_id3150750" localize="false"/><paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="3" l10n="U" oldref="11">Entire column</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSCOLS" id="bm_id3150750" localize="false"/><paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="3" l10n="U" oldref="11">Entire column</paragraph>
 <paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="12"><variable id="spaltenganzetext"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCELL:BTN_INSCOLS">Inserts an entire column. The number of columns to be inserted is determined by the selected number of columns.</ahelp>
 </variable> The contents of the original columns are shifted to the right.</paragraph>
 <embed href="text/scalc/00/00000404.xhp#syspaltenganze"/>
diff --git a/helpcontent2/source/text/scalc/01/04030000.xhp b/helpcontent2/source/text/scalc/01/04030000.xhp
index 009520a6fb..ca87deee10 100644
--- a/helpcontent2/source/text/scalc/01/04030000.xhp
+++ b/helpcontent2/source/text/scalc/01/04030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04040000.xhp b/helpcontent2/source/text/scalc/01/04040000.xhp
index eabb8fcd6c..2b52fbdeea 100644
--- a/helpcontent2/source/text/scalc/01/04040000.xhp
+++ b/helpcontent2/source/text/scalc/01/04040000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04040000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04050000.xhp b/helpcontent2/source/text/scalc/01/04050000.xhp
index 9dfb952df9..d4cbb09f32 100644
--- a/helpcontent2/source/text/scalc/01/04050000.xhp
+++ b/helpcontent2/source/text/scalc/01/04050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04050000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,9 +39,8 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id4522232"><bookmark_value>sheets;creating</bookmark_value>
-<bookmark_value>sheets;inserting</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_INSERT_TABLE" id="bm_id3151384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_INSERT_TABLE" id="bm_id3151384" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FID_INS_TABLE" id="bm_id1669896" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Insert" id="bm_id3153896" localize="false"/>
 <paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Sheet</paragraph>
@@ -55,34 +51,34 @@
 </section>
 <paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="19">Position</paragraph>
 <paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="20">Specifies where the new sheet is to be inserted into your document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEFORE" id="bm_id3155131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE" id="bm_id3155131" localize="false"/>
 <paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="3" l10n="U" oldref="21">Before current sheet</paragraph>
 <paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEFORE">Inserts a new sheet directly before the current sheet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND" id="bm_id3147434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND" id="bm_id3147434" localize="false"/>
 <paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="23">After current sheet</paragraph>
 <paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND">Inserts a new sheet directly after the current sheet.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="25">Create</paragraph>
 <paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="26">Specifies whether a new sheet or an existing sheet is inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW" id="bm_id3145750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW" id="bm_id3145750" localize="false"/>
 <paragraph role="heading" id="hd_id3147350" xml-lang="en-US" level="2" l10n="U" oldref="3">Create</paragraph>
 <paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW">Creates a new sheet. Enter a sheet name in the <emph>Name</emph> field. Allowed characters are letters, numbers, spaces, and the underline character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT" id="bm_id3153157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT" id="bm_id3153157" localize="false"/>
 <paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="27">No. of Sheets</paragraph>
 <paragraph role="paragraph" id="par_id3148457" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT">Specifies the number of sheets to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME" id="bm_id3154510" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME" id="bm_id3154510" localize="false"/>
 <paragraph role="heading" id="hd_id3149379" xml-lang="en-US" level="3" l10n="U" oldref="7">Name</paragraph>
 <paragraph role="paragraph" id="par_id3150718" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME">Specifies the name of the new sheet.</ahelp></paragraph>
 <embed href="text/scalc/guide/rename_table.xhp#rename_table"/>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_FROMFILE" id="bm_id3150328" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE" id="bm_id3150328" localize="false"/>
 <paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="9">From File</paragraph>
 <paragraph role="paragraph" id="par_id3153714" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_FROMFILE">Inserts a sheet from an existing file into the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_INSERT_TABLE:BTN_BROWSE" id="bm_id3150044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE" id="bm_id3150044" localize="false"/>
 <paragraph role="heading" id="hd_id3149020" xml-lang="en-US" level="3" l10n="U" oldref="15">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_INSERT_TABLE:BTN_BROWSE">Opens a dialog for selecting a file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILISTBOX:RID_SCDLG_INSERT_TABLE:LB_TABLES" id="bm_id3146314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES" id="bm_id3146314" localize="false"/>
 <paragraph role="heading" id="hd_id3149255" xml-lang="en-US" level="3" l10n="U" oldref="29">Available Sheets</paragraph>
 <paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_INSERT_TABLE:LB_TABLES">If you selected a file by using the <emph>Browse</emph> button, the sheets contained in it are displayed in the list box. The file path is displayed below this box. Select the sheet to be inserted from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSERT_TABLE_CB_LINK" id="bm_id3149814" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK" id="bm_id3149814" localize="false"/>
 <paragraph role="heading" id="hd_id3145791" xml-lang="en-US" level="3" l10n="U" oldref="17">Link</paragraph>
 <paragraph role="paragraph" id="par_id3152580" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC_CHECKBOX_RID_SCDLG_INSERT_TABLE_CB_LINK">Select to insert the sheet as a link instead as a copy. The links can be updated to show the current contents.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/04050100.xhp b/helpcontent2/source/text/scalc/01/04050100.xhp
index 2e4a3ea914..78d0a23288 100755
--- a/helpcontent2/source/text/scalc/01/04050100.xhp
+++ b/helpcontent2/source/text/scalc/01/04050100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04050100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060000.xhp b/helpcontent2/source/text/scalc/01/04060000.xhp
index 9678b90697..6a810d669c 100644
--- a/helpcontent2/source/text/scalc/01/04060000.xhp
+++ b/helpcontent2/source/text/scalc/01/04060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,14 +57,14 @@
 <paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="60">The <emph>Function Wizard</emph> has two tabs: <emph>Functions</emph> is used to create formulas, and <emph>Structure</emph> is used to check the formula build.</paragraph>
 <paragraph role="heading" id="hd_id3154490" xml-lang="en-US" level="2" l10n="U" oldref="3">Functions Tab</paragraph>
 <paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U" oldref="5"><link href="text/scalc/01/04060100.xhp" name="List of Categories and Functions">List of Categories and Functions</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY" id="bm_id3155602" localize="false"/>
+<!-- removed HID SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY -->
 <paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="3" l10n="U" oldref="36">Category</paragraph>
 <paragraph role="paragraph" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="37"><variable id="kategorienliste"><ahelp hid="SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY">Lists all the categories to which the different functions are assigned. Select a category to view the appropriate functions in the list field below.</ahelp> Select "All" to view all functions in alphabetical order, irrespective of category. "Last Used" lists the functions you have most recently used. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION" id="bm_id3153714" localize="false"/>
+<!-- removed HID SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION -->
 <paragraph role="heading" id="hd_id3150749" xml-lang="en-US" level="3" l10n="U" oldref="6">Function</paragraph>
 <paragraph role="paragraph" id="par_id3155445" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION">Displays the functions found under the selected category. Double-click to select a function.</ahelp> A single-click displays a short function description.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX" id="bm_id3156385" localize="false"/>
+<!-- removed HID SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX -->
 <paragraph role="heading" id="hd_id3159264" xml-lang="en-US" level="3" l10n="U" oldref="8">Array</paragraph>
 <paragraph role="paragraph" id="par_id3149566" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX">Specifies that the selected function is inserted into the selected cell range as an array formula. </ahelp> Array formulas operate on multiple cells. Each cell in the array contains the formula, not as a copy but as a common formula shared by all matrix cells.</paragraph>
 <paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="61">The <emph>Array</emph> option is identical to the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter command, which is used to enter and confirm formulas in the sheet. The formula is inserted as a matrix formula indicated by two braces { }.</paragraph>
@@ -78,25 +75,25 @@
 <paragraph role="heading" id="hd_id3149408" xml-lang="en-US" level="3" l10n="U" oldref="18">Function Result</paragraph>
 <paragraph role="paragraph" id="par_id3155809" xml-lang="en-US" l10n="U" oldref="19">As soon you enter arguments in the function, the result is calculated. This preview informs you if the calculation can be carried out with the arguments given. If the arguments result in an error, the corresponding <link href="text/scalc/05/02140000.xhp" name="error code">error code</link> is displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3148700" xml-lang="en-US" l10n="CHG" oldref="23">The required arguments are indicated by names in bold print.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX1" id="bm_id3146866" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX2" id="bm_id3146870" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX3" id="bm_id3151240" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX4" id="bm_id3153912" localize="false"/>
+<!-- removed HID HID_SC_FAP_BTN_FX1 -->
+<!-- removed HID HID_SC_FAP_BTN_FX2 -->
+<!-- removed HID HID_SC_FAP_BTN_FX3 -->
+<!-- removed HID HID_SC_FAP_BTN_FX4 -->
 <paragraph role="heading" id="hd_id3153064" xml-lang="en-US" level="3" l10n="CHG" oldref="22">f(x) (depending on the selected function)</paragraph>
 <paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_SC_FAP_BTN_FX4">Allows you to access a subordinate level of the <emph>Function Wizard</emph> in order to nest another function within the function, instead of a value or reference.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FORMULA:ED_REF" id="bm_id3147073" localize="false"/>
+<!-- removed HID SC:EDIT:RID_SCDLG_FORMULA:ED_REF -->
 <paragraph role="heading" id="hd_id3145076" xml-lang="en-US" level="3" l10n="CHG" oldref="25">Argument/Parameter/Cell Reference (depending on the selected function)</paragraph>
 <paragraph role="paragraph" id="par_id3159097" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC:EDIT:RID_SCDLG_FORMULA:ED_REF">The number of visible text fields depends on the function. Enter arguments either directly into the argument fields or by clicking a cell in the table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154957" xml-lang="en-US" level="3" l10n="U" oldref="51">Result</paragraph>
 <paragraph role="paragraph" id="par_id3150211" xml-lang="en-US" l10n="U" oldref="52">Displays the calculation result or an error message.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_FORMULA" id="bm_id3155384" localize="false"/>
+<!-- removed HID HID_SC_FAP_FORMULA -->
 <paragraph role="heading" id="hd_id3151304" xml-lang="en-US" level="3" l10n="U" oldref="43">Formula</paragraph>
 <paragraph role="paragraph" id="par_id3149898" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="HID_SC_FAP_FORMULA">Displays the created formula. Type your entries directly, or create the formula using the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD" id="bm_id3153973" localize="false"/>
+<!-- removed HID SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD -->
 <paragraph role="heading" id="hd_id3153249" xml-lang="en-US" level="3" l10n="U" oldref="45">Back</paragraph>
 <paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD">Moves the focus back through the formula components, marking them as it does so.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3146966" xml-lang="en-US" l10n="U" oldref="56">To select a single function from a complex formula consisting of several functions, double-click the function in the formula window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD" id="bm_id3151194" localize="false"/>
+<!-- removed HID SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD -->
 <paragraph role="heading" id="hd_id3155762" xml-lang="en-US" level="3" l10n="U" oldref="54">Next</paragraph>
 <paragraph role="paragraph" id="par_id3149316" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD">Moves forward through the formula components in the formula window.</ahelp> This button can also be used to assign functions to the formula. If you select a function and click the <emph>Next </emph>button, the selection appears in the formula window.</paragraph>
 <paragraph role="tip" id="par_id3159262" xml-lang="en-US" l10n="U" oldref="57">Double-click a function in the selection window to transfer it to the formula window.</paragraph>
@@ -108,7 +105,7 @@
 <paragraph role="heading" id="hd_id3147610" xml-lang="en-US" level="2" l10n="U" oldref="47">Structure tab</paragraph>
 <paragraph role="paragraph" id="par_id3153122" xml-lang="en-US" l10n="U" oldref="48">On this page, you can view the structure of the function.</paragraph>
 <paragraph role="note" id="par_id3149350" xml-lang="en-US" l10n="U" oldref="4">If you start the <emph>Function Wizard</emph> while the cell cursor is positioned in a cell that already contains a function, the <emph>Structure</emph> tab is opened and shows the composition of the current formula.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_STRUCT" id="bm_id3150464" localize="false"/>
+<!-- removed HID HID_SC_FAP_STRUCT -->
 <paragraph role="heading" id="hd_id3149014" xml-lang="en-US" level="3" l10n="U" oldref="49">Structure</paragraph>
 <paragraph role="paragraph" id="par_id3150481" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="HID_SC_FAP_STRUCT">Displays a hierarchical representation of the current function.</ahelp> You can hide or show the arguments by a click on the plus or minus sign in front.</paragraph>
 <paragraph role="note" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="63">Blue dots denote correctly entered arguments. Red dots indicate incorrect data types. For example: if the SUM function has one argument entered as text, this is highlighted in red as SUM only permits number entries.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060100.xhp b/helpcontent2/source/text/scalc/01/04060100.xhp
index 81c4c07bd8..35c6a9b7d8 100755
--- a/helpcontent2/source/text/scalc/01/04060100.xhp
+++ b/helpcontent2/source/text/scalc/01/04060100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,44 +32,51 @@
  
 	
 <meta>
-<topic id="textscalc0104060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Functions by Category</title>
-<filename>/text/scalc/01/04060100.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060100xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Functions by Category</title>
+         <filename>/text/scalc/01/04060100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148575"><bookmark_value>functions;listed by category</bookmark_value>
-<bookmark_value>categories of functions</bookmark_value>
-<bookmark_value>list of functions</bookmark_value>
+      <bookmark_value>categories of functions</bookmark_value>
+      <bookmark_value>list of functions</bookmark_value>
 </bookmark><comment>MW deleted "Calc functions"</comment>
-<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="1" l10n="CHG" oldref="16">Functions by Category</paragraph>
-<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
-<paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
-<embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
-<paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04060102.xhp" name="Date &amp; Time">Date &amp; Time</link></paragraph>
-<embed href="text/scalc/01/04060102.xhp#datumzeittext"/>
-<paragraph role="heading" id="hd_id3147339" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/scalc/01/04060103.xhp" name="Financial">Financial</link></paragraph>
-<embed href="text/scalc/01/04060103.xhp#finanztext"/>
-<paragraph role="heading" id="hd_id3153963" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/scalc/01/04060104.xhp" name="Information">Information</link></paragraph>
-<embed href="text/scalc/01/04060104.xhp#informationtext"/>
-<paragraph role="heading" id="hd_id3146316" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/scalc/01/04060105.xhp" name="Logical">Logical</link></paragraph>
-<embed href="text/scalc/01/04060105.xhp#logischtext"/>
-<paragraph role="heading" id="hd_id3148485" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/scalc/01/04060106.xhp" name="Mathematical">Mathematical</link></paragraph>
-<embed href="text/scalc/01/04060106.xhp#mathematiktext"/>
-<paragraph role="heading" id="hd_id3150363" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/scalc/01/04060107.xhp" name="Matrix">Array</link></paragraph>
-<embed href="text/scalc/01/04060107.xhp#matrixtext"/>
-<paragraph role="heading" id="hd_id3150208" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/scalc/01/04060108.xhp" name="Statistical">Statistical</link></paragraph>
-<embed href="text/scalc/01/04060108.xhp#statistiktext"/>
-<paragraph role="heading" id="hd_id3166428" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/scalc/01/04060109.xhp" name="Spreadsheet">Spreadsheet</link></paragraph>
-<embed href="text/scalc/01/04060109.xhp#tabelletext"/>
-<paragraph role="heading" id="hd_id3145585" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/scalc/01/04060110.xhp" name="Text">Text</link></paragraph>
-<embed href="text/scalc/01/04060110.xhp#texttext"/>
-<paragraph role="heading" id="hd_id3156449" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/scalc/01/04060111.xhp" name="Add-in">Add-in</link></paragraph>
-<embed href="text/scalc/01/04060111.xhp#addintext"/>
-<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id0902200809540918" xml-lang="en-US" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
+<paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="1" l10n="CHG"
+                 oldref="16">Functions by Category</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149378" role="paragraph" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146972" role="heading" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
+      <embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
+      <paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04060102.xhp" name="Date &amp; Time">Date &amp; Time</link></paragraph>
+      <embed href="text/scalc/01/04060102.xhp#datumzeittext"/>
+      <paragraph xml-lang="en-US" id="hd_id3147339" role="heading" level="2" l10n="U" oldref="5"><link href="text/scalc/01/04060103.xhp" name="Financial">Financial</link></paragraph>
+      <embed href="text/scalc/01/04060103.xhp#finanztext"/>
+      <paragraph xml-lang="en-US" id="hd_id3153963" role="heading" level="2" l10n="U" oldref="6"><link href="text/scalc/01/04060104.xhp" name="Information">Information</link></paragraph>
+      <embed href="text/scalc/01/04060104.xhp#informationtext"/>
+      <paragraph xml-lang="en-US" id="hd_id3146316" role="heading" level="2" l10n="U" oldref="7"><link href="text/scalc/01/04060105.xhp" name="Logical">Logical</link></paragraph>
+      <embed href="text/scalc/01/04060105.xhp#logischtext"/>
+      <paragraph xml-lang="en-US" id="hd_id3148485" role="heading" level="2" l10n="U" oldref="8"><link href="text/scalc/01/04060106.xhp" name="Mathematical">Mathematical</link></paragraph>
+      <embed href="text/scalc/01/04060106.xhp#mathematiktext"/>
+      <paragraph xml-lang="en-US" id="hd_id3150363" role="heading" level="2" l10n="CHG"
+                 oldref="9"><link href="text/scalc/01/04060107.xhp" name="Matrix">Array</link></paragraph>
+      <embed href="text/scalc/01/04060107.xhp#matrixtext"/>
+      <paragraph xml-lang="en-US" id="hd_id3150208" role="heading" level="2" l10n="U"
+                 oldref="10"><link href="text/scalc/01/04060108.xhp" name="Statistical">Statistical</link></paragraph>
+      <embed href="text/scalc/01/04060108.xhp#statistiktext"/>
+      <paragraph xml-lang="en-US" id="hd_id3166428" role="heading" level="2" l10n="U"
+                 oldref="11"><link href="text/scalc/01/04060109.xhp" name="Spreadsheet">Spreadsheet</link></paragraph>
+      <embed href="text/scalc/01/04060109.xhp#tabelletext"/>
+      <paragraph xml-lang="en-US" id="hd_id3145585" role="heading" level="2" l10n="U"
+                 oldref="12"><link href="text/scalc/01/04060110.xhp" name="Text">Text</link></paragraph>
+      <embed href="text/scalc/01/04060110.xhp#texttext"/>
+      <paragraph xml-lang="en-US" id="hd_id3156449" role="heading" level="2" l10n="U"
+                 oldref="13"><link href="text/scalc/01/04060111.xhp" name="Add-in">Add-in</link></paragraph>
+      <embed href="text/scalc/01/04060111.xhp#addintext"/>
+      <paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
 </variable></paragraph>
-</section>
-</body>
-</helpdocument>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060101.xhp b/helpcontent2/source/text/scalc/01/04060101.xhp
index 1bf874be9d..6caffe423d 100755
--- a/helpcontent2/source/text/scalc/01/04060101.xhp
+++ b/helpcontent2/source/text/scalc/01/04060101.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060101.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,697 +32,735 @@
  
 	
 <meta>
-<topic id="textscalc0104060101xml" indexer="include">
-<title id="tit" xml-lang="en-US">Database Functions</title>
-<filename>/text/scalc/01/04060101.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060101xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Database Functions</title>
+         <filename>/text/scalc/01/04060101.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148946"><bookmark_value>Function Wizard; databases</bookmark_value>
-<bookmark_value>functions; database functions</bookmark_value>
-<bookmark_value>databases; functions in $[officename] Calc</bookmark_value>
+      <bookmark_value>functions; database functions</bookmark_value>
+      <bookmark_value>databases; functions in $[officename] Calc</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="1" l10n="U" oldref="1">Database Functions</paragraph>
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="2"><variable id="datenbanktext">This section deals with functions used with data organized as one row of data for one record. 
+<paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="1" l10n="U" oldref="1">Database Functions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="U" oldref="2"><variable id="datenbanktext">This section deals with functions used with data organized as one row of data for one record. 
 </variable></paragraph>
-<paragraph role="note" id="par_id3154016" xml-lang="en-US" l10n="U" oldref="186">The Database category may be confused with a database integrated in $[officename]. However, there is no connection between a database in $[officename] and the Database category in $[officename] Calc.</paragraph>
-<paragraph role="heading" id="hd_id3150329" xml-lang="en-US" level="3" l10n="U" oldref="190">Example Data:</paragraph>
-<paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="U" oldref="191">The following data will be used in some of the function description examples:</paragraph>
-<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="3">The range A1:E10 lists the children invited to Joe's birthday party. The following information is given for each entry: column A shows the name, B the grade, then age in years, distance to school in meters and weight in kilograms.</paragraph>
-<table id="tbl_id3159264">
-<tablerow>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3145232" xml-lang="en-US" l10n="U" oldref="4">A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="5">B</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="6">C</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150344" xml-lang="en-US" l10n="U" oldref="7">D</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150785" xml-lang="en-US" l10n="U" oldref="8">E</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="9">1</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="10">
+      <paragraph xml-lang="en-US" id="par_id3154016" role="note" l10n="U" oldref="186">The Database category may be confused with a database integrated in $[officename]. However, there is no connection between a database in $[officename] and the Database category in $[officename] Calc.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150329" role="heading" level="3" l10n="U"
+                 oldref="190">Example Data:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153713" role="paragraph" l10n="U" oldref="191">The following data will be used in some of the function description examples:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="U" oldref="3">The range A1:E10 lists the children invited to Joe's birthday party. The following information is given for each entry: column A shows the name, B the grade, then age in years, distance to school in meters and weight in kilograms.</paragraph>
+      <table id="tbl_id3159264">
+         <tablerow>
+            <tablecell>
+</tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145232" role="tablehead" l10n="U" oldref="4">A</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146316" role="tablehead" l10n="U" oldref="5">B</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150297" role="tablehead" l10n="U" oldref="6">C</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150344" role="tablehead" l10n="U" oldref="7">D</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150785" role="tablehead" l10n="U" oldref="8">E</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150090" role="tablecontent" l10n="U" oldref="9">1</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152992" role="tablecontent" l10n="U" oldref="10">
 <item type="input">Name</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155532" xml-lang="en-US" l10n="U" oldref="11">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155532" role="tablecontent" l10n="U" oldref="11">
 <item type="input">Grade</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156448" xml-lang="en-US" l10n="U" oldref="12">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156448" role="tablecontent" l10n="U" oldref="12">
 <item type="input">Age</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="13">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154486" role="tablecontent" l10n="U" oldref="13">
 <item type="input">Distance to School</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152899" xml-lang="en-US" l10n="U" oldref="14">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152899" role="tablecontent" l10n="U" oldref="14">
 <item type="input">Weight</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153816" xml-lang="en-US" l10n="U" oldref="15">2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151240" xml-lang="en-US" l10n="U" oldref="16">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153816" role="tablecontent" l10n="U" oldref="15">2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151240" role="tablecontent" l10n="U" oldref="16">
 <item type="input">Andy</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="17">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156016" role="tablecontent" l10n="U" oldref="17">
 <item type="input">3</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145073" xml-lang="en-US" l10n="U" oldref="18">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145073" role="tablecontent" l10n="U" oldref="18">
 <item type="input">9</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154956" xml-lang="en-US" l10n="U" oldref="19">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154956" role="tablecontent" l10n="U" oldref="19">
 <item type="input">150</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153976" xml-lang="en-US" l10n="U" oldref="20">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153976" role="tablecontent" l10n="U" oldref="20">
 <item type="input">40</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150894" xml-lang="en-US" l10n="U" oldref="21">3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152870" xml-lang="en-US" l10n="U" oldref="22">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="21">3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152870" role="tablecontent" l10n="U" oldref="22">
 <item type="input">Betty</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="23">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149692" role="tablecontent" l10n="U" oldref="23">
 <item type="input">4</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154652" xml-lang="en-US" l10n="U" oldref="24">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154652" role="tablecontent" l10n="U" oldref="24">
 <item type="input">10</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149381" xml-lang="en-US" l10n="U" oldref="25">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149381" role="tablecontent" l10n="U" oldref="25">
 <item type="input">1000</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153812" xml-lang="en-US" l10n="U" oldref="26">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153812" role="tablecontent" l10n="U" oldref="26">
 <item type="input">42</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146965" xml-lang="en-US" l10n="U" oldref="27">4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155596" xml-lang="en-US" l10n="U" oldref="28">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146965" role="tablecontent" l10n="U" oldref="27">4</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155596" role="tablecontent" l10n="U" oldref="28">
 <item type="input">Charles</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147244" xml-lang="en-US" l10n="U" oldref="29">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147244" role="tablecontent" l10n="U" oldref="29">
 <item type="input">3</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="30">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149871" role="tablecontent" l10n="U" oldref="30">
 <item type="input">10</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155752" xml-lang="en-US" l10n="U" oldref="31">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155752" role="tablecontent" l10n="U" oldref="31">
 <item type="input">300</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149052" xml-lang="en-US" l10n="U" oldref="32">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149052" role="tablecontent" l10n="U" oldref="32">
 <item type="input">51</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146097" xml-lang="en-US" l10n="U" oldref="33">5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147296" xml-lang="en-US" l10n="U" oldref="34">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146097" role="tablecontent" l10n="U" oldref="33">5</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147296" role="tablecontent" l10n="U" oldref="34">
 <item type="input">Daniel</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="35">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150393" role="tablecontent" l10n="U" oldref="35">
 <item type="input">5</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="36">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145236" role="tablecontent" l10n="U" oldref="36">
 <item type="input">11</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150534" xml-lang="en-US" l10n="U" oldref="37">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150534" role="tablecontent" l10n="U" oldref="37">
 <item type="input">1200</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150375" xml-lang="en-US" l10n="U" oldref="38">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150375" role="tablecontent" l10n="U" oldref="38">
 <item type="input">48</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159121" xml-lang="en-US" l10n="U" oldref="39">6</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150456" xml-lang="en-US" l10n="U" oldref="40">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159121" role="tablecontent" l10n="U" oldref="39">6</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150456" role="tablecontent" l10n="U" oldref="40">
 <item type="input">Eva</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146886" xml-lang="en-US" l10n="U" oldref="41">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146886" role="tablecontent" l10n="U" oldref="41">
 <item type="input">2</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="42">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149945" role="tablecontent" l10n="U" oldref="42">
 <item type="input">8</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157904" xml-lang="en-US" l10n="U" oldref="43">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157904" role="tablecontent" l10n="U" oldref="43">
 <item type="input">650</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149352" xml-lang="en-US" l10n="U" oldref="44">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149352" role="tablecontent" l10n="U" oldref="44">
 <item type="input">33</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="45">7</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145826" xml-lang="en-US" l10n="U" oldref="46">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150028" role="tablecontent" l10n="U" oldref="45">7</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145826" role="tablecontent" l10n="U" oldref="46">
 <item type="input">F</item>
 <item type="input">rank</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150743" xml-lang="en-US" l10n="U" oldref="47">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150743" role="tablecontent" l10n="U" oldref="47">
 <item type="input">2</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="48">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154844" role="tablecontent" l10n="U" oldref="48">
 <item type="input">7</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148435" xml-lang="en-US" l10n="U" oldref="49">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148435" role="tablecontent" l10n="U" oldref="49">
 <item type="input">3</item>
 <item type="input">00</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148882" xml-lang="en-US" l10n="U" oldref="50">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148882" role="tablecontent" l10n="U" oldref="50">
 <item type="input">4</item>
 <item type="input">2</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150140" xml-lang="en-US" l10n="U" oldref="51">8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="52">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150140" role="tablecontent" l10n="U" oldref="51">8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146137" role="tablecontent" l10n="U" oldref="52">
 <item type="input">Greta</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="53">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148739" role="tablecontent" l10n="U" oldref="53">
 <item type="input">1</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148583" xml-lang="en-US" l10n="U" oldref="54">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148583" role="tablecontent" l10n="U" oldref="54">
 <item type="input">7</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154556" xml-lang="en-US" l10n="U" oldref="55">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154556" role="tablecontent" l10n="U" oldref="55">
 <item type="input">200</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155255" xml-lang="en-US" l10n="U" oldref="56">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155255" role="tablecontent" l10n="U" oldref="56">
 <item type="input">36</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145141" xml-lang="en-US" l10n="U" oldref="57">9</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153078" xml-lang="en-US" l10n="U" oldref="58">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145141" role="tablecontent" l10n="U" oldref="57">9</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153078" role="tablecontent" l10n="U" oldref="58">
 <item type="input">Harry</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="59">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149955" role="tablecontent" l10n="U" oldref="59">
 <item type="input">3</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150005" xml-lang="en-US" l10n="U" oldref="60">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150005" role="tablecontent" l10n="U" oldref="60">
 <item type="input">9</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155951" xml-lang="en-US" l10n="U" oldref="61">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155951" role="tablecontent" l10n="U" oldref="61">
 <item type="input">1200</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145169" xml-lang="en-US" l10n="U" oldref="62">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145169" role="tablecontent" l10n="U" oldref="62">
 <item type="input">44</item>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153571" xml-lang="en-US" l10n="U" oldref="63">10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148761" xml-lang="en-US" l10n="U" oldref="64">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153571" role="tablecontent" l10n="U" oldref="63">10</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148761" role="tablecontent" l10n="U" oldref="64">
 <item type="input">Irene</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="65">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149877" role="tablecontent" l10n="U" oldref="65">
 <item type="input">2</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154327" xml-lang="en-US" l10n="U" oldref="66">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154327" role="tablecontent" l10n="U" oldref="66">
 <item type="input">8</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155435" xml-lang="en-US" l10n="U" oldref="67">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155435" role="tablecontent" l10n="U" oldref="67">
 <item type="input">1000</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145353" xml-lang="en-US" l10n="U" oldref="68">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145353" role="tablecontent" l10n="U" oldref="68">
 <item type="input">42</item>
 </paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150662" role="tablecontent" l10n="U" oldref="69">11</paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="69">11</paragraph>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150568" role="tablecontent" l10n="U" oldref="70">12</paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150568" xml-lang="en-US" l10n="U" oldref="70">12</paragraph>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149393" xml-lang="en-US" l10n="U" oldref="71">13</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153544" xml-lang="en-US" l10n="U" oldref="72">
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149393" role="tablecontent" l10n="U" oldref="71">13</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153544" role="tablecontent" l10n="U" oldref="72">
 <item type="input">Name</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3158414" xml-lang="en-US" l10n="U" oldref="73">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3158414" role="tablecontent" l10n="U" oldref="73">
 <item type="input">Grade</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152820" xml-lang="en-US" l10n="U" oldref="74">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152820" role="tablecontent" l10n="U" oldref="74">
 <item type="input">Age</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154866" xml-lang="en-US" l10n="U" oldref="75">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154866" role="tablecontent" l10n="U" oldref="75">
 <item type="input">Distance to School</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150471" xml-lang="en-US" l10n="U" oldref="76">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150471" role="tablecontent" l10n="U" oldref="76">
 <item type="input">Weight</item>
 </paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153920" role="tablecontent" l10n="U" oldref="77">14</paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="77">14</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148429" xml-lang="en-US" l10n="U" oldref="78">
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148429" role="tablecontent" l10n="U" oldref="78">
 <item type="input">&gt;600</item>
 </paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152588" role="tablecontent" l10n="U" oldref="79">15</paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152588" xml-lang="en-US" l10n="U" oldref="79">15</paragraph>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3083286" xml-lang="en-US" l10n="U" oldref="80">16</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3163823" xml-lang="en-US" l10n="U" oldref="81">
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3083286" role="tablecontent" l10n="U" oldref="80">16</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3163823" role="tablecontent" l10n="U" oldref="81">
 <item type="input">DCOUNT</item>
 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145083" xml-lang="en-US" l10n="U" oldref="82">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145083" role="tablecontent" l10n="U" oldref="82">
 <item type="input">5</item>
 </paragraph>
+            </tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-<tablecell>
+            <tablecell>
 </tablecell>
-</tablerow>
-</table>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3149282" xml-lang="en-US" l10n="U" oldref="83">The formula in cell B16 is =DCOUNT(A1:E10;0;A13:E14)</paragraph>
-<paragraph role="heading" id="hd_id3150962" xml-lang="en-US" level="3" l10n="U" oldref="192">Database Function Parameters:</paragraph>
-<paragraph role="paragraph" id="par_id3155837" xml-lang="en-US" l10n="U" oldref="84">The following items are the parameter definitions for all database functions:</paragraph>
-<paragraph role="paragraph" id="par_id3149453" xml-lang="en-US" l10n="U" oldref="85">
+      <paragraph xml-lang="en-US" id="par_id3149282" role="paragraph" l10n="U" oldref="83">The formula in cell B16 is =DCOUNT(A1:E10;0;A13:E14)</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150962" role="heading" level="3" l10n="U"
+                 oldref="192">Database Function Parameters:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155837" role="paragraph" l10n="U" oldref="84">The following items are the parameter definitions for all database functions:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149453" role="paragraph" l10n="U" oldref="85">
 <emph>Database</emph> is the cell range defining the database.</paragraph>
-<paragraph role="paragraph" id="par_id3151272" xml-lang="en-US" l10n="U" oldref="86">
+      <paragraph xml-lang="en-US" id="par_id3151272" role="paragraph" l10n="U" oldref="86">
 <emph>DatabaseField</emph> specifies the column where the function operates on after the search criteria of the first parameter is applied and the data rows are selected. It is not related to the search criteria itself. Use the number 0 to specify the whole data range. <variable id="quotes">To reference a column by means of the column header name, place quotation marks around the header name. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147083" xml-lang="en-US" l10n="U" oldref="87">
+      <paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
 <emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
-<paragraph role="paragraph" id="par_id3151188" xml-lang="en-US" l10n="U" oldref="188">Choose <link href="text/shared/optionen/01060500.xhp" name="Tools - Options - Spreadsheet - Calculate">Tools - Options - %PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
-<paragraph role="paragraph" id="par_id3882869" xml-lang="en-US" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp" name="Spreadsheet - Calculate">%PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
 <sort order="asc">
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150882"><bookmark_value>DCOUNT function</bookmark_value>
-<bookmark_value>counting rows;with numeric values</bookmark_value>
+         <bookmark_value>counting rows;with numeric values</bookmark_value>
 </bookmark><comment>mw added "counting rows;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL" id="bm_id3152926" localize="false"/>
-<paragraph role="heading" id="hd_id3150882" xml-lang="en-US" level="2" l10n="U" oldref="88">DCOUNT</paragraph>
-<paragraph role="paragraph" id="par_id3156133" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_DBANZAHL">DCOUNT counts the number of rows (records) in a database that match the specified search criteria and contain numerical values.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3156099" xml-lang="en-US" level="3" l10n="U" oldref="90">Syntax</paragraph>
-<paragraph role="code" id="par_id3153218" xml-lang="en-US" l10n="U" oldref="91">DCOUNT(Database; DatabaseField; SearchCriteria)</paragraph>
-<paragraph role="paragraph" id="par_id3153273" xml-lang="en-US" l10n="U" oldref="187">For the DatabaseField parameter you can enter a cell to specify the column, or enter the number 0 for the entire database. The parameter cannot be empty. <embedvar href="text/scalc/01/04060101.xhp#quotes"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3154743" xml-lang="en-US" level="3" l10n="U" oldref="92">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153623" xml-lang="en-US" l10n="U" oldref="93">In the example above (scroll up, please), we want to know how many children have to travel more than 600 meters to school. The result is to be stored in cell B16. Set the cursor in cell B16. Enter the formula <item type="input">=DCOUNT(A1:E10;0;A13:E14)</item> in B16. The <emph>Function Wizard</emph> helps you to input ranges.</paragraph>
-<paragraph role="paragraph" id="par_id3149142" xml-lang="en-US" l10n="U" oldref="94">
+<paragraph xml-lang="en-US" id="hd_id3150882" role="heading" level="2" l10n="U"
+                    oldref="88">DCOUNT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156133" role="paragraph" l10n="U" oldref="89"><ahelp hid="HID_FUNC_DBANZAHL">DCOUNT counts the number of rows (records) in a database that match the specified search criteria and contain numerical values.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3156099" role="heading" level="3" l10n="U"
+                    oldref="90">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153218" role="code" l10n="U" oldref="91">DCOUNT(Database; DatabaseField; SearchCriteria)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153273" role="paragraph" l10n="U" oldref="187">For the DatabaseField parameter you can enter a cell to specify the column, or enter the number 0 for the entire database. The parameter cannot be empty. <embedvar href="text/scalc/01/04060101.xhp#quotes"/>
+</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154743" role="heading" level="3" l10n="U"
+                    oldref="92">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153623" role="paragraph" l10n="U" oldref="93">In the example above (scroll up, please), we want to know how many children have to travel more than 600 meters to school. The result is to be stored in cell B16. Set the cursor in cell B16. Enter the formula <item type="input">=DCOUNT(A1:E10;0;A13:E14)</item> in B16. The <emph>Function Wizard</emph> helps you to input ranges.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149142" role="paragraph" l10n="U" oldref="94">
 <emph>Database</emph> is the range of data to be evaluated, including its headers: in this case A1:E10. <emph>DatabaseField</emph> specifies the column for the search criteria: in this case, the whole database. <emph>SearchCriteria</emph> is the range where you can enter the search parameters: in this case, A13:E14.</paragraph>
-<paragraph role="paragraph" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="95">To learn how many children in second grade are over 7 years of age, delete the entry &gt;600 in cell D14 and enter <item type="input">2</item> in cell B14 under Grade, and enter <item type="input">&gt;7</item> in cell C14 to the right. The result is 2. Two children are in second grade and over 7 years of age. As both criteria are in the same row, they are connected by AND.</paragraph>
-</section>
-<section id="Section2">
+         <paragraph xml-lang="en-US" id="par_id3145652" role="paragraph" l10n="U" oldref="95">To learn how many children in second grade are over 7 years of age, delete the entry &gt;600 in cell D14 and enter <item type="input">2</item> in cell B14 under Grade, and enter <item type="input">&gt;7</item> in cell C14 to the right. The result is 2. Two children are in second grade and over 7 years of age. As both criteria are in the same row, they are connected by AND.</paragraph>
+      </section>
+      <section id="Section2">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156123"><bookmark_value>DCOUNTA function</bookmark_value>
-<bookmark_value>records;counting in Calc databases</bookmark_value>
-<bookmark_value>counting rows;with numeric or alphanumeric values</bookmark_value>
+         <bookmark_value>records;counting in Calc databases</bookmark_value>
+         <bookmark_value>counting rows;with numeric or alphanumeric values</bookmark_value>
 </bookmark><comment>mw added "records;" and "counting rows;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL2" id="bm_id3154055" localize="false"/>
-<paragraph role="heading" id="hd_id3156123" xml-lang="en-US" level="2" l10n="U" oldref="97">DCOUNTA</paragraph>
-<paragraph role="paragraph" id="par_id3156110" xml-lang="en-US" l10n="U" oldref="98"><ahelp hid="HID_FUNC_DBANZAHL2">DCOUNTA counts the number of rows (records) in a database that match the specified search conditions, and contain numeric or alphanumeric values.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3143228" xml-lang="en-US" level="3" l10n="U" oldref="99">Syntax</paragraph>
-<paragraph role="code" id="par_id3146893" xml-lang="en-US" l10n="U" oldref="100">DCOUNTA(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="101">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153982" xml-lang="en-US" l10n="CHG" oldref="102">In the example above (scroll up, please), you can search for the number of children whose name starts with an E or a subsequent letter. Edit the formula in B16 to read <item type="input">=DCOUNTA(A1:E10;"Age";A13:E14)</item>. Delete the old search criteria and enter <item type="input">&gt;=E</item> under Name in field A14. The result is 5. If you now delete all number values for Greta in row 8, the result changes to 4. Row 8 is no longer included in the count because it does not contain any values. The name Greta is text, not a value. Note that the DatabaseField parameter must point to a column that can contain values.<comment>see i25407</comment></paragraph>
-</section>
-<section id="Section3">
+<paragraph xml-lang="en-US" id="hd_id3156123" role="heading" level="2" l10n="U"
+                    oldref="97">DCOUNTA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="98"><ahelp hid="HID_FUNC_DBANZAHL2">DCOUNTA counts the number of rows (records) in a database that match the specified search conditions, and contain numeric or alphanumeric values.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3143228" role="heading" level="3" l10n="U"
+                    oldref="99">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146893" role="code" l10n="U" oldref="100">DCOUNTA(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3149751" role="heading" level="3" l10n="U"
+                    oldref="101">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153982" role="paragraph" l10n="CHG" oldref="102">In the example above (scroll up, please), you can search for the number of children whose name starts with an E or a subsequent letter. Edit the formula in B16 to read <item type="input">=DCOUNTA(A1:E10;"Name";A13:E14)</item>. Delete the old search criteria and enter <item type="input">&gt;=E</item> under Name in field A14. The result is 5. If you now delete all number values for Greta in row 8, the result changes to 4. Row 8 is no longer included in the count because it does not contain any values. The name Greta is text, not a value. Note that the DatabaseField parameter must point to a column that can contain values.<comment>see i25407</comment></paragraph>
+      </section>
+      <section id="Section3">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147256"><bookmark_value>DGET function</bookmark_value>
-<bookmark_value>cell contents;searching in Calc databases</bookmark_value>
-<bookmark_value>searching;cell contents in Calc databases</bookmark_value>
+         <bookmark_value>cell contents;searching in Calc databases</bookmark_value>
+         <bookmark_value>searching;cell contents in Calc databases</bookmark_value>
 </bookmark><comment>mw added "cell contents;" and "searching;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBAUSZUG" id="bm_id3149198" localize="false"/>
-<paragraph role="heading" id="hd_id3147256" xml-lang="en-US" level="2" l10n="U" oldref="104">DGET</paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="HID_FUNC_DBAUSZUG">DGET returns the contents of the referenced cell in a database which matches the specified search criteria.</ahelp> In case of an error, the function returns either #VALUE! for no row found, or Err502 for more than one cell found.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="106">Syntax</paragraph>
-<paragraph role="code" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="107">DGET(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3153909" xml-lang="en-US" level="3" l10n="U" oldref="108">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="109">In the above example (scroll up, please), we want to determine what grade a child is in, whose name was entered in cell A14. The formula is entered in cell B16 and differs slightly from the earlier examples because only one column (one database field) can be entered for <emph>DatabaseField</emph>. Enter the following formula:</paragraph>
-<paragraph role="paragraph" id="par_id3153096" xml-lang="en-US" l10n="U" oldref="110">
+<paragraph xml-lang="en-US" id="hd_id3147256" role="heading" level="2" l10n="U"
+                    oldref="104">DGET</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="105"><ahelp hid="HID_FUNC_DBAUSZUG">DGET returns the contents of the referenced cell in a database which matches the specified search criteria.</ahelp> In case of an error, the function returns either #VALUE! for no row found, or Err502 for more than one cell found.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3159344" role="heading" level="3" l10n="U"
+                    oldref="106">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154696" role="code" l10n="U" oldref="107">DGET(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3153909" role="heading" level="3" l10n="U"
+                    oldref="108">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155388" role="paragraph" l10n="U" oldref="109">In the above example (scroll up, please), we want to determine what grade a child is in, whose name was entered in cell A14. The formula is entered in cell B16 and differs slightly from the earlier examples because only one column (one database field) can be entered for <emph>DatabaseField</emph>. Enter the following formula:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153096" role="paragraph" l10n="U" oldref="110">
 <item type="input">=DGET(A1:E10;"Grade";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150524" xml-lang="en-US" l10n="U" oldref="111">Enter the name <item type="input">Frank</item> in A14, and you see the result 2. Frank is in second grade. Enter <item type="input">"Age"</item> instead of "Grade" and you will get Frank's age.</paragraph>
-<paragraph role="paragraph" id="par_id3148833" xml-lang="en-US" l10n="U" oldref="112">Or enter the value <item type="input">11</item> in cell C14 only, and delete the other entries in this row. Edit the formula in B16 as follows:</paragraph>
-<paragraph role="paragraph" id="par_id3149912" xml-lang="en-US" l10n="U" oldref="113">
+         <paragraph xml-lang="en-US" id="par_id3150524" role="paragraph" l10n="U" oldref="111">Enter the name <item type="input">Frank</item> in A14, and you see the result 2. Frank is in second grade. Enter <item type="input">"Age"</item> instead of "Grade" and you will get Frank's age.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148833" role="paragraph" l10n="U" oldref="112">Or enter the value <item type="input">11</item> in cell C14 only, and delete the other entries in this row. Edit the formula in B16 as follows:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149912" role="paragraph" l10n="U" oldref="113">
 <item type="input">=DGET(A1:E10;"Name";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148813" xml-lang="en-US" l10n="U" oldref="114">Instead of the grade, the name is queried. The answer appears at once: Daniel is the only child aged 11.</paragraph>
-</section>
-<section id="Section4">
+         <paragraph xml-lang="en-US" id="par_id3148813" role="paragraph" l10n="U" oldref="114">Instead of the grade, the name is queried. The answer appears at once: Daniel is the only child aged 11.</paragraph>
+      </section>
+      <section id="Section4">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149766"><bookmark_value>DMAX function</bookmark_value>
-<bookmark_value>maximum values in Calc databases</bookmark_value>
-<bookmark_value>searching;maximum values in columns</bookmark_value>
+         <bookmark_value>maximum values in Calc databases</bookmark_value>
+         <bookmark_value>searching;maximum values in columns</bookmark_value>
 </bookmark><comment>mw added "maximum..." and "searching;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMAX" id="bm_id3158401" localize="false"/>
-<paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="2" l10n="U" oldref="115">DMAX</paragraph>
-<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_FUNC_DBMAX">DMAX returns the maximum content of a cell (field) in a database (all records) that matches the specified search conditions.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
-<paragraph role="code" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="118">DMAX(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3145420" xml-lang="en-US" level="3" l10n="U" oldref="119">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148442" xml-lang="en-US" l10n="U" oldref="120">To find out how much the heaviest child in each grade weighed in the above example (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3148804" xml-lang="en-US" l10n="U" oldref="121">
+<paragraph xml-lang="en-US" id="hd_id3149766" role="heading" level="2" l10n="U"
+                    oldref="115">DMAX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="116"><ahelp hid="HID_FUNC_DBMAX">DMAX returns the maximum content of a cell (field) in a database (all records) that matches the specified search conditions.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="3" l10n="U"
+                    oldref="117">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159157" role="code" l10n="U" oldref="118">DMAX(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3145420" role="heading" level="3" l10n="U"
+                    oldref="119">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148442" role="paragraph" l10n="U" oldref="120">To find out how much the heaviest child in each grade weighed in the above example (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148804" role="paragraph" l10n="U" oldref="121">
 <item type="input">=DMAX(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150510" xml-lang="en-US" l10n="U" oldref="122">Under Grade, enter <item type="input">1, 2, 3,</item> and so on, one after the other. After entering a grade number, the weight of the heaviest child in that grade appears.</paragraph>
-</section>
-<section id="Section5">
+         <paragraph xml-lang="en-US" id="par_id3150510" role="paragraph" l10n="U" oldref="122">Under Grade, enter <item type="input">1, 2, 3,</item> and so on, one after the other. After entering a grade number, the weight of the heaviest child in that grade appears.</paragraph>
+      </section>
+      <section id="Section5">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159141"><bookmark_value>DMIN function</bookmark_value>
-<bookmark_value>minimum values in Calc databases</bookmark_value>
-<bookmark_value>searching;minimum values in columns</bookmark_value>
+         <bookmark_value>minimum values in Calc databases</bookmark_value>
+         <bookmark_value>searching;minimum values in columns</bookmark_value>
 </bookmark><comment>mw added "minimum..." and "searching;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMIN" id="bm_id3159152" localize="false"/>
-<paragraph role="heading" id="hd_id3159141" xml-lang="en-US" level="2" l10n="U" oldref="123">DMIN</paragraph>
-<paragraph role="paragraph" id="par_id3154261" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="HID_FUNC_DBMIN">DMIN returns the minimum content of a cell (field) in a database that matches the specified search criteria.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3147238" xml-lang="en-US" level="3" l10n="U" oldref="125">Syntax</paragraph>
-<paragraph role="code" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="126">DMIN(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3151050" xml-lang="en-US" level="3" l10n="U" oldref="127">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="128">To find the shortest distance to school for the children in each grade in the above example (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3149161" xml-lang="en-US" l10n="U" oldref="129">
+<paragraph xml-lang="en-US" id="hd_id3159141" role="heading" level="2" l10n="U"
+                    oldref="123">DMIN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154261" role="paragraph" l10n="U" oldref="124"><ahelp hid="HID_FUNC_DBMIN">DMIN returns the minimum content of a cell (field) in a database that matches the specified search criteria.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3147238" role="heading" level="3" l10n="U"
+                    oldref="125">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148479" role="code" l10n="U" oldref="126">DMIN(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3151050" role="heading" level="3" l10n="U"
+                    oldref="127">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148925" role="paragraph" l10n="U" oldref="128">To find the shortest distance to school for the children in each grade in the above example (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149161" role="paragraph" l10n="U" oldref="129">
 <item type="input">=DMIN(A1:E10;"Distance to School";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148917" xml-lang="en-US" l10n="U" oldref="130">In row 14, under Grade, enter <item type="input">1, 2, 3,</item> and so on, one after the other. The shortest distance to school for each grade appears.</paragraph>
-</section>
-<section id="Section6">
+         <paragraph xml-lang="en-US" id="par_id3148917" role="paragraph" l10n="U" oldref="130">In row 14, under Grade, enter <item type="input">1, 2, 3,</item> and so on, one after the other. The shortest distance to school for each grade appears.</paragraph>
+      </section>
+      <section id="Section6">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154274"><bookmark_value>DAVERAGE function</bookmark_value>
-<bookmark_value>averages; in Calc databases</bookmark_value>
-<bookmark_value>calculating;averages in Calc databases</bookmark_value>
+         <bookmark_value>averages; in Calc databases</bookmark_value>
+         <bookmark_value>calculating;averages in Calc databases</bookmark_value>
 </bookmark><comment>mw added "averages;..." and "calculating;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMITTELWERT" id="bm_id3166435" localize="false"/>
-<paragraph role="heading" id="hd_id3154274" xml-lang="en-US" level="2" l10n="U" oldref="131">DAVERAGE</paragraph>
-<paragraph role="paragraph" id="par_id3166453" xml-lang="en-US" l10n="U" oldref="132"><ahelp hid="HID_FUNC_DBMITTELWERT">DAVERAGE returns the average of the values of all cells (fields) in all rows (database records) that match the specified search criteria.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3146955" xml-lang="en-US" level="3" l10n="U" oldref="133">Syntax</paragraph>
-<paragraph role="code" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="134">DAVERAGE(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3152943" xml-lang="en-US" level="3" l10n="U" oldref="135">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U" oldref="136">To find the average weight of all children of the same age in the above example (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3153688" xml-lang="en-US" l10n="U" oldref="137">
+<paragraph xml-lang="en-US" id="hd_id3154274" role="heading" level="2" l10n="U"
+                    oldref="131">DAVERAGE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166453" role="paragraph" l10n="U" oldref="132"><ahelp hid="HID_FUNC_DBMITTELWERT">DAVERAGE returns the average of the values of all cells (fields) in all rows (database records) that match the specified search criteria.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3146955" role="heading" level="3" l10n="U"
+                    oldref="133">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150710" role="code" l10n="U" oldref="134">DAVERAGE(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3152943" role="heading" level="3" l10n="U"
+                    oldref="135">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149104" role="paragraph" l10n="U" oldref="136">To find the average weight of all children of the same age in the above example (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153688" role="paragraph" l10n="U" oldref="137">
 <item type="input">=DAVERAGE(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3155587" xml-lang="en-US" l10n="U" oldref="138">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The average weight of all children of the same age appears.</paragraph>
-</section>
-<section id="Section7">
+         <paragraph xml-lang="en-US" id="par_id3155587" role="paragraph" l10n="U" oldref="138">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The average weight of all children of the same age appears.</paragraph>
+      </section>
+      <section id="Section7">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159269"><bookmark_value>DPRODUCT function</bookmark_value>
-<bookmark_value>multiplying;cell contents in Calc databases</bookmark_value>
+         <bookmark_value>multiplying;cell contents in Calc databases</bookmark_value>
 </bookmark><comment>mw added "multiplying..."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBPRODUKT" id="bm_id3159281" localize="false"/>
-<paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="2" l10n="U" oldref="139">DPRODUCT</paragraph>
-<paragraph role="paragraph" id="par_id3152879" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_FUNC_DBPRODUKT">DPRODUCT multiplies all cells of a data range where the cell contents match the search criteria.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3149966" xml-lang="en-US" level="3" l10n="U" oldref="141">Syntax</paragraph>
-<paragraph role="code" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="142">DPRODUCT(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3149802" xml-lang="en-US" level="3" l10n="U" oldref="143">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148986" xml-lang="en-US" l10n="U" oldref="144">With the birthday party example above (scroll up, please), there is no meaningful application of this function.</paragraph>
-</section>
-<section id="Section8">
+<paragraph xml-lang="en-US" id="hd_id3159269" role="heading" level="2" l10n="U"
+                    oldref="139">DPRODUCT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152879" role="paragraph" l10n="U" oldref="140"><ahelp hid="HID_FUNC_DBPRODUKT">DPRODUCT multiplies all cells of a data range where the cell contents match the search criteria.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3149966" role="heading" level="3" l10n="U"
+                    oldref="141">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154854" role="code" l10n="U" oldref="142">DPRODUCT(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3149802" role="heading" level="3" l10n="U"
+                    oldref="143">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148986" role="paragraph" l10n="U" oldref="144">With the birthday party example above (scroll up, please), there is no meaningful application of this function.</paragraph>
+      </section>
+      <section id="Section8">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148462"><bookmark_value>DSTDEV function</bookmark_value>
-<bookmark_value>standard deviations in databases;based on a sample</bookmark_value>
+         <bookmark_value>standard deviations in databases;based on a sample</bookmark_value>
 </bookmark><comment>mw added "standard deviations...;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABW" id="bm_id3145370" localize="false"/>
-<paragraph role="heading" id="hd_id3148462" xml-lang="en-US" level="2" l10n="U" oldref="145">DSTDEV</paragraph>
-<paragraph role="paragraph" id="par_id3154605" xml-lang="en-US" l10n="U" oldref="146"><ahelp hid="HID_FUNC_DBSTDABW">DSTDEV calculates the standard deviation of a population based on a sample, using the numbers in a database column that match the given conditions.</ahelp> The records are treated as a sample of data. That means that the children in the example represent a cross section of all children. Note that a representative result can not be obtained from a sample of less than one thousand.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3149427" xml-lang="en-US" level="3" l10n="U" oldref="147">Syntax</paragraph>
-<paragraph role="code" id="par_id3148661" xml-lang="en-US" l10n="U" oldref="148">DSTDEV(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="3" l10n="U" oldref="149">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149934" xml-lang="en-US" l10n="U" oldref="150">To find the standard deviation of the weight for all children of the same age in the example (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3150630" xml-lang="en-US" l10n="U" oldref="151">
+<paragraph xml-lang="en-US" id="hd_id3148462" role="heading" level="2" l10n="U"
+                    oldref="145">DSTDEV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154605" role="paragraph" l10n="U" oldref="146"><ahelp hid="HID_FUNC_DBSTDABW">DSTDEV calculates the standard deviation of a population based on a sample, using the numbers in a database column that match the given conditions.</ahelp> The records are treated as a sample of data. That means that the children in the example represent a cross section of all children. Note that a representative result can not be obtained from a sample of less than one thousand.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3149427" role="heading" level="3" l10n="U"
+                    oldref="147">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148661" role="code" l10n="U" oldref="148">DSTDEV(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3153945" role="heading" level="3" l10n="U"
+                    oldref="149">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149934" role="paragraph" l10n="U" oldref="150">To find the standard deviation of the weight for all children of the same age in the example (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="151">
 <item type="input">=DSTDEV(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="152">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The result shown is the standard deviation of the weight of all children of this age.</paragraph>
-</section>
-<section id="Section9">
+         <paragraph xml-lang="en-US" id="par_id3153536" role="paragraph" l10n="U" oldref="152">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The result shown is the standard deviation of the weight of all children of this age.</paragraph>
+      </section>
+      <section id="Section9">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150429"><bookmark_value>DSTDEVP function</bookmark_value>
-<bookmark_value>standard deviations in databases;based on populations</bookmark_value>
+         <bookmark_value>standard deviations in databases;based on populations</bookmark_value>
 </bookmark><comment>mw added "standard deviations...;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABWN" id="bm_id3149523" localize="false"/>
-<paragraph role="heading" id="hd_id3150429" xml-lang="en-US" level="2" l10n="U" oldref="153">DSTDEVP</paragraph>
-<paragraph role="paragraph" id="par_id3145598" xml-lang="en-US" l10n="U" oldref="154"><ahelp hid="HID_FUNC_DBSTDABWN">DSTDEVP calculates the standard deviation of a population based on all cells of a data range which match the search criteria.</ahelp> The records from the example are treated as the whole population.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3145307" xml-lang="en-US" level="3" l10n="U" oldref="155">Syntax</paragraph>
-<paragraph role="code" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="156">DSTDEVP(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3153322" xml-lang="en-US" level="3" l10n="U" oldref="157">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US" l10n="U" oldref="158">To find the standard deviation of the weight for all children of the same age at Joe's birthday party (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3148411" xml-lang="en-US" l10n="U" oldref="159">
+<paragraph xml-lang="en-US" id="hd_id3150429" role="heading" level="2" l10n="U"
+                    oldref="153">DSTDEVP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145598" role="paragraph" l10n="U" oldref="154"><ahelp hid="HID_FUNC_DBSTDABWN">DSTDEVP calculates the standard deviation of a population based on all cells of a data range which match the search criteria.</ahelp> The records from the example are treated as the whole population.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3145307" role="heading" level="3" l10n="U"
+                    oldref="155">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149484" role="code" l10n="U" oldref="156">DSTDEVP(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3153322" role="heading" level="3" l10n="U"
+                    oldref="157">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155431" role="paragraph" l10n="U" oldref="158">To find the standard deviation of the weight for all children of the same age at Joe's birthday party (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148411" role="paragraph" l10n="U" oldref="159">
 <item type="input">=DSTDEVP(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="160">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The result is the standard deviation of the weight for all same-aged children whose weight was checked.</paragraph>
-</section>
-<section id="Section10">
+         <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="160">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The result is the standard deviation of the weight for all same-aged children whose weight was checked.</paragraph>
+      </section>
+      <section id="Section10">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154794"><bookmark_value>DSUM function</bookmark_value>
-<bookmark_value>calculating;sums in Calc databases</bookmark_value>
-<bookmark_value>sums;cells in Calc databases</bookmark_value>
+         <bookmark_value>calculating;sums in Calc databases</bookmark_value>
+         <bookmark_value>sums;cells in Calc databases</bookmark_value>
 </bookmark><comment>mw added "calculating;" and "sums;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSUMME" id="bm_id3148687" localize="false"/>
-<paragraph role="heading" id="hd_id3154794" xml-lang="en-US" level="2" l10n="U" oldref="161">DSUM</paragraph>
-<paragraph role="paragraph" id="par_id3149591" xml-lang="en-US" l10n="U" oldref="162"><ahelp hid="HID_FUNC_DBSUMME">DSUM returns the total of all cells in a database field in all rows (records) that match the specified search criteria.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3146128" xml-lang="en-US" level="3" l10n="U" oldref="163">Syntax</paragraph>
-<paragraph role="code" id="par_id3150989" xml-lang="en-US" l10n="U" oldref="164">DSUM(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3159079" xml-lang="en-US" level="3" l10n="U" oldref="165">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152766" xml-lang="en-US" l10n="U" oldref="166">To find the length of the combined distance to school of all children at Joe's birthday party (scroll up, please) who are in second grade, enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3151312" xml-lang="en-US" l10n="U" oldref="167">
+<paragraph xml-lang="en-US" id="hd_id3154794" role="heading" level="2" l10n="U"
+                    oldref="161">DSUM</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149591" role="paragraph" l10n="U" oldref="162"><ahelp hid="HID_FUNC_DBSUMME">DSUM returns the total of all cells in a database field in all rows (records) that match the specified search criteria.</ahelp></paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3146128" role="heading" level="3" l10n="U"
+                    oldref="163">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150989" role="code" l10n="U" oldref="164">DSUM(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3159079" role="heading" level="3" l10n="U"
+                    oldref="165">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152766" role="paragraph" l10n="U" oldref="166">To find the length of the combined distance to school of all children at Joe's birthday party (scroll up, please) who are in second grade, enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151312" role="paragraph" l10n="U" oldref="167">
 <item type="input">=DSUM(A1:E10;"Distance to School";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150596" xml-lang="en-US" l10n="U" oldref="168">Enter <item type="input">2</item> in row 14 under Grade. The sum (1950) of the distances to school of all the children who are in second grade is displayed.</paragraph>
-</section>
-<section id="Section11">
+         <paragraph xml-lang="en-US" id="par_id3150596" role="paragraph" l10n="U" oldref="168">Enter <item type="input">2</item> in row 14 under Grade. The sum (1950) of the distances to school of all the children who are in second grade is displayed.</paragraph>
+      </section>
+      <section id="Section11">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155614"><bookmark_value>DVAR function</bookmark_value>
-<bookmark_value>variances;based on samples</bookmark_value>
+         <bookmark_value>variances;based on samples</bookmark_value>
 </bookmark><comment>mw added "variances;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZ" id="bm_id3159391" localize="false"/>
-<paragraph role="heading" id="hd_id3155614" xml-lang="en-US" level="2" l10n="U" oldref="170">DVAR</paragraph>
-<paragraph role="paragraph" id="par_id3154418" xml-lang="en-US" l10n="U" oldref="171"><ahelp hid="HID_FUNC_DBVARIANZ">DVAR returns the variance of all cells of a database field in all records that match the specified search criteria.</ahelp> The records from the example are treated as a sample of data. A representative result cannot be obtained from a sample population of less than one thousand.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3154825" xml-lang="en-US" level="3" l10n="U" oldref="172">Syntax</paragraph>
-<paragraph role="code" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="173">DVAR(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3151257" xml-lang="en-US" level="3" l10n="U" oldref="174">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="175">To find the variance of the weight of all children of the same age of the above example (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3153676" xml-lang="en-US" l10n="U" oldref="176">
+<paragraph xml-lang="en-US" id="hd_id3155614" role="heading" level="2" l10n="U"
+                    oldref="170">DVAR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154418" role="paragraph" l10n="U" oldref="171"><ahelp hid="HID_FUNC_DBVARIANZ">DVAR returns the variance of all cells of a database field in all records that match the specified search criteria.</ahelp> The records from the example are treated as a sample of data. A representative result cannot be obtained from a sample population of less than one thousand.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3154825" role="heading" level="3" l10n="U"
+                    oldref="172">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156138" role="code" l10n="U" oldref="173">DVAR(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3151257" role="heading" level="3" l10n="U"
+                    oldref="174">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153701" role="paragraph" l10n="U" oldref="175">To find the variance of the weight of all children of the same age of the above example (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153676" role="paragraph" l10n="U" oldref="176">
 <item type="input">=DVAR(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="177">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. You will see as a result the variance of the weight values for all children of this age.</paragraph>
-</section>
-<section id="Section12">
+         <paragraph xml-lang="en-US" id="par_id3153798" role="paragraph" l10n="U" oldref="177">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. You will see as a result the variance of the weight values for all children of this age.</paragraph>
+      </section>
+      <section id="Section12">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153880"><bookmark_value>DVARP function</bookmark_value>
-<bookmark_value>variances;based on populations</bookmark_value>
+         <bookmark_value>variances;based on populations</bookmark_value>
 </bookmark><comment>mw added "variances;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZEN" id="bm_id3153891" localize="false"/>
-<paragraph role="heading" id="hd_id3153880" xml-lang="en-US" level="2" l10n="U" oldref="178">DVARP</paragraph>
-<paragraph role="paragraph" id="par_id3155119" xml-lang="en-US" l10n="U" oldref="179"><ahelp hid="HID_FUNC_DBVARIANZEN">DVARP calculates the variance of all cell values in a database field in all records that match the specified search criteria.</ahelp> The records are from the example are treated as an entire population.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3145774" xml-lang="en-US" level="3" l10n="U" oldref="180">Syntax</paragraph>
-<paragraph role="code" id="par_id3153776" xml-lang="en-US" l10n="U" oldref="181">DVARP(Database; DatabaseField; SearchCriteria)</paragraph>
-<embed href="text/scalc/01/04060101.xhp#quotes"/>
-<paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="182">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147099" xml-lang="en-US" l10n="U" oldref="183">To find the variance of the weight for all children of the same age at Joe's birthday party (scroll up, please), enter the following formula in B16:</paragraph>
-<paragraph role="paragraph" id="par_id3147322" xml-lang="en-US" l10n="U" oldref="184">
+<paragraph xml-lang="en-US" id="hd_id3153880" role="heading" level="2" l10n="U"
+                    oldref="178">DVARP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155119" role="paragraph" l10n="U" oldref="179"><ahelp hid="HID_FUNC_DBVARIANZEN">DVARP calculates the variance of all cell values in a database field in all records that match the specified search criteria.</ahelp> The records are from the example are treated as an entire population.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3145774" role="heading" level="3" l10n="U"
+                    oldref="180">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153776" role="code" l10n="U" oldref="181">DVARP(Database; DatabaseField; SearchCriteria)</paragraph>
+         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="hd_id3151110" role="heading" level="3" l10n="U"
+                    oldref="182">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147099" role="paragraph" l10n="U" oldref="183">To find the variance of the weight for all children of the same age at Joe's birthday party (scroll up, please), enter the following formula in B16:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147322" role="paragraph" l10n="U" oldref="184">
 <item type="input">=DVARP(A1:E10;"Weight";A13:E14)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3146902" xml-lang="en-US" l10n="U" oldref="185">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The variance of the weight values for all children of this age attending Joe's birthday party appears.</paragraph>
-</section>
+         <paragraph xml-lang="en-US" id="par_id3146902" role="paragraph" l10n="U" oldref="185">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The variance of the weight values for all children of this age attending Joe's birthday party appears.</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060102.xhp b/helpcontent2/source/text/scalc/01/04060102.xhp
index f7f84be54a..b53b1d6eae 100644
--- a/helpcontent2/source/text/scalc/01/04060102.xhp
+++ b/helpcontent2/source/text/scalc/01/04060102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060102.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <embed href="text/scalc/00/00000404.xhp#eikadaze"/>
 </section>
 <section id="ADD_note">
-<paragraph role="note" id="par_idN10600" xml-lang="en-US" l10n="NEW">The functions whose names end with _ADD return the same results as the corresponding Microsoft Excel functions. Use the functions without _ADD to get results based on international standards. For example, the WEEKNUM function calculates the week number of a given date based on international standard ISO 6801, while WEEKNUM_ADD returns the same week number as Microsoft Excel.<comment>UFI: see #33784#</comment></paragraph>
+<paragraph role="note" id="par_idN10600" xml-lang="en-US" l10n="NEW">The functions whose names end with _ADD return the same results as the corresponding Microsoft Excel functions. Use the functions without _ADD to get results based on international standards. For example, the WEEKNUM function calculates the week number of a given date based on international standard ISO 8601, while WEEKNUM_ADD returns the same week number as Microsoft Excel.<comment>UFI: see #33784#</comment></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3150437" xml-lang="en-US" l10n="U" oldref="170">$[officename] internally handles a date/time value as a numerical value. If you assign the numbering format "Number" to a date or time value, it is converted to a number. For example, 01/01/2000 12:00 PM, converts to 36526.5. The value preceding the decimal point corresponds to the date; the value following the decimal point corresponds to the time. If you do not want to see this type of numerical date or time representation, change the number format (date or time) accordingly. To do this, select the cell containing the date or time value, call its context menu and select <emph>Format Cells</emph>. The <emph>Numbers</emph> tab page contains the functions for defining the number format.</paragraph>
 <paragraph role="heading" id="hd_id2408825" xml-lang="en-US" level="2" l10n="NEW">Date base for day zero</paragraph>
@@ -92,10 +89,10 @@
 </tablerow>
 </table>
 
-<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
+<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
 <paragraph role="warning" id="par_id1953489" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
 <paragraph role="heading" id="hd_id757469" xml-lang="en-US" level="2" l10n="NEW">Two digits years</paragraph>
-<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <emph>Tools - Options - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
+<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
 <paragraph role="note" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="185">When entering dates, slashes or dashes used as date separators may be interpreted as arithmetic operators. Therefore, dates entered in this format are not always recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas, place them in quotation marks, for example, "07/20/54".</paragraph>
 <paragraph role="heading" id="par_idN1067A" xml-lang="en-US" level="2" l10n="NEW">Functions</paragraph>
 <sort order="asc">
diff --git a/helpcontent2/source/text/scalc/01/04060103.xhp b/helpcontent2/source/text/scalc/01/04060103.xhp
index 38180da3e1..4f8be69445 100644
--- a/helpcontent2/source/text/scalc/01/04060103.xhp
+++ b/helpcontent2/source/text/scalc/01/04060103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060103.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,708 +32,748 @@
  
 	
 <meta>
-<topic id="textscalc0104060103xml" indexer="include">
-<title id="tit" xml-lang="en-US">Financial Functions Part One</title>
-<filename>/text/scalc/01/04060103.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060103xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Financial Functions Part One</title>
+         <filename>/text/scalc/01/04060103.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>financial functions</bookmark_value>
-<bookmark_value>functions; financial functions</bookmark_value>
-<bookmark_value>Function Wizard; financial</bookmark_value>
-<bookmark_value>amortizations, see also depreciations</bookmark_value>
+      <bookmark_value>functions; financial functions</bookmark_value>
+      <bookmark_value>Function Wizard; financial</bookmark_value>
+      <bookmark_value>amortizations, see also depreciations</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
-<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1" l10n="U" oldref="1">Financial Functions Part One</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="finanztext">This category contains the mathematical finance functions of <item type="productname">%PRODUCTNAME</item> Calc. 
+<paragraph xml-lang="en-US" id="hd_id3143284" role="heading" level="1" l10n="U" oldref="1">Financial Functions Part One</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="CHG" oldref="2"><variable id="finanztext">This category contains the mathematical finance functions of <item type="productname">%PRODUCTNAME</item> Calc. 
 </variable></paragraph>
 <sort order="asc">
 <section id="amordegrc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153366"><bookmark_value>AMORDEGRC function</bookmark_value>
-<bookmark_value>depreciations;degressive amortizations</bookmark_value>
+         <bookmark_value>depreciations;degressive amortizations</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORDEGRC" id="bm_id3152578" localize="false"/>
-<paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="2" l10n="U" oldref="359">AMORDEGRC</paragraph>
-<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="360"><ahelp hid="HID_AAI_FUNC_AMORDEGRC">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here.</paragraph>
-<paragraph role="heading" id="hd_id3155855" xml-lang="en-US" level="3" l10n="U" oldref="361">Syntax</paragraph>
-<paragraph role="code" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="362">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3147125" xml-lang="en-US" l10n="U" oldref="363">
-<emph>Cost</emph> is the acquisition costs.</paragraph>
-<paragraph role="paragraph" id="par_id3151074" xml-lang="en-US" l10n="U" oldref="364">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
-<paragraph role="paragraph" id="par_id3144765" xml-lang="en-US" l10n="U" oldref="365">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="366">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="367">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
-<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="368">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-</section>
-<section id="amorlinc">
+<paragraph xml-lang="en-US" id="hd_id3153366" role="heading" level="2" l10n="U"
+                    oldref="359">AMORDEGRC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="U" oldref="360"><ahelp hid="HID_AAI_FUNC_AMORDEGRC">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155855" role="heading" level="3" l10n="U"
+                    oldref="361">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147427" role="code" l10n="U" oldref="362">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147125" role="paragraph" l10n="U" oldref="363">
+            <emph>Cost</emph> is the acquisition costs.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151074" role="paragraph" l10n="U" oldref="364">
+            <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="365">
+            <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156286" role="paragraph" l10n="U" oldref="366">
+            <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="367">
+            <emph>Period</emph> is the settlement period to be considered.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="368">
+            <emph>Rate</emph> is the rate of depreciation.</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+      </section>
+      <section id="amorlinc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153765"><bookmark_value>AMORLINC function</bookmark_value>
-<bookmark_value>depreciations;linear amortizations</bookmark_value>
+         <bookmark_value>depreciations;linear amortizations</bookmark_value>
 </bookmark><comment>mw added "depreciations;..."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORLINC" id="bm_id3153711" localize="false"/>
-<paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="2" l10n="U" oldref="369">AMORLINC</paragraph>
-<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="370"><ahelp hid="HID_AAI_FUNC_AMORLINC">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150044" xml-lang="en-US" level="3" l10n="U" oldref="371">Syntax</paragraph>
-<paragraph role="code" id="par_id3147363" xml-lang="en-US" l10n="U" oldref="372">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="373">
-<emph>Cost</emph> means the acquisition costs.</paragraph>
-<paragraph role="paragraph" id="par_id3163807" xml-lang="en-US" l10n="U" oldref="374">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="375">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
-<paragraph role="paragraph" id="par_id3149530" xml-lang="en-US" l10n="U" oldref="376">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
-<paragraph role="paragraph" id="par_id3148633" xml-lang="en-US" l10n="U" oldref="377">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
-<paragraph role="paragraph" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="378">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-</section>
-<section id="accrint">
+<paragraph xml-lang="en-US" id="hd_id3153765" role="heading" level="2" l10n="U"
+                    oldref="369">AMORLINC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159264" role="paragraph" l10n="U" oldref="370"><ahelp hid="HID_AAI_FUNC_AMORLINC">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150044" role="heading" level="3" l10n="U"
+                    oldref="371">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147363" role="code" l10n="U" oldref="372">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146920" role="paragraph" l10n="U" oldref="373">
+            <emph>Cost</emph> means the acquisition costs.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3163807" role="paragraph" l10n="U" oldref="374">
+            <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148488" role="paragraph" l10n="U" oldref="375">
+            <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149530" role="paragraph" l10n="U" oldref="376">
+            <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148633" role="paragraph" l10n="U" oldref="377">
+            <emph>Period</emph> is the settlement period to be considered.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="378">
+            <emph>Rate</emph> is the rate of depreciation.</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+      </section>
+      <section id="accrint">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145257"><bookmark_value>ACCRINT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINT" id="bm_id3149815" localize="false"/>
-<paragraph role="heading" id="hd_id3145257" xml-lang="en-US" level="2" l10n="U" oldref="335">ACCRINT</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145257" role="heading" level="2" l10n="U"
+                    oldref="335">ACCRINT</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151276"><bookmark_value>accrued interests;periodic payments</bookmark_value>
 </bookmark><comment>mw changed "accrued interests"</comment>
-<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="336"><ahelp hid="HID_AAI_FUNC_ACCRINT">Calculates the accrued interest of a security in the case of periodic payments.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="337">Syntax</paragraph>
-<paragraph role="code" id="par_id3159092" xml-lang="en-US" l10n="U" oldref="338">ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="339">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3155376" xml-lang="en-US" l10n="U" oldref="340">
-<emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3166431" xml-lang="en-US" l10n="U" oldref="341">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="342">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
-<paragraph role="paragraph" id="par_id3156445" xml-lang="en-US" l10n="U" oldref="343">
-<emph>Par</emph> is the par value of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="344">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-<paragraph role="heading" id="hd_id3148699" xml-lang="en-US" level="3" l10n="U" oldref="345">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148599" xml-lang="en-US" l10n="U" oldref="346">A security is issued on 2.28.2001. First interest is set for 8.31.2001. The settlement date is 5.1.2001. The Rate is 0.1 or 10% and Par is 1000 currency units. Interest is paid half-yearly (frequency is 2). The basis is the US method (0). How much interest has accrued?</paragraph>
-<paragraph role="paragraph" id="par_id3148840" xml-lang="en-US" l10n="U" oldref="347">
-<item type="input">=ACCRINT("2.28.2001";"8.31.2001";"5.1.2001";0.1;1000;2;0)</item> returns 16.94444.</paragraph>
-</section>
-<section id="accrintm">
+<paragraph xml-lang="en-US" id="par_id3151276" role="paragraph" l10n="U" oldref="336"><ahelp hid="HID_AAI_FUNC_ACCRINT">Calculates the accrued interest of a security in the case of periodic payments.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="3" l10n="U"
+                    oldref="337">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159092" role="code" l10n="U" oldref="338">ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150519" role="paragraph" l10n="U" oldref="339">
+            <emph>Issue</emph> is the issue date of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155376" role="paragraph" l10n="U" oldref="340">
+            <emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166431" role="paragraph" l10n="U" oldref="341">
+            <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="342">
+            <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156445" role="paragraph" l10n="U" oldref="343">
+            <emph>Par</emph> is the par value of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149406" role="paragraph" l10n="U" oldref="344">
+            <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+         <paragraph xml-lang="en-US" id="hd_id3148699" role="heading" level="3" l10n="U"
+                    oldref="345">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148599" role="paragraph" l10n="CHG" oldref="346">A security is issued on 2001-02-28. First interest is set for 2001-08-31. The settlement date is 2001-05-01. The Rate is 0.1 or 10% and Par is 1000 currency units. Interest is paid half-yearly (frequency is 2). The basis is the US method (0). How much interest has accrued?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148840" role="paragraph" l10n="CHG" oldref="347">
+            <item type="input">=ACCRINT("2001-02-28";"2001-08-31";"2001-05-01";0.1;1000;2;0)</item> returns 16.94444.</paragraph>
+      </section>
+      <section id="accrintm">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151240"><bookmark_value>ACCRINTM function</bookmark_value>
-<bookmark_value>accrued interests;one-off payments</bookmark_value>
+         <bookmark_value>accrued interests;one-off payments</bookmark_value>
 </bookmark><comment>mw added one index entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINTM" id="bm_id3148866" localize="false"/>
-<paragraph role="heading" id="hd_id3151240" xml-lang="en-US" level="2" l10n="U" oldref="348">ACCRINTM</paragraph>
-<paragraph role="paragraph" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="349"><ahelp hid="HID_AAI_FUNC_ACCRINTM">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159097" xml-lang="en-US" level="3" l10n="U" oldref="350">Syntax</paragraph>
-<paragraph role="code" id="par_id3147074" xml-lang="en-US" l10n="U" oldref="351">ACCRINTM(Issue; Settlement; Rate; Par; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3144773" xml-lang="en-US" l10n="U" oldref="352">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3154956" xml-lang="en-US" l10n="CHG" oldref="353">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3153972" xml-lang="en-US" l10n="U" oldref="354">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
-<paragraph role="paragraph" id="par_id3159204" xml-lang="en-US" l10n="U" oldref="355">
-<emph>Par</emph> is the par value of the security.</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-<paragraph role="heading" id="hd_id3155384" xml-lang="en-US" level="3" l10n="U" oldref="356">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154541" xml-lang="en-US" l10n="U" oldref="357">A security is issued on 4.1.2001. The maturity date is set for 6.15.2001. The Rate is 0.1 or 10% and Par is 1000 currency units. The basis of the daily/annual calculation is the daily balance (3). How much interest has accrued?</paragraph>
-<paragraph role="paragraph" id="par_id3149128" xml-lang="en-US" l10n="U" oldref="358">
-<item type="input">=ACCRINTM("4.1.2001";"6.15.2001";0.1;1000;3)</item> returns 20.54795.</paragraph>
-</section>
-<section id="received">
+<paragraph xml-lang="en-US" id="hd_id3151240" role="heading" level="2" l10n="U"
+                    oldref="348">ACCRINTM</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157981" role="paragraph" l10n="U" oldref="349"><ahelp hid="HID_AAI_FUNC_ACCRINTM">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159097" role="heading" level="3" l10n="U"
+                    oldref="350">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147074" role="code" l10n="U" oldref="351">ACCRINTM(Issue; Settlement; Rate; Par; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144773" role="paragraph" l10n="U" oldref="352">
+            <emph>Issue</emph> is the issue date of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154956" role="paragraph" l10n="CHG" oldref="353">
+            <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153972" role="paragraph" l10n="U" oldref="354">
+            <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159204" role="paragraph" l10n="U" oldref="355">
+            <emph>Par</emph> is the par value of the security.</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+         <paragraph xml-lang="en-US" id="hd_id3155384" role="heading" level="3" l10n="U"
+                    oldref="356">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154541" role="paragraph" l10n="CHG" oldref="357">A security is issued on 2001-04-01. The maturity date is set for 2001-06-15. The Rate is 0.1 or 10% and Par is 1000 currency units. The basis of the daily/annual calculation is the daily balance (3). How much interest has accrued?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149128" role="paragraph" l10n="CHG" oldref="358">
+            <item type="input">=ACCRINTM("2001-04-01";"2001-06-15";0.1;1000;3)</item> returns 20.54795.</paragraph>
+      </section>
+      <section id="received">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145753"><bookmark_value>RECEIVED function</bookmark_value>
-<bookmark_value>amount received for fixed-interest securities</bookmark_value>
+         <bookmark_value>amount received for fixed-interest securities</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_RECEIVED" id="bm_id3143218" localize="false"/>
-<paragraph role="heading" id="hd_id3145753" xml-lang="en-US" level="2" l10n="U" oldref="390">RECEIVED</paragraph>
-<paragraph role="paragraph" id="par_id3150051" xml-lang="en-US" l10n="U" oldref="391"><ahelp hid="HID_AAI_FUNC_RECEIVED">Calculates the amount received that is paid for a fixed-interest security at a given point in time.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149385" xml-lang="en-US" level="3" l10n="U" oldref="392">Syntax</paragraph>
-<paragraph role="code" id="par_id3145362" xml-lang="en-US" l10n="U" oldref="393">RECEIVED("Settlement"; "Maturity"; Investment; Discount; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3154654" xml-lang="en-US" l10n="U" oldref="394">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3153011" xml-lang="en-US" l10n="U" oldref="395">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
-<paragraph role="paragraph" id="par_id3155525" xml-lang="en-US" l10n="U" oldref="396">
-<emph>Investment</emph> is the purchase sum.</paragraph>
-<paragraph role="paragraph" id="par_id3155760" xml-lang="en-US" l10n="U" oldref="397">
-<emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-<paragraph role="heading" id="hd_id3154710" xml-lang="en-US" level="3" l10n="U" oldref="398">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="U" oldref="399">Settlement date: February 15 1999, maturity date: May 15 1999, investment sum: 1000 currency units, discount: 5.75 per cent, basis: Daily balance/360 = 2.</paragraph>
-<paragraph role="paragraph" id="par_id3146108" xml-lang="en-US" l10n="U" oldref="400">The amount received on the maturity date is calculated as follows:</paragraph>
-<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="401">
-<item type="input">=RECEIVED("2.15.99";"5.15.99";1000;0.0575;2)</item> returns 1014.420266.</paragraph>
-</section>
-<section id="pv">
+<paragraph xml-lang="en-US" id="hd_id3145753" role="heading" level="2" l10n="U"
+                    oldref="390">RECEIVED</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="391"><ahelp hid="HID_AAI_FUNC_RECEIVED">Calculates the amount received that is paid for a fixed-interest security at a given point in time.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149385" role="heading" level="3" l10n="U"
+                    oldref="392">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145362" role="code" l10n="U" oldref="393">RECEIVED("Settlement"; "Maturity"; Investment; Discount; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154654" role="paragraph" l10n="U" oldref="394">
+            <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153011" role="paragraph" l10n="U" oldref="395">
+            <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="396">
+            <emph>Investment</emph> is the purchase sum.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155760" role="paragraph" l10n="U" oldref="397">
+            <emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+         <paragraph xml-lang="en-US" id="hd_id3154710" role="heading" level="3" l10n="U"
+                    oldref="398">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154735" role="paragraph" l10n="U" oldref="399">Settlement date: February 15 1999, maturity date: May 15 1999, investment sum: 1000 currency units, discount: 5.75 per cent, basis: Daily balance/360 = 2.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146108" role="paragraph" l10n="U" oldref="400">The amount received on the maturity date is calculated as follows:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147246" role="paragraph" l10n="CHG" oldref="401">
+            <item type="input">=RECEIVED("1999-02-15";"1999-05-15";1000;0.0575;2)</item> returns 1014.420266.</paragraph>
+      </section>
+      <section id="pv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147556"><bookmark_value>PV function</bookmark_value>
-<bookmark_value>present values</bookmark_value>
-<bookmark_value>calculating; present values</bookmark_value>
+         <bookmark_value>present values</bookmark_value>
+         <bookmark_value>calculating; present values</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BW" id="bm_id3153072" localize="false"/>
-<paragraph role="heading" id="hd_id3147556" xml-lang="en-US" level="2" l10n="U" oldref="3">PV</paragraph>
-<paragraph role="paragraph" id="par_id3153301" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_BW">Returns the present value of an investment resulting from a series of regular payments.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3146099" xml-lang="en-US" l10n="U" oldref="5">Use this function to calculate the amount of money needed to be invested at a fixed rate today, to receive a specific amount, an annuity, over a specified number of periods. You can also determine how much money is to remain after the elapse of the period. Specify as well if the amount is to be paid out at the beginning or at the end of each period.</paragraph>
-<paragraph role="paragraph" id="par_id3153334" xml-lang="en-US" l10n="U" oldref="6">Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type="productname">%PRODUCTNAME</item> Calc with automatically calculate the correct factor.</paragraph>
-<paragraph role="heading" id="hd_id3147407" xml-lang="en-US" level="3" l10n="U" oldref="7">Syntax</paragraph>
-<paragraph role="code" id="par_id3150395" xml-lang="en-US" l10n="U" oldref="8">PV(Rate; NPer; Pmt; FV; Type)</paragraph>
-<paragraph role="paragraph" id="par_id3151341" xml-lang="en-US" l10n="U" oldref="9">
-<emph>Rate</emph> defines the interest rate per period.</paragraph>
-<paragraph role="paragraph" id="par_id3153023" xml-lang="en-US" l10n="U" oldref="10">
-<emph>NPer</emph> is the total number of periods (payment period).</paragraph>
-<paragraph role="paragraph" id="par_id3146323" xml-lang="en-US" l10n="U" oldref="11">
-<emph>Pmt</emph> is the regular payment made per period.</paragraph>
-<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="12">
-<emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
-<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="13">
-<emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
-<paragraph role="paragraph" id="par_idN10B13" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3150037" xml-lang="en-US" level="3" l10n="U" oldref="14">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145225" xml-lang="en-US" l10n="U" oldref="15">What is the present value of an investment, if 500 currency units are paid out monthly and the annual interest rate is 8%? The payment period is 48 months and 20,000 currency units are to remain at the end of the payment period.</paragraph>
-<paragraph role="paragraph" id="par_id3155907" xml-lang="en-US" l10n="U" oldref="16">
-<item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="17">If you enter references instead of these values into the formula, you can calculate any number of "If-then" scenarios. Please note: references to constants must be defined as absolute references. Examples of this type of application are found under the depreciation functions.</paragraph>
-</section>
-<section id="syd">
+<paragraph xml-lang="en-US" id="hd_id3147556" role="heading" level="2" l10n="U" oldref="3">PV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153301" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_FUNC_BW">Returns the present value of an investment resulting from a series of regular payments.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146099" role="paragraph" l10n="U" oldref="5">Use this function to calculate the amount of money needed to be invested at a fixed rate today, to receive a specific amount, an annuity, over a specified number of periods. You can also determine how much money is to remain after the elapse of the period. Specify as well if the amount is to be paid out at the beginning or at the end of each period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153334" role="paragraph" l10n="U" oldref="6">Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type="productname">%PRODUCTNAME</item> Calc with automatically calculate the correct factor.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="3" l10n="U" oldref="7">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150395" role="code" l10n="U" oldref="8">PV(Rate; NPer; Pmt; FV; Type)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151341" role="paragraph" l10n="U" oldref="9">
+            <emph>Rate</emph> defines the interest rate per period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153023" role="paragraph" l10n="U" oldref="10">
+            <emph>NPer</emph> is the total number of periods (payment period).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146323" role="paragraph" l10n="U" oldref="11">
+            <emph>Pmt</emph> is the regular payment made per period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="12">
+            <emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146883" role="paragraph" l10n="U" oldref="13">
+            <emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10B13" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150037" role="heading" level="3" l10n="U"
+                    oldref="14">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145225" role="paragraph" l10n="U" oldref="15">What is the present value of an investment, if 500 currency units are paid out monthly and the annual interest rate is 8%? The payment period is 48 months and 20,000 currency units are to remain at the end of the payment period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155907" role="paragraph" l10n="U" oldref="16">
+            <item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149150" role="paragraph" l10n="U" oldref="17">If you enter references instead of these values into the formula, you can calculate any number of "If-then" scenarios. Please note: references to constants must be defined as absolute references. Examples of this type of application are found under the depreciation functions.</paragraph>
+      </section>
+      <section id="syd">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152978"><bookmark_value>calculating; depreciations</bookmark_value>
-<bookmark_value>SYD function</bookmark_value>
-<bookmark_value>depreciations; arithmetic declining</bookmark_value>
-<bookmark_value>arithmetic declining depreciations</bookmark_value>
+         <bookmark_value>SYD function</bookmark_value>
+         <bookmark_value>depreciations; arithmetic declining</bookmark_value>
+         <bookmark_value>arithmetic declining depreciations</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DIA" id="bm_id3157905" localize="false"/>
-<paragraph role="heading" id="hd_id3152978" xml-lang="en-US" level="2" l10n="U" oldref="19">SYD</paragraph>
-<paragraph role="paragraph" id="par_id3148732" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_DIA">Returns the arithmetic-declining depreciation rate.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149886" xml-lang="en-US" l10n="U" oldref="21">Use this function to calculate the depreciation amount for one period of the total depreciation span of an object. Arithmetic declining depreciation reduces the depreciation amount from period to period by a fixed sum.</paragraph>
-<paragraph role="heading" id="hd_id3149431" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
-<paragraph role="code" id="par_id3150483" xml-lang="en-US" l10n="U" oldref="23">SYD(Cost; Salvage; Life; Period)</paragraph>
-<paragraph role="paragraph" id="par_id3146879" xml-lang="en-US" l10n="U" oldref="24">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
-<paragraph role="paragraph" id="par_id3147423" xml-lang="en-US" l10n="U" oldref="25">
-<emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
-<paragraph role="paragraph" id="par_id3151229" xml-lang="en-US" l10n="U" oldref="26">
-<emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
-<paragraph role="paragraph" id="par_id3147473" xml-lang="en-US" l10n="U" oldref="27">
-<emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3148434" xml-lang="en-US" level="3" l10n="U" oldref="28">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="29">A video system initially costing 50,000 currency units is to be depreciated annually for the next 5 years. The salvage value is to be 10,000 currency units. You want to calculate depreciation for the first year.</paragraph>
-<paragraph role="paragraph" id="par_id3150900" xml-lang="en-US" l10n="U" oldref="30">
-<item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
-<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="U" oldref="31">To have an overview of depreciation rates per period, it is best to define a depreciation table. By entering the different depreciation formulas available in <item type="productname">%PRODUCTNAME</item> Calc next to each other, you can see which depreciation form is the most appropriate. Enter the table as follows:</paragraph>
-<table id="tbl_id3149189">
-<tablerow>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155258" xml-lang="en-US" l10n="U" oldref="32">
-<emph>A</emph>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="33">
-<emph>B</emph>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="34">
-<emph>C</emph>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="35">
-<emph>D</emph>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3145123" xml-lang="en-US" l10n="U" oldref="36">
-<emph>E</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149504" xml-lang="en-US" l10n="U" oldref="37">1</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="38">
-<item type="input">Initial Cost</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159083" xml-lang="en-US" l10n="U" oldref="39">
-<item type="input">Salvage Value</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150002" xml-lang="en-US" l10n="U" oldref="40">
-<item type="input">Useful Life</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153006" xml-lang="en-US" l10n="U" oldref="41">
-<item type="input">Time Period</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="42">
-<item type="input">Deprec. SYD</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150336" xml-lang="en-US" l10n="U" oldref="43">2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155926" xml-lang="en-US" l10n="U" oldref="44">
-<item type="input">50,000 currency units</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153736" xml-lang="en-US" l10n="U" oldref="45">
-<item type="input">10,000 currency units</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150131" xml-lang="en-US" l10n="U" oldref="46">
-<item type="input">5</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148766" xml-lang="en-US" l10n="U" oldref="47">
-<item type="input">1</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159136" xml-lang="en-US" l10n="U" oldref="48">
-<item type="input">13,333.33 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151018" xml-lang="en-US" l10n="U" oldref="49">3</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="50">
-<item type="input">2</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146907" xml-lang="en-US" l10n="U" oldref="51">
-<item type="input">10,666.67 </item>
-<item type="input">currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147356" xml-lang="en-US" l10n="U" oldref="52">4</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="53">
-<item type="input">3</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145628" xml-lang="en-US" l10n="U" oldref="54">
-<item type="input">8,000.00 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149004" xml-lang="en-US" l10n="U" oldref="55">5</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="56">
-<item type="input">4</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154634" xml-lang="en-US" l10n="U" oldref="57">
-<item type="input">5,333.33 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147537" xml-lang="en-US" l10n="U" oldref="58">6</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155085" xml-lang="en-US" l10n="U" oldref="59">
-<item type="input">5</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="60">
-<item type="input">2,666.67 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154866" xml-lang="en-US" l10n="U" oldref="61">7</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155404" xml-lang="en-US" l10n="U" oldref="62">
-<item type="input">6</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148431" xml-lang="en-US" l10n="U" oldref="63">
-<item type="input">0.00 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156261" xml-lang="en-US" l10n="U" oldref="64">8</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3083286" xml-lang="en-US" l10n="U" oldref="65">
-<item type="input">7</item>
-</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="67">9</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154815" xml-lang="en-US" l10n="U" oldref="68">
-<item type="input">8</item>
-</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145082" xml-lang="en-US" l10n="U" oldref="70">10</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156307" xml-lang="en-US" l10n="U" oldref="71">
-<item type="input">9</item>
-</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147564" xml-lang="en-US" l10n="U" oldref="73">11</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="74">
-<item type="input">10</item>
-</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150880" xml-lang="en-US" l10n="U" oldref="76">12</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145208" xml-lang="en-US" l10n="U" oldref="77">13</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="78">
-<item type="input">&gt;0</item>
-</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153625" xml-lang="en-US" l10n="U" oldref="79">
-<item type="input">Total</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151297" xml-lang="en-US" l10n="U" oldref="80">
-<item type="input">40,000.00 currency units</item>
-</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3152978" role="heading" level="2" l10n="U"
+                    oldref="19">SYD</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148732" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FUNC_DIA">Returns the arithmetic-declining depreciation rate.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149886" role="paragraph" l10n="U" oldref="21">Use this function to calculate the depreciation amount for one period of the total depreciation span of an object. Arithmetic declining depreciation reduces the depreciation amount from period to period by a fixed sum.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149431" role="heading" level="3" l10n="U"
+                    oldref="22">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150483" role="code" l10n="U" oldref="23">SYD(Cost; Salvage; Life; Period)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146879" role="paragraph" l10n="U" oldref="24">
+            <emph>Cost</emph> is the initial cost of an asset.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147423" role="paragraph" l10n="U" oldref="25">
+            <emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151229" role="paragraph" l10n="U" oldref="26">
+            <emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147473" role="paragraph" l10n="U" oldref="27">
+            <emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148434" role="heading" level="3" l10n="U"
+                    oldref="28">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="29">A video system initially costing 50,000 currency units is to be depreciated annually for the next 5 years. The salvage value is to be 10,000 currency units. You want to calculate depreciation for the first year.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150900" role="paragraph" l10n="U" oldref="30">
+            <item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146142" role="paragraph" l10n="U" oldref="31">To have an overview of depreciation rates per period, it is best to define a depreciation table. By entering the different depreciation formulas available in <item type="productname">%PRODUCTNAME</item> Calc next to each other, you can see which depreciation form is the most appropriate. Enter the table as follows:</paragraph>
+         <table id="tbl_id3149189">
+            <tablerow>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155258" role="tablehead" l10n="U" oldref="32">
+                     <emph>A</emph>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154558" role="tablehead" l10n="U" oldref="33">
+                     <emph>B</emph>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152372" role="tablehead" l10n="U" oldref="34">
+                     <emph>C</emph>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149949" role="tablehead" l10n="U" oldref="35">
+                     <emph>D</emph>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145123" role="tablehead" l10n="U" oldref="36">
+                     <emph>E</emph>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149504" role="tablecontent" l10n="U" oldref="37">1</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153778" role="tablecontent" l10n="U" oldref="38">
+                     <item type="input">Initial Cost</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159083" role="tablecontent" l10n="U" oldref="39">
+                     <item type="input">Salvage Value</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150002" role="tablecontent" l10n="U" oldref="40">
+                     <item type="input">Useful Life</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153006" role="tablecontent" l10n="U" oldref="41">
+                     <item type="input">Time Period</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154505" role="tablecontent" l10n="U" oldref="42">
+                     <item type="input">Deprec. SYD</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150336" role="tablecontent" l10n="U" oldref="43">2</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155926" role="tablecontent" l10n="U" oldref="44">
+                     <item type="input">50,000 currency units</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153736" role="tablecontent" l10n="U" oldref="45">
+                     <item type="input">10,000 currency units</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150131" role="tablecontent" l10n="U" oldref="46">
+                     <item type="input">5</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148766" role="tablecontent" l10n="U" oldref="47">
+                     <item type="input">1</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159136" role="tablecontent" l10n="U" oldref="48">
+                     <item type="input">13,333.33 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151018" role="tablecontent" l10n="U" oldref="49">3</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148397" role="tablecontent" l10n="U" oldref="50">
+                     <item type="input">2</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146907" role="tablecontent" l10n="U" oldref="51">
+                     <item type="input">10,666.67 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147356" role="tablecontent" l10n="U" oldref="52">4</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150267" role="tablecontent" l10n="U" oldref="53">
+                     <item type="input">3</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145628" role="tablecontent" l10n="U" oldref="54">
+                     <item type="input">8,000.00 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149004" role="tablecontent" l10n="U" oldref="55">5</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153545" role="tablecontent" l10n="U" oldref="56">
+                     <item type="input">4</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154634" role="tablecontent" l10n="U" oldref="57">
+                     <item type="input">5,333.33 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147537" role="tablecontent" l10n="U" oldref="58">6</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155085" role="tablecontent" l10n="U" oldref="59">
+                     <item type="input">5</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3158413" role="tablecontent" l10n="U" oldref="60">
+                     <item type="input">2,666.67 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154866" role="tablecontent" l10n="U" oldref="61">7</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155404" role="tablecontent" l10n="U" oldref="62">
+                     <item type="input">6</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148431" role="tablecontent" l10n="U" oldref="63">
+                     <item type="input">0.00 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156261" role="tablecontent" l10n="U" oldref="64">8</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3083286" role="tablecontent" l10n="U" oldref="65">
+                     <item type="input">7</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3083443" role="tablecontent" l10n="U" oldref="67">9</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154815" role="tablecontent" l10n="U" oldref="68">
+                     <item type="input">8</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145082" role="tablecontent" l10n="U" oldref="70">10</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156307" role="tablecontent" l10n="U" oldref="71">
+                     <item type="input">9</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147564" role="tablecontent" l10n="U" oldref="73">11</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146856" role="tablecontent" l10n="U" oldref="74">
+                     <item type="input">10</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150880" role="tablecontent" l10n="U" oldref="76">12</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145208" role="tablecontent" l10n="U" oldref="77">13</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156113" role="tablecontent" l10n="U" oldref="78">
+                     <item type="input">&gt;0</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+</tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153625" role="tablecontent" l10n="U" oldref="79">
+                     <item type="input">Total</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151297" role="tablecontent" l10n="U" oldref="80">
+                     <item type="input">40,000.00 currency units</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-<paragraph role="paragraph" id="par_id3149979" xml-lang="en-US" l10n="U" oldref="81">The formula in E2 is as follows:</paragraph>
-<paragraph role="paragraph" id="par_id3155849" xml-lang="en-US" l10n="U" oldref="82">
-<item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
-</paragraph>
-<paragraph role="paragraph" id="par_id3156124" xml-lang="en-US" l10n="U" oldref="83">This formula is duplicated in column E down to E11 (select E2, then drag down the lower right corner with the mouse).</paragraph>
-<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="U" oldref="84">Cell E13 contains the formula used to check the total of the depreciation amounts. It uses the SUMIF function as the negative values in E8:E11 must not be considered. The condition &gt;0 is contained in cell A13. The formula in E13 is as follows:</paragraph>
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="85">
-<item type="input">=SUMIF(E2:E11;A13)</item>
-</paragraph>
-<paragraph role="paragraph" id="par_id3155998" xml-lang="en-US" l10n="U" oldref="86">Now view the depreciation for a 10 year period, or at a salvage value of 1 currency unit, or enter a different initial cost, and so on.</paragraph>
-</section>
-<section id="disc">
+         <paragraph xml-lang="en-US" id="par_id3149979" role="paragraph" l10n="U" oldref="81">The formula in E2 is as follows:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155849" role="paragraph" l10n="U" oldref="82">
+            <item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156124" role="paragraph" l10n="U" oldref="83">This formula is duplicated in column E down to E11 (select E2, then drag down the lower right corner with the mouse).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147270" role="paragraph" l10n="U" oldref="84">Cell E13 contains the formula used to check the total of the depreciation amounts. It uses the SUMIF function as the negative values in E8:E11 must not be considered. The condition &gt;0 is contained in cell A13. The formula in E13 is as follows:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="U" oldref="85">
+            <item type="input">=SUMIF(E2:E11;A13)</item>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155998" role="paragraph" l10n="U" oldref="86">Now view the depreciation for a 10 year period, or at a salvage value of 1 currency unit, or enter a different initial cost, and so on.</paragraph>
+      </section>
+      <section id="disc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155104"><bookmark_value>DISC function</bookmark_value>
-<bookmark_value>allowances</bookmark_value>
-<bookmark_value>discounts</bookmark_value>
+         <bookmark_value>allowances</bookmark_value>
+         <bookmark_value>discounts</bookmark_value>
 </bookmark><comment>mw added "discounts" and "allowances"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DISC" id="bm_id3149290" localize="false"/>
-<paragraph role="heading" id="hd_id3155104" xml-lang="en-US" level="2" l10n="U" oldref="379">DISC</paragraph>
-<paragraph role="paragraph" id="par_id3153891" xml-lang="en-US" l10n="U" oldref="380"><ahelp hid="HID_AAI_FUNC_DISC">Calculates the allowance (discount) of a security as a percentage.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153982" xml-lang="en-US" level="3" l10n="U" oldref="381">Syntax</paragraph>
-<paragraph role="code" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="382">DISC("Settlement"; "Maturity"; Price; Redemption; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3156014" xml-lang="en-US" l10n="U" oldref="383">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="384">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
-<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="385">
-<emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
-<paragraph role="paragraph" id="par_id3147253" xml-lang="en-US" l10n="U" oldref="386">
-<emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-<paragraph role="heading" id="hd_id3151174" xml-lang="en-US" level="3" l10n="U" oldref="387">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155902" xml-lang="en-US" l10n="U" oldref="388">A security is purchased on 1.25.2001; the maturity date is 11.15.2001. The price (purchase price) is 97, the redemption value is 100. Using daily balance calculation (basis 3) how high is the settlement (discount)?</paragraph>
-<paragraph role="paragraph" id="par_id3152797" xml-lang="en-US" l10n="U" oldref="389">
-<item type="input">=DISC("1.25.2001";"11.15.2001";97;100;3)</item> returns 0.03840 or 3.84 per cent.</paragraph>
-</section>
-<section id="duration_add">
+<paragraph xml-lang="en-US" id="hd_id3155104" role="heading" level="2" l10n="U"
+                    oldref="379">DISC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153891" role="paragraph" l10n="U" oldref="380"><ahelp hid="HID_AAI_FUNC_DISC">Calculates the allowance (discount) of a security as a percentage.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153982" role="heading" level="3" l10n="U"
+                    oldref="381">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149756" role="code" l10n="U" oldref="382">DISC("Settlement"; "Maturity"; Price; Redemption; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156014" role="paragraph" l10n="U" oldref="383">
+            <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="384">
+            <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159180" role="paragraph" l10n="U" oldref="385">
+            <emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147253" role="paragraph" l10n="U" oldref="386">
+            <emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+         <paragraph xml-lang="en-US" id="hd_id3151174" role="heading" level="3" l10n="U"
+                    oldref="387">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155902" role="paragraph" l10n="CHG" oldref="388">A security is purchased on 2001-01-25; the maturity date is 2001-11-15. The price (purchase price) is 97, the redemption value is 100. Using daily balance calculation (basis 3) how high is the settlement (discount)?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152797" role="paragraph" l10n="CHG" oldref="389">
+            <item type="input">=DISC("2001-01-25";"2001-11-15";97;100;3)</item> returns about 0.0372 or 3.72 per cent.</paragraph>
+      </section>
+      <section id="duration_add">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154695"><bookmark_value>DURATION_ADD function</bookmark_value>
-<bookmark_value>Microsoft Excel functions</bookmark_value>
-<bookmark_value>durations;fixed interest securities</bookmark_value>
+         <bookmark_value>Microsoft Excel functions</bookmark_value>
+         <bookmark_value>durations;fixed interest securities</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DURATION" id="bm_id3159344" localize="false"/>
-<paragraph role="heading" id="hd_id3154695" xml-lang="en-US" level="2" l10n="U" oldref="402">DURATION_ADD</paragraph>
-<paragraph role="paragraph" id="par_id3145768" xml-lang="en-US" l10n="U" oldref="403"><ahelp hid="HID_AAI_FUNC_DURATION">Calculates the duration of a fixed interest security in years.</ahelp></paragraph>
-<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-<paragraph role="heading" id="hd_id3153904" xml-lang="en-US" level="3" l10n="U" oldref="404">Syntax</paragraph>
-<paragraph role="code" id="par_id3153373" xml-lang="en-US" l10n="U" oldref="405">DURATION_ADD("Settlement"; "Maturity"; Coupon; Yield; Frequency; Basis)</paragraph>
-<paragraph role="paragraph" id="par_id3155397" xml-lang="en-US" l10n="U" oldref="406">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3148558" xml-lang="en-US" l10n="U" oldref="407">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
-<paragraph role="paragraph" id="par_id3153096" xml-lang="en-US" l10n="U" oldref="408">
-<emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
-<paragraph role="paragraph" id="par_id3154594" xml-lang="en-US" l10n="U" oldref="409">
-<emph>Yield</emph> is the annual yield of the security.</paragraph>
-<paragraph role="paragraph" id="par_id3149906" xml-lang="en-US" l10n="U" oldref="410">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
-<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
-<paragraph role="heading" id="hd_id3146995" xml-lang="en-US" level="3" l10n="U" oldref="411">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148834" xml-lang="en-US" l10n="U" oldref="412">A security is purchased on 1.1.2001; the maturity date is 1.1.2006. The Coupon rate of interest is 8%. The yield is 9.0%. Interest is paid half-yearly (frequency is 2). Using daily balance interest calculation (basis 3) how long is the duration?</paragraph>
-<paragraph role="paragraph" id="par_id3154902" xml-lang="en-US" l10n="U" oldref="413">
-<item type="input">=DURATION_ADD("1.1.2001";"1.1.2006";0.08;0.09;2;3)</item>
-</paragraph>
-</section>
-<section id="effective">
+<paragraph xml-lang="en-US" id="hd_id3154695" role="heading" level="2" l10n="U"
+                    oldref="402">DURATION_ADD</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145768" role="paragraph" l10n="U" oldref="403"><ahelp hid="HID_AAI_FUNC_DURATION">Calculates the duration of a fixed interest security in years.</ahelp></paragraph>
+         <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
+         <paragraph xml-lang="en-US" id="hd_id3153904" role="heading" level="3" l10n="U"
+                    oldref="404">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153373" role="code" l10n="U" oldref="405">DURATION_ADD("Settlement"; "Maturity"; Coupon; Yield; Frequency; Basis)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155397" role="paragraph" l10n="U" oldref="406">
+            <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148558" role="paragraph" l10n="U" oldref="407">
+            <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153096" role="paragraph" l10n="U" oldref="408">
+            <emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154594" role="paragraph" l10n="U" oldref="409">
+            <emph>Yield</emph> is the annual yield of the security.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149906" role="paragraph" l10n="U" oldref="410">
+            <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+         <embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
+         <paragraph xml-lang="en-US" id="hd_id3146995" role="heading" level="3" l10n="U"
+                    oldref="411">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148834" role="paragraph" l10n="CHG" oldref="412">A security is purchased on 2001-01-01; the maturity date is 2006-01-01. The Coupon rate of interest is 8%. The yield is 9.0%. Interest is paid half-yearly (frequency is 2). Using daily balance interest calculation (basis 3) how long is the duration?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154902" role="paragraph" l10n="CHG" oldref="413">
+            <item type="input">=DURATION_ADD("2001-01-01";"2006-01-01";0.08;0.09;2;3)</item>
+         </paragraph>
+      </section>
+      <section id="effective">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159147"><bookmark_value>annual net interest rates</bookmark_value>
-<bookmark_value>calculating; annual net interest rates</bookmark_value>
-<bookmark_value>net annual interest rates</bookmark_value>
-<bookmark_value>EFFECTIVE function</bookmark_value>
+         <bookmark_value>calculating; annual net interest rates</bookmark_value>
+         <bookmark_value>net annual interest rates</bookmark_value>
+         <bookmark_value>EFFECTIVE function</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_EFFEKTIV" id="bm_id3154290" localize="false"/>
-<paragraph role="heading" id="hd_id3159147" xml-lang="en-US" level="2" l10n="U" oldref="88">EFFECTIVE</paragraph>
-<paragraph role="paragraph" id="par_id3154204" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_EFFEKTIV">Returns the net annual interest rate for a nominal interest rate.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3145417" xml-lang="en-US" l10n="U" oldref="90">Nominal interest refers to the amount of interest due at the end of a calculation period. Effective interest increases with the number of payments made. In other words, interest is often paid in installments (for example, monthly or quarterly) before the end of the calculation period.</paragraph>
-<paragraph role="heading" id="hd_id3150510" xml-lang="en-US" level="3" l10n="U" oldref="91">Syntax</paragraph>
-<paragraph role="code" id="par_id3148805" xml-lang="en-US" l10n="U" oldref="92">EFFECTIVE(Nom; P)</paragraph>
-<paragraph role="paragraph" id="par_id3149768" xml-lang="en-US" l10n="U" oldref="93">
-<emph>Nom</emph> is the nominal interest.</paragraph>
-<paragraph role="paragraph" id="par_id3149334" xml-lang="en-US" l10n="U" oldref="94">
-<emph>P</emph> is the number of interest payment periods per year.</paragraph>
-<paragraph role="heading" id="hd_id3154223" xml-lang="en-US" level="3" l10n="U" oldref="95">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144499" xml-lang="en-US" l10n="U" oldref="96">If the annual nominal interest rate is 9.75% and four interest calculation periods are defined, what is the actual interest rate (effective rate)?</paragraph>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="97">
-<item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
-</section>
-<section id="effect_add">
+<paragraph xml-lang="en-US" id="hd_id3159147" role="heading" level="2" l10n="U"
+                    oldref="88">EFFECTIVE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154204" role="paragraph" l10n="U" oldref="89"><ahelp hid="HID_FUNC_EFFEKTIV">Returns the net annual interest rate for a nominal interest rate.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145417" role="paragraph" l10n="U" oldref="90">Nominal interest refers to the amount of interest due at the end of a calculation period. Effective interest increases with the number of payments made. In other words, interest is often paid in installments (for example, monthly or quarterly) before the end of the calculation period.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150510" role="heading" level="3" l10n="U"
+                    oldref="91">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148805" role="code" l10n="U" oldref="92">EFFECTIVE(Nom; P)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149768" role="paragraph" l10n="U" oldref="93">
+            <emph>Nom</emph> is the nominal interest.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149334" role="paragraph" l10n="U" oldref="94">
+            <emph>P</emph> is the number of interest payment periods per year.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154223" role="heading" level="3" l10n="U"
+                    oldref="95">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144499" role="paragraph" l10n="U" oldref="96">If the annual nominal interest rate is 9.75% and four interest calculation periods are defined, what is the actual interest rate (effective rate)?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="U" oldref="97">
+            <item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
+      </section>
+      <section id="effect_add">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147241"><bookmark_value>effective interest rates</bookmark_value>
-<bookmark_value>EFFECT_ADD function</bookmark_value>
+         <bookmark_value>EFFECT_ADD function</bookmark_value>
 </bookmark><comment>mw changed "effective rates"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_EFFECT" id="bm_id3147515" localize="false"/>
-<paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="2" l10n="U" oldref="414">EFFECT_ADD</paragraph>
-<paragraph role="paragraph" id="par_id3147524" xml-lang="en-US" l10n="U" oldref="415"><ahelp hid="HID_AAI_FUNC_EFFECT">Calculates the effective annual rate of interest on the basis of the nominal interest rate and the number of interest payments per annum.</ahelp></paragraph>
-<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="3" l10n="U" oldref="416">Syntax</paragraph>
-<paragraph role="code" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="417">EFFECT_ADD(NominalRate; NPerY)</paragraph>
-<paragraph role="paragraph" id="par_id3148907" xml-lang="en-US" l10n="U" oldref="418">
-<emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
-<paragraph role="paragraph" id="par_id3154274" xml-lang="en-US" l10n="U" oldref="419">
-<emph>NPerY </emph>is the number of interest payments per year.</paragraph>
-<paragraph role="heading" id="hd_id3149156" xml-lang="en-US" level="3" l10n="U" oldref="420">Example</paragraph>
-<paragraph role="paragraph" id="par_id3158426" xml-lang="en-US" l10n="U" oldref="421">What is the effective annual rate of interest for a 5.25% nominal rate and quarterly payment.</paragraph>
-<paragraph role="paragraph" id="par_id3148927" xml-lang="en-US" l10n="U" oldref="422">
-<item type="input">=EFFECT_ADD(0.0525;4)</item> returns 0.053543 or 5.3534%.</paragraph>
-</section>
-<section id="ddb">
+<paragraph xml-lang="en-US" id="hd_id3147241" role="heading" level="2" l10n="U"
+                    oldref="414">EFFECT_ADD</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147524" role="paragraph" l10n="U" oldref="415"><ahelp hid="HID_AAI_FUNC_EFFECT">Calculates the effective annual rate of interest on the basis of the nominal interest rate and the number of interest payments per annum.</ahelp></paragraph>
+         <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
+         <paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="3" l10n="U"
+                    oldref="416">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155118" role="code" l10n="U" oldref="417">EFFECT_ADD(NominalRate; NPerY)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148907" role="paragraph" l10n="U" oldref="418">
+            <emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154274" role="paragraph" l10n="U" oldref="419">
+            <emph>NPerY </emph>is the number of interest payments per year.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149156" role="heading" level="3" l10n="U"
+                    oldref="420">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158426" role="paragraph" l10n="U" oldref="421">What is the effective annual rate of interest for a 5.25% nominal rate and quarterly payment.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148927" role="paragraph" l10n="U" oldref="422">
+            <item type="input">=EFFECT_ADD(0.0525;4)</item> returns 0.053543 or 5.3543%.</paragraph>
+      </section>
+      <section id="ddb">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149998"><bookmark_value>calculating; arithmetic-degressive depreciations</bookmark_value>
-<bookmark_value>arithmetic-degressive depreciations</bookmark_value>
-<bookmark_value>depreciations;arithmetic-degressive</bookmark_value>
-<bookmark_value>DDB function</bookmark_value>
+         <bookmark_value>arithmetic-degressive depreciations</bookmark_value>
+         <bookmark_value>depreciations;arithmetic-degressive</bookmark_value>
+         <bookmark_value>DDB function</bookmark_value>
 </bookmark><comment>mw corrected two typos and added "depreciations;..."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA" id="bm_id3149176" localize="false"/>
-<paragraph role="heading" id="hd_id3149998" xml-lang="en-US" level="2" l10n="U" oldref="99">DDB</paragraph>
-<paragraph role="paragraph" id="par_id3159190" xml-lang="en-US" l10n="U" oldref="100"><ahelp hid="HID_FUNC_GDA">Returns the depreciation of an asset for a specified period using the arithmetic-declining method.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="101">Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type.</paragraph>
-<paragraph role="heading" id="hd_id3156038" xml-lang="en-US" level="3" l10n="U" oldref="102">Syntax</paragraph>
-<paragraph role="code" id="par_id3166452" xml-lang="en-US" l10n="U" oldref="103">DDB(Cost; Salvage; Life; Period; Factor)</paragraph>
-<paragraph role="paragraph" id="par_id3153237" xml-lang="en-US" l10n="U" oldref="104">
-<emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
-<paragraph role="paragraph" id="par_id3149787" xml-lang="en-US" l10n="U" oldref="105">
-<emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
-<paragraph role="paragraph" id="par_id3152945" xml-lang="en-US" l10n="U" oldref="106">
-<emph>Life</emph> is the number of periods defining how long the asset is to be used.</paragraph>
-<paragraph role="paragraph" id="par_id3149736" xml-lang="en-US" l10n="U" oldref="107">
-<emph>Period</emph> defines the length of the period. The length must be entered in the same time unit as life.</paragraph>
-<paragraph role="paragraph" id="par_id3150243" xml-lang="en-US" l10n="U" oldref="108">
-<emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
-<paragraph role="heading" id="hd_id3159274" xml-lang="en-US" level="3" l10n="U" oldref="109">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152882" xml-lang="en-US" l10n="U" oldref="110">A computer system with an initial cost of 75,000 currency units is to be depreciated monthly over 5 years. The value at the end of the depreciation is to be 1 currency unit. The factor is 2.</paragraph>
-<paragraph role="paragraph" id="par_id3154106" xml-lang="en-US" l10n="U" oldref="111">
-<item type="input">=DDB(75000;1;60;12;2) </item>= 1,721.81 currency units. Therefore, the double-declining depreciation during the first month after purchase is 1,721.81 currency units.</paragraph>
-</section>
-<section id="db">
+<paragraph xml-lang="en-US" id="hd_id3149998" role="heading" level="2" l10n="U"
+                    oldref="99">DDB</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159190" role="paragraph" l10n="U" oldref="100"><ahelp hid="HID_FUNC_GDA">Returns the depreciation of an asset for a specified period using the arithmetic-declining method.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="101">Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156038" role="heading" level="3" l10n="U"
+                    oldref="102">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166452" role="code" l10n="U" oldref="103">DDB(Cost; Salvage; Life; Period; Factor)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153237" role="paragraph" l10n="U" oldref="104">
+            <emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149787" role="paragraph" l10n="U" oldref="105">
+            <emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152945" role="paragraph" l10n="U" oldref="106">
+            <emph>Life</emph> is the number of periods (for example, years or months) defining how long the asset is to be used.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149736" role="paragraph" l10n="U" oldref="107">
+            <emph>Period</emph> states the period for which the value is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150243" role="paragraph" l10n="U" oldref="108">
+            <emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159274" role="heading" level="3" l10n="U"
+                    oldref="109">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152882" role="paragraph" l10n="U" oldref="110">A computer system with an initial cost of 75,000 currency units is to be depreciated monthly over 5 years. The value at the end of the depreciation is to be 1 currency unit. The factor is 2.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154106" role="paragraph" l10n="U" oldref="111">
+            <item type="input">=DDB(75000;1;60;12;2) </item>= 1,721.81 currency units. Therefore, the double-declining depreciation in the twelfth month after purchase is 1,721.81 currency units.</paragraph>
+      </section>
+      <section id="db">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149962"><bookmark_value>calculating; geometric-degressive depreciations</bookmark_value>
-<bookmark_value>geometric-degressive depreciations</bookmark_value>
-<bookmark_value>depreciations;geometric-degressive</bookmark_value>
-<bookmark_value>DB function</bookmark_value>
+         <bookmark_value>geometric-degressive depreciations</bookmark_value>
+         <bookmark_value>depreciations;geometric-degressive</bookmark_value>
+         <bookmark_value>DB function</bookmark_value>
 </bookmark><comment>mw added "depreciations;.."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA2" id="bm_id3149973" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="113">DB</paragraph>
-<paragraph role="paragraph" id="par_id3148989" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FUNC_GDA2">Returns the depreciation of an asset for a specified period using the double-declining balance method.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156213" xml-lang="en-US" l10n="U" oldref="115">This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost.</paragraph>
-<paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="116">Syntax</paragraph>
-<paragraph role="code" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="117">DB(Cost; Salvage; Life; Period; Month)</paragraph>
-<paragraph role="paragraph" id="par_id3148462" xml-lang="en-US" l10n="U" oldref="118">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
-<paragraph role="paragraph" id="par_id3148658" xml-lang="en-US" l10n="U" oldref="119">
-<emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
-<paragraph role="paragraph" id="par_id3145371" xml-lang="en-US" l10n="U" oldref="120">
-<emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
-<paragraph role="paragraph" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="121">
-<emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
-<paragraph role="paragraph" id="par_id3150829" xml-lang="en-US" l10n="U" oldref="122">
-<emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
-<paragraph role="heading" id="hd_id3151130" xml-lang="en-US" level="3" l10n="U" oldref="123">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156147" xml-lang="en-US" l10n="U" oldref="124">A computer system with an initial cost of 25,000 currency units is to be depreciated over a three year period. The salvage value is to be 1,000 currency units. One period is 30 days.</paragraph>
-<paragraph role="paragraph" id="par_id3149513" xml-lang="en-US" l10n="U" oldref="125">
-<item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
-<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="U" oldref="126">The fixed-declining depreciation of the computer system is 1,075.00 currency units.</paragraph>
-</section>
-<section id="irr">
+<paragraph xml-lang="en-US" id="hd_id3149962" role="heading" level="2" l10n="U"
+                    oldref="113">DB</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148989" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FUNC_GDA2">Returns the depreciation of an asset for a specified period using the double-declining balance method.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156213" role="paragraph" l10n="U" oldref="115">This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="3" l10n="U"
+                    oldref="116">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153349" role="code" l10n="U" oldref="117">DB(Cost; Salvage; Life; Period; Month)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148462" role="paragraph" l10n="U" oldref="118">
+            <emph>Cost</emph> is the initial cost of an asset.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148658" role="paragraph" l10n="U" oldref="119">
+            <emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145371" role="paragraph" l10n="U" oldref="120">
+            <emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154608" role="paragraph" l10n="U" oldref="121">
+            <emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150829" role="paragraph" l10n="U" oldref="122">
+            <emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151130" role="heading" level="3" l10n="U"
+                    oldref="123">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156147" role="paragraph" l10n="U" oldref="124">A computer system with an initial cost of 25,000 currency units is to be depreciated over a three year period. The salvage value is to be 1,000 currency units. One period is 30 days.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149513" role="paragraph" l10n="U" oldref="125">
+            <item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159242" role="paragraph" l10n="U" oldref="126">The fixed-declining depreciation of the computer system is 1,075.00 currency units.</paragraph>
+      </section>
+      <section id="irr">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153948"><bookmark_value>IRR function</bookmark_value>
-<bookmark_value>calculating;internal rates of return, regular payments</bookmark_value>
-<bookmark_value>internal rates of return;regular payments</bookmark_value>
+         <bookmark_value>calculating;internal rates of return, regular payments</bookmark_value>
+         <bookmark_value>internal rates of return;regular payments</bookmark_value>
 </bookmark><comment>mw changed "calculating;..." and "internal rates"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_IKV" id="bm_id3148419" localize="false"/>
-<paragraph role="heading" id="hd_id3153948" xml-lang="en-US" level="2" l10n="U" oldref="128">IRR</paragraph>
-<paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="129"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of return for an investment.</ahelp> The values represent cash flow values at regular intervals, at least one value must be negative (payments), and at least one value must be positive (income).</paragraph>
-<paragraph role="heading" id="hd_id3150599" xml-lang="en-US" level="3" l10n="U" oldref="130">Syntax</paragraph>
-<paragraph role="code" id="par_id3155427" xml-lang="en-US" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
-<paragraph role="paragraph" id="par_id3144758" xml-lang="en-US" l10n="U" oldref="132">
-<emph>Values</emph> represents an array containing the values.</paragraph>
-<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="133">
-<emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
-<paragraph role="heading" id="hd_id3151258" xml-lang="en-US" level="3" l10n="U" oldref="134">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150630" xml-lang="en-US" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 80.24%.</paragraph>
-</section>
-<section id="ispmt">
+<paragraph xml-lang="en-US" id="hd_id3153948" role="heading" level="2" l10n="U"
+                    oldref="128">IRR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143282" role="paragraph" l10n="U" oldref="129"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of return for an investment.</ahelp> The values represent cash flow values at regular intervals, at least one value must be negative (payments), and at least one value must be positive (income).</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150599" role="heading" level="3" l10n="U"
+                    oldref="130">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155427" role="code" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144758" role="paragraph" l10n="U" oldref="132">
+            <emph>Values</emph> represents an array containing the values.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="133">
+            <emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151258" role="heading" level="3" l10n="U"
+                    oldref="134">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 11,33%.</paragraph>
+      </section>
+      <section id="ispmt">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151012"><bookmark_value>calculating; interests for unchanged amortization installments</bookmark_value>
-<bookmark_value>interests for unchanged amortization installments</bookmark_value>
-<bookmark_value>ISPMT function</bookmark_value>
+         <bookmark_value>interests for unchanged amortization installments</bookmark_value>
+         <bookmark_value>ISPMT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISPMT" id="bm_id3149491" localize="false"/>
-<paragraph role="heading" id="hd_id3151012" xml-lang="en-US" level="2" l10n="U" oldref="314">ISPMT</paragraph>
-<paragraph role="paragraph" id="par_id3148693" xml-lang="en-US" l10n="U" oldref="315"><ahelp hid="HID_FUNC_ISPMT">Calculates the level of interest for unchanged amortization installments.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154661" xml-lang="en-US" level="3" l10n="U" oldref="316">Syntax</paragraph>
-<paragraph role="code" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="317">ISPMT(Rate; Period; TotalPeriods; Invest)</paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="318">
-<emph>Rate</emph> sets the periodic interest rate.</paragraph>
-<paragraph role="paragraph" id="par_id3145777" xml-lang="en-US" l10n="U" oldref="319">
-<emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
-<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="U" oldref="320">
-<emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
-<paragraph role="paragraph" id="par_id3159390" xml-lang="en-US" l10n="U" oldref="321">
-<emph>Invest</emph> is the amount of the investment.</paragraph>
-<paragraph role="heading" id="hd_id3156162" xml-lang="en-US" level="3" l10n="U" oldref="322">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149558" xml-lang="en-US" l10n="U" oldref="323">For a credit amount of 120,000 currency units with a two-year term and monthly installments, at a yearly interest rate of 12% the level of interest after 1.5 years is required.</paragraph>
-<paragraph role="paragraph" id="par_id3150949" xml-lang="en-US" l10n="U" oldref="324">
-<item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3151012" role="heading" level="2" l10n="U"
+                    oldref="314">ISPMT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148693" role="paragraph" l10n="U" oldref="315"><ahelp hid="HID_FUNC_ISPMT">Calculates the level of interest for unchanged amortization installments.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154661" role="heading" level="3" l10n="U"
+                    oldref="316">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146070" role="code" l10n="U" oldref="317">ISPMT(Rate; Period; TotalPeriods; Invest)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="318">
+            <emph>Rate</emph> sets the periodic interest rate.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145777" role="paragraph" l10n="U" oldref="319">
+            <emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153678" role="paragraph" l10n="U" oldref="320">
+            <emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159390" role="paragraph" l10n="U" oldref="321">
+            <emph>Invest</emph> is the amount of the investment.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156162" role="heading" level="3" l10n="U"
+                    oldref="322">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149558" role="paragraph" l10n="U" oldref="323">For a credit amount of 120,000 currency units with a two-year term and monthly installments, at a yearly interest rate of 12% the level of interest after 1.5 years is required.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150949" role="paragraph" l10n="U" oldref="324">
+            <item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
+      </section>
 </sort>
-<paragraph role="paragraph" id="par_id3146812" xml-lang="en-US" l10n="U" oldref="426"><link href="text/scalc/01/04060119.xhp" name="Forward to Financial Functions Part Two">Financial Functions Part Two</link></paragraph>
-<paragraph role="paragraph" id="par_id3154411" xml-lang="en-US" l10n="U" oldref="427"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Financial Functions Part Three</link></paragraph>
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3146812" role="paragraph" l10n="U" oldref="426"><link href="text/scalc/01/04060119.xhp" name="Forward to Financial Functions Part Two">Financial Functions Part Two</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154411" role="paragraph" l10n="U" oldref="427"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Financial Functions Part Three</link></paragraph>
+      <embed href="text/scalc/01/04060100.xhp#drking"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060104.xhp b/helpcontent2/source/text/scalc/01/04060104.xhp
index 3905697600..b800e2ad8f 100755
--- a/helpcontent2/source/text/scalc/01/04060104.xhp
+++ b/helpcontent2/source/text/scalc/01/04060104.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060104.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060105.xhp b/helpcontent2/source/text/scalc/01/04060105.xhp
index 9932822ffe..20b7d9d3ec 100644
--- a/helpcontent2/source/text/scalc/01/04060105.xhp
+++ b/helpcontent2/source/text/scalc/01/04060105.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060105.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,132 +32,147 @@
  
 	
 <meta>
-<topic id="textscalc0104060105xml" indexer="include">
-<title id="tit" xml-lang="en-US">Logical Functions</title>
-<filename>/text/scalc/01/04060105.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060105xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Logical Functions</title>
+         <filename>/text/scalc/01/04060105.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153484"><bookmark_value>logical functions</bookmark_value>
-<bookmark_value>Function Wizard; logical</bookmark_value>
-<bookmark_value>functions; logical functions</bookmark_value>
+      <bookmark_value>Function Wizard; logical</bookmark_value>
+      <bookmark_value>functions; logical functions</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153484" xml-lang="en-US" level="1" l10n="U" oldref="1">Logical Functions</paragraph>
-<paragraph role="paragraph" id="par_id3149312" xml-lang="en-US" l10n="U" oldref="2"><variable id="logischtext">This category contains the <emph>Logical</emph> functions. 
+<paragraph xml-lang="en-US" id="hd_id3153484" role="heading" level="1" l10n="U" oldref="1">Logical Functions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149312" role="paragraph" l10n="U" oldref="2"><variable id="logischtext">This category contains the <emph>Logical</emph> functions. 
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000404.xhp#eikalo"/>
-</section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000404.xhp#eikalo"/>
+      </section>
 <sort order="asc">
 <section id="Section6">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147505"><bookmark_value>AND function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_UND" id="bm_id3145320" localize="false"/>
-<paragraph role="heading" id="hd_id3147505" xml-lang="en-US" level="2" l10n="U" oldref="29">AND</paragraph>
-<paragraph role="paragraph" id="par_id3153959" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="HID_FUNC_UND">Returns TRUE if all arguments are TRUE.</ahelp> If one of the elements is FALSE, this function returns the FALSE value.</paragraph>
-<paragraph role="paragraph" id="par_id3146100" xml-lang="en-US" l10n="U" oldref="66">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
-<paragraph role="note" id="par_id3150538" xml-lang="en-US" l10n="CHG" oldref="67">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.<comment>UFI: fixed #i18547#</comment></paragraph>
-<paragraph role="note" id="par_id3149128" xml-lang="en-US" l10n="CHG" oldref="68">If the entered range is outside of the current column or row of the formula, the function returns the error value #VALUE!</paragraph>
-<paragraph role="heading" id="hd_id3150374" xml-lang="en-US" level="3" l10n="U" oldref="31">Syntax</paragraph>
-<paragraph role="code" id="par_id3159123" xml-lang="en-US" l10n="U" oldref="32">AND(LogicalValue1; LogicalValue2 ...LogicalValue30)</paragraph>
-<paragraph role="paragraph" id="par_id3150038" xml-lang="en-US" l10n="CHG" oldref="33">
-<emph>LogicalValue1; LogicalValue2 ...LogicalValue30</emph> are conditions to be checked. All conditions can be either TRUE or FALSE. If a range is entered as a parameter, the function uses the value from the range that is in the current column or row. The result is TRUE if the logical value in all cells within the cell range is TRUE.</paragraph>
-<paragraph role="heading" id="hd_id3149143" xml-lang="en-US" level="3" l10n="U" oldref="34">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153123" xml-lang="en-US" l10n="U" oldref="35">The logical values of entries 12&lt;13; 14&gt;12, and 7&lt;6 are to be checked:</paragraph>
-<paragraph role="paragraph" id="par_id3145632" xml-lang="en-US" l10n="U" oldref="36">
-<item type="input">=AND(12&lt;13;14&gt;12;7&lt;6)</item> returns FALSE.</paragraph>
-<paragraph role="paragraph" id="par_id3149946" xml-lang="en-US" l10n="U" oldref="60">
-<item type="input">=AND (FALSE;TRUE)</item> returns FALSE.</paragraph>
-</section>
-<section id="Section5">
+<paragraph xml-lang="en-US" id="hd_id3147505" role="heading" level="2" l10n="U"
+                    oldref="29">AND</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153959" role="paragraph" l10n="U" oldref="65"><ahelp hid="HID_FUNC_UND">Returns TRUE if all arguments are TRUE.</ahelp> If one of the elements is FALSE, this function returns the FALSE value.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146100" role="paragraph" l10n="U" oldref="66">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150538" role="note" l10n="CHG" oldref="67">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.<comment>UFI: fixed #i18547#</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149128" role="note" l10n="CHG" oldref="68">If the entered range is outside of the current column or row of the formula, the function returns the error value #VALUE!</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150374" role="heading" level="3" l10n="U"
+                    oldref="31">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159123" role="code" l10n="U" oldref="32">AND(LogicalValue1; LogicalValue2 ...LogicalValue30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150038" role="paragraph" l10n="CHG" oldref="33">
+            <emph>LogicalValue1; LogicalValue2 ...LogicalValue30</emph> are conditions to be checked. All conditions can be either TRUE or FALSE. If a range is entered as a parameter, the function uses the value from the range that is in the current column or row. The result is TRUE if the logical value in all cells within the cell range is TRUE.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149143" role="heading" level="3" l10n="U"
+                    oldref="34">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153123" role="paragraph" l10n="U" oldref="35">The logical values of entries 12&lt;13; 14&gt;12, and 7&lt;6 are to be checked:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145632" role="paragraph" l10n="U" oldref="36">
+            <item type="input">=AND(12&lt;13;14&gt;12;7&lt;6)</item> returns FALSE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149946" role="paragraph" l10n="U" oldref="60">
+            <item type="input">=AND (FALSE;TRUE)</item> returns FALSE.</paragraph>
+      </section>
+      <section id="Section5">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149015"><bookmark_value>FALSE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FALSCH" id="bm_id3154678" localize="false"/>
-<paragraph role="heading" id="hd_id3149015" xml-lang="en-US" level="2" l10n="U" oldref="3">FALSE</paragraph>
-<paragraph role="paragraph" id="par_id3149890" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_FALSCH">Returns the logical value FALSE.</ahelp> The FALSE() function does not require any arguments, and always returns the logical value FALSE.</paragraph>
-<paragraph role="heading" id="hd_id3146939" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
-<paragraph role="code" id="par_id3150030" xml-lang="en-US" l10n="U" oldref="6">FALSE()</paragraph>
-<paragraph role="heading" id="hd_id3150697" xml-lang="en-US" level="3" l10n="U" oldref="7">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154842" xml-lang="en-US" l10n="CHG" oldref="8">
-<item type="input">=FALSE()</item> returns FALSE</paragraph>
-<paragraph role="paragraph" id="par_id3147468" xml-lang="en-US" l10n="CHG" oldref="9">
-<item type="input">=NOT(FALSE())</item> returns TRUE</paragraph>
-</section>
-<section id="Section4">
+<paragraph xml-lang="en-US" id="hd_id3149015" role="heading" level="2" l10n="U" oldref="3">FALSE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149890" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_FUNC_FALSCH">Returns the logical value FALSE.</ahelp> The FALSE() function does not require any arguments, and always returns the logical value FALSE.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146939" role="heading" level="3" l10n="U" oldref="5">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150030" role="code" l10n="U" oldref="6">FALSE()</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150697" role="heading" level="3" l10n="U" oldref="7">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154842" role="paragraph" l10n="CHG" oldref="8">
+            <item type="input">=FALSE()</item> returns FALSE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147468" role="paragraph" l10n="CHG" oldref="9">
+            <item type="input">=NOT(FALSE())</item> returns TRUE</paragraph>
+      </section>
+      <section id="Section4">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150141"><bookmark_value>IF function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WENN" id="bm_id3152789" localize="false"/>
-<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="2" l10n="U" oldref="48">IF</paragraph>
-<paragraph role="paragraph" id="par_id3148740" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_FUNC_WENN">Specifies a logical test to be performed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153325" xml-lang="en-US" level="3" l10n="U" oldref="50">Syntax</paragraph>
-<paragraph role="code" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="51">IF(Test; ThenValue; "OtherwiseValue")</paragraph>
-<paragraph role="paragraph" id="par_id3149727" xml-lang="en-US" l10n="U" oldref="52">
-<emph>Test</emph> is any value or expression that can be TRUE or FALSE.</paragraph>
-<paragraph role="paragraph" id="par_id3155828" xml-lang="en-US" l10n="U" oldref="53">
-<emph>ThenValue</emph> (optional) is the value that is returned if the logical test is TRUE.</paragraph>
-<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="54">
-<emph>OtherwiseValue</emph> (optional) is the value that is returned if the logical test is FALSE.</paragraph>
-<paragraph role="paragraph" id="par_idN107FA" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3149507" xml-lang="en-US" level="3" l10n="U" oldref="55">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3150867" xml-lang="en-US" l10n="U" oldref="57">
-<item type="input">=IF(A1&gt;5;100;"too small")</item> If the value in A1 is higher than 5, the value 100 is entered in the current cell; otherwise, the text “too small” (without quotes) is entered.</paragraph>
-</section>
-<section id="Section3">
+<paragraph xml-lang="en-US" id="hd_id3150141" role="heading" level="2" l10n="U"
+                    oldref="48">IF</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148740" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_FUNC_WENN">Specifies a logical test to be performed.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153325" role="heading" level="3" l10n="U"
+                    oldref="50">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154558" role="code" l10n="CHG" oldref="51">IF(Test; ThenValue; OtherwiseValue)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149727" role="paragraph" l10n="U" oldref="52">
+            <emph>Test</emph> is any value or expression that can be TRUE or FALSE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155828" role="paragraph" l10n="U" oldref="53">
+            <emph>ThenValue</emph> (optional) is the value that is returned if the logical test is TRUE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154811" role="paragraph" l10n="U" oldref="54">
+            <emph>OtherwiseValue</emph> (optional) is the value that is returned if the logical test is FALSE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN107FA" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149507" role="heading" level="3" l10n="U"
+                    oldref="55">Examples</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150867" role="paragraph" l10n="U" oldref="57">
+            <item type="input">=IF(A1&gt;5;100;"too small")</item> If the value in A1 is higher than 5, the value 100 is entered in the current cell; otherwise, the text “too small” (without quotes) is entered.</paragraph>
+      </section>
+      <section id="Section3">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155954"><bookmark_value>NOT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_NICHT" id="bm_id3145168" localize="false"/>
-<paragraph role="heading" id="hd_id3155954" xml-lang="en-US" level="2" l10n="U" oldref="12">NOT</paragraph>
-<paragraph role="paragraph" id="par_id3153570" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_FUNC_NICHT">Reverses the logical value.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147372" xml-lang="en-US" level="3" l10n="U" oldref="14">Syntax</paragraph>
-<paragraph role="code" id="par_id3157996" xml-lang="en-US" l10n="U" oldref="15">NOT(LogicalValue)</paragraph>
-<paragraph role="paragraph" id="par_id3148766" xml-lang="en-US" l10n="U" oldref="16">
-<emph>LogicalValue</emph> is any value to be reversed.</paragraph>
-<paragraph role="heading" id="hd_id3149884" xml-lang="en-US" level="3" l10n="U" oldref="17">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150132" xml-lang="en-US" l10n="U" oldref="18">
-<item type="input">=NOT(A)</item>. A=TRUE reverses to A=FALSE.</paragraph>
-</section>
-<section id="Section2">
+<paragraph xml-lang="en-US" id="hd_id3155954" role="heading" level="2" l10n="U"
+                    oldref="12">NOT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153570" role="paragraph" l10n="CHG" oldref="13"><ahelp hid="HID_FUNC_NICHT">Complements (inverts) a logical value.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147372" role="heading" level="3" l10n="U"
+                    oldref="14">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157996" role="code" l10n="U" oldref="15">NOT(LogicalValue)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148766" role="paragraph" l10n="CHG" oldref="16">
+            <emph>LogicalValue</emph> is any value to be complemented.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149884" role="heading" level="3" l10n="U"
+                    oldref="17">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150132" role="paragraph" l10n="CHG" oldref="18">
+            <item type="input">=NOT(A)</item>. If A=TRUE then NOT(A) will evaluate FALSE.</paragraph>
+      </section>
+      <section id="Section2">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148394"><bookmark_value>OR function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ODER" id="bm_id3155620" localize="false"/>
-<paragraph role="heading" id="hd_id3148394" xml-lang="en-US" level="2" l10n="U" oldref="20">OR</paragraph>
-<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_FUNC_ODER">Returns TRUE if at least one argument is TRUE.</ahelp> This function returns the value FALSE, if all the arguments have the logical value FALSE.</paragraph>
-<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="62">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
-<paragraph role="note" id="par_id3153546" xml-lang="en-US" l10n="CHG" oldref="63">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.</paragraph>
-<paragraph role="note" id="par_id3149027" xml-lang="en-US" l10n="CHG" oldref="64">If the entered range is outside of the current column or row of the formula, the function returns the error value #VALUE!</paragraph>
-<paragraph role="heading" id="hd_id3155517" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
-<paragraph role="code" id="par_id3150468" xml-lang="en-US" l10n="U" oldref="23">OR(LogicalValue1; LogicalValue2 ...LogicalValue30)</paragraph>
-<paragraph role="paragraph" id="par_id3155819" xml-lang="en-US" l10n="CHG" oldref="24">
-<emph>LogicalValue1; LogicalValue2 ...LogicalValue30</emph> are conditions to be checked. All conditions can be either TRUE or FALSE. If a range is entered as a parameter, the function uses the value from the range that is in the current column or row.<comment>UFI: first try to fix bugtraq 4905779</comment></paragraph>
-<paragraph role="heading" id="hd_id3153228" xml-lang="en-US" level="3" l10n="U" oldref="25">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154870" xml-lang="en-US" l10n="U" oldref="26">The logical values of entries 12&lt;11; 13&gt;22, and 45=45 are to be checked.</paragraph>
-<paragraph role="paragraph" id="par_id3155371" xml-lang="en-US" l10n="U" oldref="27">
-<item type="input">=OR(12&lt;11;13&gt;22;45=45)</item> returns TRUE.</paragraph>
-<paragraph role="paragraph" id="par_id3158412" xml-lang="en-US" l10n="U" oldref="59">
-<item type="input">=OR(FALSE;TRUE)</item> returns TRUE.</paragraph>
-</section>
-<section id="Section1">
+<paragraph xml-lang="en-US" id="hd_id3148394" role="heading" level="2" l10n="U"
+                    oldref="20">OR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="61"><ahelp hid="HID_FUNC_ODER">Returns TRUE if at least one argument is TRUE.</ahelp> This function returns the value FALSE, if all the arguments have the logical value FALSE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148771" role="paragraph" l10n="U" oldref="62">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153546" role="note" l10n="CHG" oldref="63">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149027" role="note" l10n="CHG" oldref="64">If the entered range is outside of the current column or row of the formula, the function returns the error value #VALUE!</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155517" role="heading" level="3" l10n="U"
+                    oldref="22">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150468" role="code" l10n="U" oldref="23">OR(LogicalValue1; LogicalValue2 ...LogicalValue30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155819" role="paragraph" l10n="CHG" oldref="24">
+            <emph>LogicalValue1; LogicalValue2 ...LogicalValue30</emph> are conditions to be checked. All conditions can be either TRUE or FALSE. If a range is entered as a parameter, the function uses the value from the range that is in the current column or row.<comment>UFI: first try to fix bugtraq 4905779</comment></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153228" role="heading" level="3" l10n="U"
+                    oldref="25">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154870" role="paragraph" l10n="U" oldref="26">The logical values of entries 12&lt;11; 13&gt;22, and 45=45 are to be checked.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155371" role="paragraph" l10n="U" oldref="27">
+            <item type="input">=OR(12&lt;11;13&gt;22;45=45)</item> returns TRUE.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158412" role="paragraph" l10n="U" oldref="59">
+            <item type="input">=OR(FALSE;TRUE)</item> returns TRUE.</paragraph>
+      </section>
+      <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156256"><bookmark_value>TRUE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHR" id="bm_id3148426" localize="false"/>
-<paragraph role="heading" id="hd_id3156256" xml-lang="en-US" level="2" l10n="U" oldref="38">TRUE</paragraph>
-<paragraph role="paragraph" id="par_id3155985" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_FUNC_WAHR">The logical value is set to TRUE.</ahelp> The TRUE() function does not require any arguments, and always returns the logical value TRUE.</paragraph>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="40">Syntax</paragraph>
-<paragraph role="code" id="par_id3152590" xml-lang="en-US" l10n="U" oldref="41">TRUE()</paragraph>
-<paragraph role="heading" id="hd_id3147175" xml-lang="en-US" level="3" l10n="U" oldref="42">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="43">If A=TRUE and B=FALSE the following examples appear:</paragraph>
-<paragraph role="paragraph" id="par_id3083285" xml-lang="en-US" l10n="U" oldref="44">
-<item type="input">=AND(A;B)</item> returns FALSE</paragraph>
-<paragraph role="paragraph" id="par_id3083444" xml-lang="en-US" l10n="U" oldref="45">
-<item type="input">=OR(A;B)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id3154314" xml-lang="en-US" l10n="U" oldref="46">
-<item type="input">=NOT(AND(A;B))</item> returns TRUE</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3156256" role="heading" level="2" l10n="U"
+                    oldref="38">TRUE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155985" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_FUNC_WAHR">The logical value is set to TRUE.</ahelp> The TRUE() function does not require any arguments, and always returns the logical value TRUE.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="3" l10n="U"
+                    oldref="40">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152590" role="code" l10n="U" oldref="41">TRUE()</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147175" role="heading" level="3" l10n="U"
+                    oldref="42">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="43">If A=TRUE and B=FALSE the following examples appear:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083285" role="paragraph" l10n="U" oldref="44">
+            <item type="input">=AND(A;B)</item> returns FALSE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U" oldref="45">
+            <item type="input">=OR(A;B)</item> returns TRUE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154314" role="paragraph" l10n="U" oldref="46">
+            <item type="input">=NOT(AND(A;B))</item> returns TRUE</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 5e8c9710b6..e79c3224b7 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -3,16 +3,13 @@
 	
 <!--
 ***********************************************************************
- *
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060106.xhp,v $
- * $Revision: 1.15.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,13 +27,12 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
- 
+************************************************************************
+-->
 	
 <meta>
 <topic id="textscalc0104060106xml" indexer="include">
-<title id="tit" xml-lang="en-US">Mathematical Functions</title>
+<title xml-lang="en-US" id="tit">Mathematical Functions</title>
 <filename>/text/scalc/01/04060106.xhp</filename>
 </topic>
 </meta>
@@ -45,9 +41,9 @@
 <bookmark_value>Function Wizard; mathematical</bookmark_value>
 <bookmark_value>functions; mathematical functions</bookmark_value>
 <bookmark_value>trigonometric functions</bookmark_value>
-</bookmark><comment>mw added "trigonometric..."</comment>
-<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="1" l10n="U" oldref="1">Mathematical Functions</paragraph>
-<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="mathematiktext">This category contains the <emph>Mathematical</emph> functions for Calc. 
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id3147124" role="heading" level="1" l10n="U" oldref="1">Mathematical Functions</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154943" role="paragraph" l10n="CHG" oldref="2"><variable id="mathematiktext">This category contains the <emph>Mathematical</emph> functions for Calc.
 </variable> To open the <emph>Function Wizard</emph>, choose <link href="text/scalc/01/04060000.xhp" name="Insert - Function"><emph>Insert - Function</emph></link>.</paragraph>
 <sort>
 <section id="Section1">
@@ -56,18 +52,20 @@
 <bookmark_value>values;absolute</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ABS" id="bm_id3150695" localize="false"/>
-<paragraph role="heading" id="hd_id3146944" xml-lang="en-US" level="2" l10n="U" oldref="33">ABS</paragraph>
-<paragraph role="paragraph" id="par_id3154546" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_FUNC_ABS">Returns the absolute value of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154843" xml-lang="en-US" level="3" l10n="U" oldref="35">Syntax</paragraph>
-<paragraph role="code" id="par_id3147475" xml-lang="en-US" l10n="U" oldref="36">ABS(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3148438" xml-lang="en-US" l10n="CHG" oldref="37">
-<emph>Number</emph> is the number whose absolute value is to be calculated. The absolute value of a number is its value without the +/- sign.</paragraph>
-<paragraph role="heading" id="hd_id3155823" xml-lang="en-US" level="3" l10n="U" oldref="38">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152787" xml-lang="en-US" l10n="CHG" oldref="39">
+<paragraph xml-lang="en-US" id="hd_id3146944" role="heading" level="2" l10n="U"
+oldref="33">ABS</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154546" role="paragraph" l10n="U" oldref="34"><ahelp hid="HID_FUNC_ABS">Returns the absolute value of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154843" role="heading" level="3" l10n="U"
+oldref="35">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147475" role="code" l10n="U" oldref="36">ABS(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148438" role="paragraph" l10n="CHG" oldref="37"><emph>Number</emph> is the number whose absolute value is to be calculated. The absolute value of a number is its value without the +/- sign.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155823" role="heading" level="3" l10n="U"
+oldref="38">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152787" role="paragraph" l10n="CHG" oldref="39">
 <item type="input">=ABS(-56)</item> returns 56.</paragraph>
-<paragraph role="paragraph" id="par_id3148752" xml-lang="en-US" l10n="CHG" oldref="40">
+<paragraph xml-lang="en-US" id="par_id3148752" role="paragraph" l10n="CHG" oldref="40">
 <item type="input">=ABS(12)</item> returns 12.</paragraph>
-<paragraph role="paragraph" id="par_id320139" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id320139" role="paragraph" l10n="NEW">
 <item type="input">=ABS(0)</item> returns 0.<comment>see also SIGN</comment></paragraph>
 </section>
 <section id="Section62">
@@ -76,113 +74,129 @@
 <bookmark_value>empty cells;counting</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHLLEEREZELLEN" id="bm_id3149730" localize="false"/>
-<paragraph role="heading" id="hd_id3150896" xml-lang="en-US" level="2" l10n="U" oldref="42">COUNTBLANK</paragraph>
-<paragraph role="paragraph" id="par_id3155260" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="HID_FUNC_ANZAHLLEEREZELLEN">Returns the number of empty cells.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145144" xml-lang="en-US" level="3" l10n="U" oldref="44">Syntax</paragraph>
-<paragraph role="code" id="par_id3153931" xml-lang="en-US" l10n="U" oldref="45">COUNTBLANK(Range)</paragraph>
-<paragraph role="paragraph" id="par_id3149512" xml-lang="en-US" l10n="CHG" oldref="46"> Returns the number of empty cells in the cell range <emph>Range</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3146139" xml-lang="en-US" level="3" l10n="U" oldref="47">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148586" xml-lang="en-US" l10n="CHG" oldref="48">
+<paragraph xml-lang="en-US" id="hd_id3150896" role="heading" level="2" l10n="U"
+oldref="42">COUNTBLANK</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155260" role="paragraph" l10n="CHG" oldref="43"><ahelp hid="HID_FUNC_ANZAHLLEEREZELLEN">Returns the number of empty cells.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145144" role="heading" level="3" l10n="U"
+oldref="44">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153931" role="code" l10n="U" oldref="45">COUNTBLANK(Range)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149512" role="paragraph" l10n="CHG" oldref="46"> Returns the number of empty cells in the cell range <emph>Range</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146139" role="heading" level="3" l10n="U"
+oldref="47">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148586" role="paragraph" l10n="CHG" oldref="48">
 <item type="input">=COUNTBLANK(A1:B2)</item> returns 4 if cells A1, A2, B1, and B2 are all empty.</paragraph><comment>see also COUNTIF</comment>
 </section>
 <section id="Section61">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153114"><bookmark_value>ACOS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCCOS" id="bm_id3155952" localize="false"/>
-<paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="2" l10n="U" oldref="50">ACOS</paragraph>
-<paragraph role="paragraph" id="par_id3145163" xml-lang="en-US" l10n="CHG" oldref="51"><ahelp hid="HID_FUNC_ARCCOS">Returns the inverse trigonometric cosine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153565" xml-lang="en-US" level="3" l10n="U" oldref="52">Syntax</paragraph>
-<paragraph role="code" id="par_id3150020" xml-lang="en-US" l10n="U" oldref="53">ACOS(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3159134" xml-lang="en-US" l10n="CHG" oldref="54"> This function returns the inverse trigonometric cosine of <emph>Number</emph>, that is the angle (in radians) whose cosine is Number. The angle returned is between 0 and PI.</paragraph>
-<paragraph role="paragraph" id="par_id679647" xml-lang="en-US" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
-<paragraph role="heading" id="hd_id3149882" xml-lang="en-US" level="3" l10n="U" oldref="55">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150128" xml-lang="en-US" l10n="CHG" oldref="56">
+<paragraph xml-lang="en-US" id="hd_id3153114" role="heading" level="2" l10n="U"
+oldref="50">ACOS</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145163" role="paragraph" l10n="CHG" oldref="51"><ahelp hid="HID_FUNC_ARCCOS">Returns the inverse trigonometric cosine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153565" role="heading" level="3" l10n="U"
+oldref="52">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150020" role="code" l10n="U" oldref="53">ACOS(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159134" role="paragraph" l10n="CHG" oldref="54"> This function returns the inverse trigonometric cosine of <emph>Number</emph>, that is the angle (in radians) whose cosine is Number. The angle returned is between 0 and PI.</paragraph>
+<paragraph xml-lang="en-US" id="par_id679647" role="paragraph" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149882" role="heading" level="3" l10n="U"
+oldref="55">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150128" role="paragraph" l10n="CHG" oldref="56">
 <item type="input">=ACOS(-1)</item> returns 3.14159265358979 (PI radians)</paragraph>
-<paragraph role="paragraph" id="par_id8792382" xml-lang="en-US" l10n="NEW">
-<item type="input">=DEGREES(ACOS(0.5))</item> returns 60. The cosine of 60 degrees is 0.5.</paragraph><comment>see also COS, SIN, TAN, COT, 
-ASIN, ATAN, ATAN2, ACOT  </comment>
+<paragraph xml-lang="en-US" id="par_id8792382" role="paragraph" l10n="NEW">
+<item type="input">=DEGREES(ACOS(0.5))</item> returns 60. The cosine of 60 degrees is 0.5.</paragraph><comment>see also COS, SIN, TAN, COT, ASIN, ATAN, ATAN2, ACOT  </comment>
 </section>
 <section id="Section60">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145355"><bookmark_value>ACOSH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCOSHYP" id="bm_id3148386" localize="false"/>
-<paragraph role="heading" id="hd_id3145355" xml-lang="en-US" level="2" l10n="U" oldref="60">ACOSH</paragraph>
-<paragraph role="paragraph" id="par_id3157993" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_FUNC_ARCOSHYP">Returns the inverse hyperbolic cosine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145295" xml-lang="en-US" level="3" l10n="U" oldref="62">Syntax</paragraph>
-<paragraph role="code" id="par_id3151017" xml-lang="en-US" l10n="U" oldref="63">ACOSH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3149000" xml-lang="en-US" l10n="CHG" oldref="64"> This function returns the inverse hyperbolic cosine of <emph>Number</emph>, that is the number whose hyperbolic cosine is Number. </paragraph>
-<paragraph role="paragraph" id="par_id6393932" xml-lang="en-US" l10n="NEW"> Number must be greater than or equal to 1.</paragraph>
-<paragraph role="heading" id="hd_id3150566" xml-lang="en-US" level="3" l10n="U" oldref="65">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="CHG" oldref="66">
+<paragraph xml-lang="en-US" id="hd_id3145355" role="heading" level="2" l10n="U"
+oldref="60">ACOSH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157993" role="paragraph" l10n="U" oldref="61"><ahelp hid="HID_FUNC_ARCOSHYP">Returns the inverse hyperbolic cosine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145295" role="heading" level="3" l10n="U"
+oldref="62">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151017" role="code" l10n="U" oldref="63">ACOSH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149000" role="paragraph" l10n="CHG" oldref="64"> This function returns the inverse hyperbolic cosine of <emph>Number</emph>, that is the number whose hyperbolic cosine is Number. </paragraph>
+<paragraph xml-lang="en-US" id="par_id6393932" role="paragraph" l10n="NEW"> Number must be greater than or equal to 1.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150566" role="heading" level="3" l10n="U"
+oldref="65">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145629" role="paragraph" l10n="CHG" oldref="66">
 <item type="input">=ACOSH(1)</item> returns 0.</paragraph>
-<paragraph role="paragraph" id="par_id951567" xml-lang="en-US" l10n="NEW">
-<item type="input">=ACOSH(COSH(4))</item> returns 4.</paragraph><comment>see also ASINH, ATANH, ACOTH,   
-COSH, SINH, TANH, COTH</comment>
+<paragraph xml-lang="en-US" id="par_id951567" role="paragraph" l10n="NEW">
+<item type="input">=ACOSH(COSH(4))</item> returns 4.</paragraph><comment>see also ASINH, ATANH, ACOTH, COSH, SINH, TANH, COTH</comment>
 </section>
 <section id="Section59">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149027"><bookmark_value>ACOT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCCOT" id="bm_id3154634" localize="false"/>
-<paragraph role="heading" id="hd_id3149027" xml-lang="en-US" level="2" l10n="U" oldref="70">ACOT</paragraph>
-<paragraph role="paragraph" id="par_id3155818" xml-lang="en-US" l10n="CHG" oldref="71"><ahelp hid="HID_FUNC_ARCCOT">Returns the inverse cotangent (the arccotangent) of the given number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153225" xml-lang="en-US" level="3" l10n="U" oldref="72">Syntax</paragraph>
-<paragraph role="code" id="par_id3158419" xml-lang="en-US" l10n="U" oldref="73">ACOT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="CHG" oldref="74"> This function returns the inverse trigonometric cotangent of <emph>Number</emph>, that is the angle (in radians) whose cotangent is Number. The angle returned is between 0 and PI.</paragraph>
-<paragraph role="paragraph" id="par_id5834528" xml-lang="en-US" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
-<paragraph role="heading" id="hd_id3147538" xml-lang="en-US" level="3" l10n="U" oldref="75">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155375" xml-lang="en-US" l10n="CHG" oldref="76">
+<paragraph xml-lang="en-US" id="hd_id3149027" role="heading" level="2" l10n="U"
+oldref="70">ACOT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155818" role="paragraph" l10n="CHG" oldref="71"><ahelp hid="HID_FUNC_ARCCOT">Returns the inverse cotangent (the arccotangent) of the given number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153225" role="heading" level="3" l10n="U"
+oldref="72">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158419" role="code" l10n="U" oldref="73">ACOT(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="CHG" oldref="74"> This function returns the inverse trigonometric cotangent of <emph>Number</emph>, that is the angle (in radians) whose cotangent is Number. The angle returned is between 0 and PI.</paragraph>
+<paragraph xml-lang="en-US" id="par_id5834528" role="paragraph" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147538" role="heading" level="3" l10n="U"
+oldref="75">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155375" role="paragraph" l10n="CHG" oldref="76">
 <item type="input">=ACOT(1)</item> returns 0.785398163397448 (PI/4 radians).</paragraph>
-<paragraph role="paragraph" id="par_id8589434" xml-lang="en-US" l10n="NEW">
-<item type="input">=DEGREES(ACOT(1))</item> returns 45. The tangent of 45 degrees is 1. </paragraph><comment>see also COS, SIN, TAN, COT, 
-ACOS, ASIN, ATAN, ATAN2  </comment>
+<paragraph xml-lang="en-US" id="par_id8589434" role="paragraph" l10n="NEW">
+<item type="input">=DEGREES(ACOT(1))</item> returns 45. The tangent of 45 degrees is 1. </paragraph><comment>see also COS, SIN, TAN, COT, ACOS, ASIN, ATAN, ATAN2  </comment>
 </section>
 <section id="Section58">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148426"><bookmark_value>ACOTH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCOTHYP" id="bm_id3149777" localize="false"/>
-<paragraph role="heading" id="hd_id3148426" xml-lang="en-US" level="2" l10n="U" oldref="80">ACOTH</paragraph>
-<paragraph role="paragraph" id="par_id3147478" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="HID_FUNC_ARCOTHYP">Returns the inverse hyperbolic cotangent of the given number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152585" xml-lang="en-US" level="3" l10n="U" oldref="82">Syntax</paragraph>
-<paragraph role="code" id="par_id3147172" xml-lang="en-US" l10n="U" oldref="83">ACOTH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3146155" xml-lang="en-US" l10n="CHG" oldref="84"> This function returns the inverse hyperbolic cotangent of <emph>Number</emph>, that is the number whose hyperbolic cotangent is Number. </paragraph>
-<paragraph role="paragraph" id="par_id5818659" xml-lang="en-US" l10n="NEW">An error results if Number is between -1 and 1 inclusive.</paragraph>
-<paragraph role="heading" id="hd_id3083452" xml-lang="en-US" level="3" l10n="U" oldref="85">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150608" xml-lang="en-US" l10n="CHG" oldref="86">
-<item type="input">=ACOTH(1.1)</item> returns inverse hyperbolic cotangent of 1.1, approximately 1.52226.</paragraph><comment>see also ACOSH, ASINH, ATANH,   
-COSH, SINH, TANH, COTH</comment>
+<paragraph xml-lang="en-US" id="hd_id3148426" role="heading" level="2" l10n="U"
+oldref="80">ACOTH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147478" role="paragraph" l10n="U" oldref="81"><ahelp hid="HID_FUNC_ARCOTHYP">Returns the inverse hyperbolic cotangent of the given number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152585" role="heading" level="3" l10n="U"
+oldref="82">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147172" role="code" l10n="U" oldref="83">ACOTH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146155" role="paragraph" l10n="CHG" oldref="84"> This function returns the inverse hyperbolic cotangent of <emph>Number</emph>, that is the number whose hyperbolic cotangent is Number.</paragraph>
+<paragraph xml-lang="en-US" id="par_id5818659" role="paragraph" l10n="NEW">An error results if Number is between -1 and 1 inclusive.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3083452" role="heading" level="3" l10n="U"
+oldref="85">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150608" role="paragraph" l10n="CHG" oldref="86">
+<item type="input">=ACOTH(1.1)</item> returns inverse hyperbolic cotangent of 1.1, approximately 1.52226.</paragraph><comment>see also ACOSH, ASINH, ATANH, COSH, SINH, TANH, COTH</comment>
 </section>
 <section id="Section57">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145084"><bookmark_value>ASIN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCSIN" id="bm_id3149280" localize="false"/>
-<paragraph role="heading" id="hd_id3145084" xml-lang="en-US" level="2" l10n="U" oldref="90">ASIN</paragraph>
-<paragraph role="paragraph" id="par_id3156296" xml-lang="en-US" l10n="CHG" oldref="91"><ahelp hid="HID_FUNC_ARCSIN">Returns the inverse trigonometric sine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149716" xml-lang="en-US" level="3" l10n="U" oldref="92">Syntax</paragraph>
-<paragraph role="code" id="par_id3156305" xml-lang="en-US" l10n="U" oldref="93">ASIN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3150964" xml-lang="en-US" l10n="CHG" oldref="94"> This function returns the inverse trigonometric sine of <emph>Number</emph>, that is the angle (in radians) whose sine is Number. The angle returned is between -PI/2 and +PI/2.</paragraph>
-<paragraph role="paragraph" id="par_id203863" xml-lang="en-US" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
-<paragraph role="heading" id="hd_id3149448" xml-lang="en-US" level="3" l10n="U" oldref="95">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156100" xml-lang="en-US" l10n="CHG" oldref="96">
+<paragraph xml-lang="en-US" id="hd_id3145084" role="heading" level="2" l10n="U"
+oldref="90">ASIN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156296" role="paragraph" l10n="CHG" oldref="91"><ahelp hid="HID_FUNC_ARCSIN">Returns the inverse trigonometric sine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149716" role="heading" level="3" l10n="U"
+oldref="92">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156305" role="code" l10n="U" oldref="93">ASIN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150964" role="paragraph" l10n="CHG" oldref="94"> This function returns the inverse trigonometric sine of <emph>Number</emph>, that is the angle (in radians) whose sine is Number. The angle returned is between -PI/2 and +PI/2.</paragraph>
+<paragraph xml-lang="en-US" id="par_id203863" role="paragraph" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149448" role="heading" level="3" l10n="U"
+oldref="95">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156100" role="paragraph" l10n="CHG" oldref="96">
 <item type="input">=ASIN(0)</item> returns 0.</paragraph>
-<paragraph role="paragraph" id="par_id6853846" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id6853846" role="paragraph" l10n="NEW">
 <item type="input">=ASIN(1)</item> returns 1.5707963267949 (PI/2 radians). </paragraph>
-<paragraph role="paragraph" id="par_id8772240" xml-lang="en-US" l10n="NEW">
-<item type="input">=DEGREES(ASIN(0.5))</item> returns 30. The sine of 30 degrees is 0.5.</paragraph><comment>see also COS, SIN, TAN, COT, 
-ACOS, ATAN, ATAN2, ACOT  </comment>
+<paragraph xml-lang="en-US" id="par_id8772240" role="paragraph" l10n="NEW">
+<item type="input">=DEGREES(ASIN(0.5))</item> returns 30. The sine of 30 degrees is 0.5.</paragraph><comment>see also COS, SIN, TAN, COT, ACOS, ATAN, ATAN2, ACOT  </comment>
 </section>
 <section id="Section56">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151266"><bookmark_value>ASINH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARSINHYP" id="bm_id3145206" localize="false"/>
-<paragraph role="heading" id="hd_id3151266" xml-lang="en-US" level="2" l10n="U" oldref="100">ASINH</paragraph>
-<paragraph role="paragraph" id="par_id3147077" xml-lang="en-US" l10n="U" oldref="101"><ahelp hid="HID_FUNC_ARSINHYP">Returns the inverse hyperbolic sine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150763" xml-lang="en-US" level="3" l10n="U" oldref="102">Syntax</paragraph>
-<paragraph role="code" id="par_id3150882" xml-lang="en-US" l10n="U" oldref="103">ASINH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3147621" xml-lang="en-US" l10n="CHG" oldref="104"> This function returns the inverse hyperbolic sine of <emph>Number</emph>, that is the number whose hyperbolic sine is Number. </paragraph>
-<paragraph role="heading" id="hd_id3153212" xml-lang="en-US" level="3" l10n="U" oldref="105">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156120" xml-lang="en-US" l10n="CHG" oldref="106">
+<paragraph xml-lang="en-US" id="hd_id3151266" role="heading" level="2" l10n="U"
+oldref="100">ASINH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147077" role="paragraph" l10n="U" oldref="101"><ahelp hid="HID_FUNC_ARSINHYP">Returns the inverse hyperbolic sine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150763" role="heading" level="3" l10n="U"
+oldref="102">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150882" role="code" l10n="U" oldref="103">ASINH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147621" role="paragraph" l10n="CHG" oldref="104"> This function returns the inverse hyperbolic sine of <emph>Number</emph>, that is the number whose hyperbolic sine is Number. </paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153212" role="heading" level="3" l10n="U"
+oldref="105">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156120" role="paragraph" l10n="CHG" oldref="106">
 <item type="input">=ASINH(-90)</item> returns approximately -5.1929877.</paragraph>
-<paragraph role="paragraph" id="par_id4808496" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id4808496" role="paragraph" l10n="NEW">
 <item type="input">=ASINH(SINH(4))</item> returns 4.</paragraph><comment>see also ACOSH, ATANH, ACOTH,   
 COSH, SINH, TANH, COTH</comment>
 </section>
@@ -190,16 +204,19 @@ COSH, SINH, TANH, COTH</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155996"><bookmark_value>ATAN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCTAN" id="bm_id3154743" localize="false"/>
-<paragraph role="heading" id="hd_id3155996" xml-lang="en-US" level="2" l10n="U" oldref="110">ATAN</paragraph>
-<paragraph role="paragraph" id="par_id3149985" xml-lang="en-US" l10n="CHG" oldref="111"><ahelp hid="HID_FUNC_ARCTAN">Returns the inverse trigonometric tangent of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151294" xml-lang="en-US" level="3" l10n="U" oldref="112">Syntax</paragraph>
-<paragraph role="code" id="par_id3150261" xml-lang="en-US" l10n="U" oldref="113">ATAN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3147267" xml-lang="en-US" l10n="CHG" oldref="114"> This function returns the inverse trigonometric tangent of <emph>Number</emph>, that is the angle (in radians) whose tangent is Number. The angle returned is between -PI/2 and PI/2.</paragraph>
-<paragraph role="paragraph" id="par_id6293527" xml-lang="en-US" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
-<paragraph role="heading" id="hd_id3154054" xml-lang="en-US" level="3" l10n="U" oldref="115">Example</paragraph>
-<paragraph role="paragraph" id="par_id3143229" xml-lang="en-US" l10n="CHG" oldref="116">
+<paragraph xml-lang="en-US" id="hd_id3155996" role="heading" level="2" l10n="U"
+oldref="110">ATAN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149985" role="paragraph" l10n="CHG" oldref="111"><ahelp hid="HID_FUNC_ARCTAN">Returns the inverse trigonometric tangent of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151294" role="heading" level="3" l10n="U"
+oldref="112">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150261" role="code" l10n="U" oldref="113">ATAN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147267" role="paragraph" l10n="CHG" oldref="114"> This function returns the inverse trigonometric tangent of <emph>Number</emph>, that is the angle (in radians) whose tangent is Number. The angle returned is between -PI/2 and PI/2.</paragraph>
+<paragraph xml-lang="en-US" id="par_id6293527" role="paragraph" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154054" role="heading" level="3" l10n="U"
+oldref="115">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143229" role="paragraph" l10n="CHG" oldref="116">
 <item type="input">=ATAN(1)</item> returns 0.785398163397448 (PI/4 radians).</paragraph>
-<paragraph role="paragraph" id="par_id8746299" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id8746299" role="paragraph" l10n="NEW">
 <item type="input">=DEGREES(ATAN(1))</item> returns 45. The tangent of 45 degrees is 1.</paragraph><comment>see also COS, SIN, TAN, COT, 
 ACOS, ASIN, ATAN2, ACOT  </comment>
 </section>
@@ -207,20 +224,21 @@ ACOS, ASIN, ATAN2, ACOT  </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153983"><bookmark_value>ATAN2 function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARCTAN2" id="bm_id3159180" localize="false"/>
-<paragraph role="heading" id="hd_id3153983" xml-lang="en-US" level="2" l10n="U" oldref="120">ATAN2</paragraph>
-<paragraph role="paragraph" id="par_id3154297" xml-lang="en-US" l10n="CHG" oldref="121"><ahelp hid="HID_FUNC_ARCTAN2">Returns the inverse trigonometric tangent of the specified x and y coordinates.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149758" xml-lang="en-US" level="3" l10n="U" oldref="122">Syntax</paragraph>
-<paragraph role="code" id="par_id3156013" xml-lang="en-US" l10n="CHG" oldref="123">ATAN2(NumberX; NumberY)</paragraph>
-<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="CHG" oldref="124">
-<emph>NumberX</emph> is the value of the x coordinate.</paragraph>
-<paragraph role="paragraph" id="par_id3152798" xml-lang="en-US" l10n="CHG" oldref="125">
-<emph>NumberY</emph> is the value of the y coordinate.</paragraph>
-<paragraph role="paragraph" id="par_id5036164" xml-lang="en-US" l10n="NEW">ATAN2 returns the inverse trigonometric tangent, that is, the angle (in radians) between the x-axis and a line from point NumberX, NumberY to the origin. The angle returned is between -PI and PI.</paragraph>
-<paragraph role="paragraph" id="par_id3001800" xml-lang="en-US" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
-<paragraph role="heading" id="hd_id3145663" xml-lang="en-US" level="3" l10n="U" oldref="126">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154692" xml-lang="en-US" l10n="CHG" oldref="127">
+<paragraph xml-lang="en-US" id="hd_id3153983" role="heading" level="2" l10n="U"
+oldref="120">ATAN2</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154297" role="paragraph" l10n="CHG" oldref="121"><ahelp hid="HID_FUNC_ARCTAN2">Returns the inverse trigonometric tangent of the specified x and y coordinates.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149758" role="heading" level="3" l10n="U"
+oldref="122">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156013" role="code" l10n="CHG" oldref="123">ATAN2(NumberX; NumberY)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151168" role="paragraph" l10n="CHG" oldref="124"><emph>NumberX</emph> is the value of the x coordinate.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152798" role="paragraph" l10n="CHG" oldref="125"><emph>NumberY</emph> is the value of the y coordinate.</paragraph>
+<paragraph xml-lang="en-US" id="par_id5036164" role="paragraph" l10n="NEW">ATAN2 returns the inverse trigonometric tangent, that is, the angle (in radians) between the x-axis and a line from point NumberX, NumberY to the origin. The angle returned is between -PI and PI.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3001800" role="paragraph" l10n="NEW">To return the angle in degrees, use the DEGREES function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145663" role="heading" level="3" l10n="U"
+oldref="126">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154692" role="paragraph" l10n="CHG" oldref="127">
 <item type="input">=ATAN2(20;20)</item> returns 0.785398163397448 (PI/4 radians).</paragraph>
-<paragraph role="paragraph" id="par_id1477095" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1477095" role="paragraph" l10n="NEW">
 <item type="input">=DEGREES(ATAN2(12.3;12.3))</item> returns 45. The tangent of 45 degrees is 1.</paragraph><comment>see also COS, SIN, TAN, COT, 
 ACOS, ASIN, ATAN, ACOT  </comment>
 </section>
@@ -228,14 +246,17 @@ ACOS, ASIN, ATAN, ACOT  </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155398"><bookmark_value>ATANH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARTANHYP" id="bm_id3154939" localize="false"/>
-<paragraph role="heading" id="hd_id3155398" xml-lang="en-US" level="2" l10n="U" oldref="130">ATANH</paragraph>
-<paragraph role="paragraph" id="par_id3148829" xml-lang="en-US" l10n="U" oldref="131"><ahelp hid="HID_FUNC_ARTANHYP">Returns the inverse hyperbolic tangent of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146997" xml-lang="en-US" level="3" l10n="U" oldref="132">Syntax</paragraph>
-<paragraph role="code" id="par_id3149912" xml-lang="en-US" l10n="U" oldref="133">ATANH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="CHG" oldref="134"> This function returns the inverse hyperbolic tangent of <emph>Number</emph>, that is the number whose hyperbolic tangent is Number. </paragraph>
-<paragraph role="paragraph" id="par_id9357280" xml-lang="en-US" l10n="NEW"> Number must obey the condition -1 &lt; number &lt; 1.</paragraph>
-<paragraph role="heading" id="hd_id3148450" xml-lang="en-US" level="3" l10n="U" oldref="135">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="CHG" oldref="136">
+<paragraph xml-lang="en-US" id="hd_id3155398" role="heading" level="2" l10n="U"
+oldref="130">ATANH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148829" role="paragraph" l10n="U" oldref="131"><ahelp hid="HID_FUNC_ARTANHYP">Returns the inverse hyperbolic tangent of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146997" role="heading" level="3" l10n="U"
+oldref="132">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149912" role="code" l10n="U" oldref="133">ATANH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150521" role="paragraph" l10n="CHG" oldref="134"> This function returns the inverse hyperbolic tangent of <emph>Number</emph>, that is the number whose hyperbolic tangent is Number. </paragraph>
+<paragraph xml-lang="en-US" id="par_id9357280" role="paragraph" l10n="NEW"> Number must obey the condition -1 &lt; number &lt; 1.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148450" role="heading" level="3" l10n="U"
+oldref="135">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="CHG" oldref="136">
 <item type="input">=ATANH(0)</item> returns 0.</paragraph><comment>see also ACOSH, ASINH, ACOTH,   
 COSH, SINH, TANH, COTH</comment>
 </section>
@@ -243,16 +264,19 @@ COSH, SINH, TANH, COTH</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153062"><bookmark_value>COS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_COS" id="bm_id3158408" localize="false"/>
-<paragraph role="heading" id="hd_id3153062" xml-lang="en-US" level="2" l10n="U" oldref="149">COS</paragraph>
-<paragraph role="paragraph" id="par_id3148803" xml-lang="en-US" l10n="CHG" oldref="150"><ahelp hid="HID_FUNC_COS">Returns the cosine of the given angle (in radians).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150779" xml-lang="en-US" level="3" l10n="U" oldref="151">Syntax</paragraph>
-<paragraph role="code" id="par_id3154213" xml-lang="en-US" l10n="U" oldref="152">COS(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="CHG" oldref="153"> Returns the (trigonometric) cosine of <emph>Number</emph>, the angle in radians.</paragraph>
-<paragraph role="paragraph" id="par_id831019" xml-lang="en-US" l10n="NEW">To return the cosine of an angle in degrees, use the RADIANS function.</paragraph>
-<paragraph role="heading" id="hd_id3153579" xml-lang="en-US" level="3" l10n="U" oldref="154">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3147240" xml-lang="en-US" l10n="U" oldref="155">
+<paragraph xml-lang="en-US" id="hd_id3153062" role="heading" level="2" l10n="U"
+oldref="149">COS</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148803" role="paragraph" l10n="CHG" oldref="150"><ahelp hid="HID_FUNC_COS">Returns the cosine of the given angle (in radians).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150779" role="heading" level="3" l10n="U"
+oldref="151">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154213" role="code" l10n="U" oldref="152">COS(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="CHG" oldref="153"> Returns the (trigonometric) cosine of <emph>Number</emph>, the angle in radians.</paragraph>
+<paragraph xml-lang="en-US" id="par_id831019" role="paragraph" l10n="NEW">To return the cosine of an angle in degrees, use the RADIANS function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153579" role="heading" level="3" l10n="U"
+oldref="154">Examples</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147240" role="paragraph" l10n="U" oldref="155">
 <item type="input">=COS(PI()/2)</item> returns 0, the cosine of PI/2 radians.</paragraph>
-<paragraph role="paragraph" id="par_id3147516" xml-lang="en-US" l10n="U" oldref="156">
+<paragraph xml-lang="en-US" id="par_id3147516" role="paragraph" l10n="U" oldref="156">
 <item type="input">=COS(RADIANS(60))</item> returns 0.5, the cosine of 60 degrees.</paragraph><comment>see also SIN, TAN, COT, 
 ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 </section>
@@ -260,13 +284,16 @@ ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154277"><bookmark_value>COSH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_COSHYP" id="bm_id3149158" localize="false"/>
-<paragraph role="heading" id="hd_id3154277" xml-lang="en-US" level="2" l10n="U" oldref="159">COSH</paragraph>
-<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="160"><ahelp hid="HID_FUNC_COSHYP">Returns the hyperbolic cosine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149792" xml-lang="en-US" level="3" l10n="U" oldref="161">Syntax</paragraph>
-<paragraph role="code" id="par_id3166440" xml-lang="en-US" l10n="U" oldref="162">COSH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="CHG" oldref="163">Returns the hyperbolic cosine of <emph>Number</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3153234" xml-lang="en-US" level="3" l10n="U" oldref="164">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="CHG" oldref="165">
+<paragraph xml-lang="en-US" id="hd_id3154277" role="heading" level="2" l10n="U"
+oldref="159">COSH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="160"><ahelp hid="HID_FUNC_COSHYP">Returns the hyperbolic cosine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149792" role="heading" level="3" l10n="U"
+oldref="161">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166440" role="code" l10n="U" oldref="162">COSH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150710" role="paragraph" l10n="CHG" oldref="163">Returns the hyperbolic cosine of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153234" role="heading" level="3" l10n="U"
+oldref="164">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154099" role="paragraph" l10n="CHG" oldref="165">
 <item type="input">=COSH(0)</item> returns 1, the hyperbolic cosine of 0.</paragraph><comment>see also SINH, TANH, COTH,     
 ACOSH, ASINH, ATANH, ACOTH,   </comment>
 </section>
@@ -274,17 +301,20 @@ ACOSH, ASINH, ATANH, ACOTH,   </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152888"><bookmark_value>COT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_COT" id="bm_id3153392" localize="false"/>
-<paragraph role="heading" id="hd_id3152888" xml-lang="en-US" level="2" l10n="U" oldref="169">COT</paragraph>
-<paragraph role="paragraph" id="par_id3153679" xml-lang="en-US" l10n="CHG" oldref="170"><ahelp hid="HID_FUNC_COT">Returns the cotangent of the given angle (in radians).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152943" xml-lang="en-US" level="3" l10n="U" oldref="171">Syntax</paragraph>
-<paragraph role="code" id="par_id3154856" xml-lang="en-US" l10n="U" oldref="172">COT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3149969" xml-lang="en-US" l10n="CHG" oldref="173"> Returns the (trigonometric) cotangent of <emph>Number</emph>, the angle in radians.</paragraph>
-<paragraph role="paragraph" id="par_id3444624" xml-lang="en-US" l10n="NEW">To return the cotangent of an angle in degrees, use the RADIANS function.</paragraph>
-<paragraph role="paragraph" id="par_id6814477" xml-lang="en-US" l10n="NEW">The cotangent of an angle is equivalent to 1 divided by the tangent of that angle.</paragraph>
-<paragraph role="heading" id="hd_id3149800" xml-lang="en-US" level="3" l10n="U" oldref="174">Examples:</paragraph>
-<paragraph role="paragraph" id="par_id3148616" xml-lang="en-US" l10n="CHG" oldref="175">
+<paragraph xml-lang="en-US" id="hd_id3152888" role="heading" level="2" l10n="U"
+oldref="169">COT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153679" role="paragraph" l10n="CHG" oldref="170"><ahelp hid="HID_FUNC_COT">Returns the cotangent of the given angle (in radians).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152943" role="heading" level="3" l10n="U"
+oldref="171">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154856" role="code" l10n="U" oldref="172">COT(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149969" role="paragraph" l10n="CHG" oldref="173"> Returns the (trigonometric) cotangent of <emph>Number</emph>, the angle in radians.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3444624" role="paragraph" l10n="NEW">To return the cotangent of an angle in degrees, use the RADIANS function.</paragraph>
+<paragraph xml-lang="en-US" id="par_id6814477" role="paragraph" l10n="NEW">The cotangent of an angle is equivalent to 1 divided by the tangent of that angle.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149800" role="heading" level="3" l10n="U"
+oldref="174">Examples:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148616" role="paragraph" l10n="CHG" oldref="175">
 <item type="input">=COT(PI()/4)</item> returns 1, the cotangent of PI/4 radians.</paragraph>
-<paragraph role="paragraph" id="par_id3148986" xml-lang="en-US" l10n="CHG" oldref="176">
+<paragraph xml-lang="en-US" id="par_id3148986" role="paragraph" l10n="CHG" oldref="176">
 <item type="input">=COT(RADIANS(45))</item> returns 1, the cotangent of 45 degrees.</paragraph><comment>see also COS, SIN, TAN, 
 ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 </section>
@@ -292,13 +322,16 @@ ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154337"><bookmark_value>COTH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_COTHYP" id="bm_id3148650" localize="false"/>
-<paragraph role="heading" id="hd_id3154337" xml-lang="en-US" level="2" l10n="U" oldref="178">COTH</paragraph>
-<paragraph role="paragraph" id="par_id3149419" xml-lang="en-US" l10n="U" oldref="179"><ahelp hid="HID_FUNC_COTHYP">Returns the hyperbolic cotangent of a given number (angle).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149242" xml-lang="en-US" level="3" l10n="U" oldref="180">Syntax</paragraph>
-<paragraph role="code" id="par_id3143280" xml-lang="en-US" l10n="U" oldref="181">COTH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154799" xml-lang="en-US" l10n="CHG" oldref="182"> Returns the hyperbolic cotangent of <emph>Number</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3155422" xml-lang="en-US" level="3" l10n="U" oldref="183">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144754" xml-lang="en-US" l10n="CHG" oldref="184">
+<paragraph xml-lang="en-US" id="hd_id3154337" role="heading" level="2" l10n="U"
+oldref="178">COTH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149419" role="paragraph" l10n="U" oldref="179"><ahelp hid="HID_FUNC_COTHYP">Returns the hyperbolic cotangent of a given number (angle).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149242" role="heading" level="3" l10n="U"
+oldref="180">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143280" role="code" l10n="U" oldref="181">COTH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154799" role="paragraph" l10n="CHG" oldref="182"> Returns the hyperbolic cotangent of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155422" role="heading" level="3" l10n="U"
+oldref="183">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144754" role="paragraph" l10n="CHG" oldref="184">
 <item type="input">=COTH(1)</item> returns the hyperbolic cotangent of 1, approximately 1.3130.</paragraph><comment>see also COSH, SINH, TANH,     
 ACOSH, ASINH, ATANH, ACOTH,   </comment>
 </section>
@@ -307,28 +340,31 @@ ACOSH, ASINH, ATANH, ACOTH,   </comment>
 <bookmark_value>converting;radians, into degrees</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DEG" id="bm_id3153946" localize="false"/>
-<paragraph role="heading" id="hd_id3145314" xml-lang="en-US" level="2" l10n="U" oldref="188">DEGREES</paragraph>
-<paragraph role="paragraph" id="par_id3149939" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="HID_FUNC_DEG">Converts radians into degrees.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150623" xml-lang="en-US" level="3" l10n="U" oldref="190">Syntax</paragraph>
-<paragraph role="code" id="par_id3145600" xml-lang="en-US" l10n="CHG" oldref="191">DEGREES(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3149484" xml-lang="en-US" l10n="CHG" oldref="192">
-<emph>Number</emph> is the angle in radians to be converted to degrees.</paragraph>
-<paragraph role="heading" id="hd_id3669545" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id3459578" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="hd_id3145314" role="heading" level="2" l10n="U"
+oldref="188">DEGREES</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149939" role="paragraph" l10n="U" oldref="189"><ahelp hid="HID_FUNC_DEG">Converts radians into degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150623" role="heading" level="3" l10n="U"
+oldref="190">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145600" role="code" l10n="CHG" oldref="191">DEGREES(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149484" role="paragraph" l10n="CHG" oldref="192"><emph>Number</emph> is the angle in radians to be converted to degrees.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3669545" role="heading" level="3" l10n="NEW">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3459578" role="paragraph" l10n="NEW">
 <item type="input">=DEGREES(PI())</item> returns 180 degrees.</paragraph><comment>see also RADIANS</comment>
 </section>
 <section id="Section47">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148698"><bookmark_value>EXP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_EXP" id="bm_id3154625" localize="false"/>
-<paragraph role="heading" id="hd_id3148698" xml-lang="en-US" level="2" l10n="U" oldref="198">EXP</paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="CHG" oldref="199"><ahelp hid="HID_FUNC_EXP">Returns e raised to the power of a number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
-<paragraph role="heading" id="hd_id3150351" xml-lang="en-US" level="3" l10n="U" oldref="200">Syntax</paragraph>
-<paragraph role="code" id="par_id3146786" xml-lang="en-US" l10n="U" oldref="201">EXP(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="202">
-<emph>Number</emph> is the power to which e is to be raised.</paragraph>
-<paragraph role="heading" id="hd_id3154418" xml-lang="en-US" level="3" l10n="U" oldref="203">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="CHG" oldref="204">
+<paragraph xml-lang="en-US" id="hd_id3148698" role="heading" level="2" l10n="U"
+oldref="198">EXP</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="199"><ahelp hid="HID_FUNC_EXP">Returns e raised to the power of a number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150351" role="heading" level="3" l10n="U"
+oldref="200">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146786" role="code" l10n="U" oldref="201">EXP(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155608" role="paragraph" l10n="U" oldref="202"><emph>Number</emph> is the power to which e is to be raised.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154418" role="heading" level="3" l10n="U"
+oldref="203">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156340" role="paragraph" l10n="CHG" oldref="204">
 <item type="input">=EXP(1)</item> returns 2.71828182845904, the mathematical constant e to Calc's accuracy.</paragraph><comment>see also POWER,  LN,   </comment>
 </section>
 <section id="Section46">
@@ -336,17 +372,20 @@ ACOSH, ASINH, ATANH, ACOTH,   </comment>
 <bookmark_value>factorials;numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FAKULTAET" id="bm_id3153886" localize="false"/>
-<paragraph role="heading" id="hd_id3145781" xml-lang="en-US" level="2" l10n="U" oldref="208">FACT</paragraph>
-<paragraph role="paragraph" id="par_id3151109" xml-lang="en-US" l10n="CHG" oldref="209"><ahelp hid="HID_FUNC_FAKULTAET">Returns the factorial of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="3" l10n="U" oldref="210">Syntax</paragraph>
-<paragraph role="code" id="par_id3154661" xml-lang="en-US" l10n="U" oldref="211">FACT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="CHG" oldref="212"> Returns Number!, the factorial of <emph>Number</emph>, calculated as 1*2*3*4* ... * Number.</paragraph>
-<paragraph role="paragraph" id="par_id3834650" xml-lang="en-US" l10n="NEW">=FACT(0) returns 1 by definition. </paragraph>
-<paragraph role="paragraph" id="par_id8429517" xml-lang="en-US" l10n="NEW">The factorial of a negative number returns the "invalid argument" error.</paragraph>
-<paragraph role="heading" id="hd_id3154569" xml-lang="en-US" level="3" l10n="U" oldref="213">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154476" xml-lang="en-US" l10n="CHG" oldref="216">
+<paragraph xml-lang="en-US" id="hd_id3145781" role="heading" level="2" l10n="U"
+oldref="208">FACT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151109" role="paragraph" l10n="CHG" oldref="209"><ahelp hid="HID_FUNC_FAKULTAET">Returns the factorial of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="3" l10n="U"
+oldref="210">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154661" role="code" l10n="U" oldref="211">FACT(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152952" role="paragraph" l10n="CHG" oldref="212"> Returns Number!, the factorial of <emph>Number</emph>, calculated as 1*2*3*4* ... * Number.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3834650" role="paragraph" l10n="NEW">=FACT(0) returns 1 by definition. </paragraph>
+<paragraph xml-lang="en-US" id="par_id8429517" role="paragraph" l10n="NEW">The factorial of a negative number returns the "invalid argument" error.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154569" role="heading" level="3" l10n="U"
+oldref="213">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154476" role="paragraph" l10n="CHG" oldref="216">
 <item type="input">=FACT(3)</item> returns 6.</paragraph>
-<paragraph role="paragraph" id="par_id3147525" xml-lang="en-US" l10n="CHG" oldref="214">
+<paragraph xml-lang="en-US" id="par_id3147525" role="paragraph" l10n="CHG" oldref="214">
 <item type="input">=FACT(0)</item> returns 1.</paragraph><comment>see also FACTDOUBLE, MULTINOMIAL, PRODUCT  </comment>
 </section>
 <section id="Section45">
@@ -355,16 +394,19 @@ ACOSH, ASINH, ATANH, ACOTH,   </comment>
 <bookmark_value>rounding;down to next integer</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GANZZAHL" id="bm_id3151311" localize="false"/>
-<paragraph role="heading" id="hd_id3159084" xml-lang="en-US" level="2" l10n="U" oldref="218">INT</paragraph>
-<paragraph role="paragraph" id="par_id3158441" xml-lang="en-US" l10n="U" oldref="219"><ahelp hid="HID_FUNC_GANZZAHL">Rounds a number down to the nearest integer.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146132" xml-lang="en-US" level="3" l10n="U" oldref="220">Syntax</paragraph>
-<paragraph role="code" id="par_id3156146" xml-lang="en-US" l10n="U" oldref="221">INT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154117" xml-lang="en-US" l10n="CHG" oldref="222">Returns <emph>Number</emph> rounded down to the nearest integer.</paragraph>
-<paragraph role="paragraph" id="par_id153508" xml-lang="en-US" l10n="NEW">Negative numbers round down to the integer below.</paragraph>
-<paragraph role="heading" id="hd_id3155118" xml-lang="en-US" level="3" l10n="U" oldref="223">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156267" xml-lang="en-US" l10n="CHG" oldref="224">
+<paragraph xml-lang="en-US" id="hd_id3159084" role="heading" level="2" l10n="U"
+oldref="218">INT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158441" role="paragraph" l10n="U" oldref="219"><ahelp hid="HID_FUNC_GANZZAHL">Rounds a number down to the nearest integer.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146132" role="heading" level="3" l10n="U"
+oldref="220">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156146" role="code" l10n="U" oldref="221">INT(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154117" role="paragraph" l10n="CHG" oldref="222">Returns <emph>Number</emph> rounded down to the nearest integer.</paragraph>
+<paragraph xml-lang="en-US" id="par_id153508" role="paragraph" l10n="NEW">Negative numbers round down to the integer below.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155118" role="heading" level="3" l10n="U"
+oldref="223">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156267" role="paragraph" l10n="CHG" oldref="224">
 <item type="input">=INT(5.7)</item> returns 5.</paragraph>
-<paragraph role="paragraph" id="par_id3147323" xml-lang="en-US" l10n="CHG" oldref="225">
+<paragraph xml-lang="en-US" id="par_id3147323" role="paragraph" l10n="CHG" oldref="225">
 <item type="input">=INT(-1.3)</item> returns -2.</paragraph><comment>see also TRUNC, ROUND, ROUNDDOWN, ROUNDUP,    
 CEILING, FLOOR, EVEN, ODD, MROUND,  </comment>
 </section>
@@ -374,19 +416,22 @@ CEILING, FLOOR, EVEN, ODD, MROUND,  </comment>
 <bookmark_value>rounding;up/down to even integers</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GERADE" id="bm_id3150949" localize="false"/>
-<paragraph role="heading" id="hd_id3150938" xml-lang="en-US" level="2" l10n="U" oldref="227">EVEN</paragraph>
-<paragraph role="paragraph" id="par_id3149988" xml-lang="en-US" l10n="CHG" oldref="228"><ahelp hid="HID_FUNC_GERADE">Rounds a positive number up to the next even integer and a negative number down to the next even integer.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148401" xml-lang="en-US" level="3" l10n="U" oldref="229">Syntax</paragraph>
-<paragraph role="code" id="par_id3150830" xml-lang="en-US" l10n="U" oldref="230">EVEN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3153350" xml-lang="en-US" l10n="CHG" oldref="231"> Returns <emph>Number</emph> rounded to the next even integer up, away from zero. </paragraph>
-<paragraph role="heading" id="hd_id3155508" xml-lang="en-US" level="3" l10n="U" oldref="232">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3154361" xml-lang="en-US" l10n="CHG" oldref="233">
+<paragraph xml-lang="en-US" id="hd_id3150938" role="heading" level="2" l10n="U"
+oldref="227">EVEN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149988" role="paragraph" l10n="CHG" oldref="228"><ahelp hid="HID_FUNC_GERADE">Rounds a positive number up to the next even integer and a negative number down to the next even integer.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148401" role="heading" level="3" l10n="U"
+oldref="229">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150830" role="code" l10n="U" oldref="230">EVEN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153350" role="paragraph" l10n="CHG" oldref="231"> Returns <emph>Number</emph> rounded to the next even integer up, away from zero. </paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155508" role="heading" level="3" l10n="U"
+oldref="232">Examples</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154361" role="paragraph" l10n="CHG" oldref="233">
 <item type="input">=EVEN(2.3)</item> returns 4.</paragraph>
-<paragraph role="paragraph" id="par_id8477736" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id8477736" role="paragraph" l10n="NEW">
 <item type="input">=EVEN(2)</item> returns 2.</paragraph>
-<paragraph role="paragraph" id="par_id159611" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id159611" role="paragraph" l10n="NEW">
 <item type="input">=EVEN(0)</item> returns 0.</paragraph>
-<paragraph role="paragraph" id="par_id6097598" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id6097598" role="paragraph" l10n="NEW">
 <item type="input">=EVEN(-0.5)</item> returns -2.</paragraph><comment>see also CEILING, FLOOR, ODD, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 </section>
@@ -395,32 +440,36 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>greatest common divisor</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GGT" id="bm_id3149737" localize="false"/>
-<paragraph role="heading" id="hd_id3147356" xml-lang="en-US" level="2" l10n="U" oldref="237">GCD</paragraph>
-<paragraph role="paragraph" id="par_id3152465" xml-lang="en-US" l10n="U" oldref="238"><ahelp hid="HID_FUNC_GGT">Returns the greatest common divisor of two or more integers.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2769249" xml-lang="en-US" l10n="NEW">The greatest common divisor is the positive largest integer which will divide, without remainder, each of the given integers.</paragraph>
-<paragraph role="heading" id="hd_id3150643" xml-lang="en-US" level="3" l10n="U" oldref="239">Syntax</paragraph>
-<paragraph role="code" id="par_id3154524" xml-lang="en-US" l10n="U" oldref="240">GCD(Integer1; Integer2; ...; Integer30)</paragraph>
-<paragraph role="paragraph" id="par_id3149340" xml-lang="en-US" l10n="U" oldref="241">
-<emph>Integer1 To 30</emph> are up to 30 integers whose greatest common divisor is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3147317" xml-lang="en-US" level="3" l10n="U" oldref="242">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151285" xml-lang="en-US" l10n="CHG" oldref="243">
+<paragraph xml-lang="en-US" id="hd_id3147356" role="heading" level="2" l10n="U"
+oldref="237">GCD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152465" role="paragraph" l10n="U" oldref="238"><ahelp hid="HID_FUNC_GGT">Returns the greatest common divisor of two or more integers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id2769249" role="paragraph" l10n="NEW">The greatest common divisor is the positive largest integer which will divide, without remainder, each of the given integers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150643" role="heading" level="3" l10n="U"
+oldref="239">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154524" role="code" l10n="U" oldref="240">GCD(Integer1; Integer2; ...; Integer30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149340" role="paragraph" l10n="U" oldref="241"><emph>Integer1 To 30</emph> are up to 30 integers whose greatest common divisor is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147317" role="heading" level="3" l10n="U"
+oldref="242">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151285" role="paragraph" l10n="CHG" oldref="243">
 <item type="input">=GCD(16;32;24) </item>gives the result 8, because 8 is the largest number that can divide 16, 24 and 32 without a remainder.</paragraph>
-<paragraph role="paragraph" id="par_id1604663" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1604663" role="paragraph" l10n="NEW">
 <item type="input">=GCD(B1:B3)</item> where cells B1, B2, B3 contain <item type="input">9</item>, <item type="input">12</item>, <item type="input">9</item> gives 3.</paragraph>
 </section>
 <section id="Section42">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151221"><bookmark_value>GCD_ADD function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_GCD" id="bm_id3147578" localize="false"/>
-<paragraph role="heading" id="hd_id3151221" xml-lang="en-US" level="2" l10n="E" oldref="677">GCD_ADD</paragraph>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="678"><ahelp hid="HID_AAI_FUNC_GCD"> The result is the greatest common divisor of a list of numbers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151221" role="heading" level="2" l10n="E"
+oldref="677">GCD_ADD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153257" role="paragraph" l10n="U" oldref="678"><ahelp hid="HID_AAI_FUNC_GCD"> The result is the greatest common divisor of a list of numbers.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-<paragraph role="heading" id="hd_id3147548" xml-lang="en-US" level="3" l10n="U" oldref="679">Syntax</paragraph>
-<paragraph role="code" id="par_id3156205" xml-lang="en-US" l10n="U" oldref="680">GCD_ADD(Number(s))</paragraph>
-<paragraph role="paragraph" id="par_id3145150" xml-lang="en-US" l10n="U" oldref="681">
-<emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-<paragraph role="heading" id="hd_id3150239" xml-lang="en-US" level="3" l10n="U" oldref="682">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159192" xml-lang="en-US" l10n="U" oldref="683">
+<paragraph xml-lang="en-US" id="hd_id3147548" role="heading" level="3" l10n="U"
+oldref="679">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156205" role="code" l10n="U" oldref="680">GCD_ADD(Number(s))</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145150" role="paragraph" l10n="U" oldref="681"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150239" role="heading" level="3" l10n="U"
+oldref="682">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159192" role="paragraph" l10n="U" oldref="683">
 <item type="input">=GCD_ADD(5;15;25)</item> returns 5.</paragraph>
 </section>
 <section id="Section41">
@@ -428,23 +477,25 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>even integers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTGERADE" id="bm_id3149430" localize="false"/>
-<paragraph role="heading" id="hd_id3156048" xml-lang="en-US" level="2" l10n="U" oldref="245">ISEVEN<comment>link from Information cat</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="246"><ahelp hid="HID_FUNC_ISTGERADE">Returns TRUE if the value is an even integer, or FALSE if the value is odd.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146928" xml-lang="en-US" level="3" l10n="U" oldref="247">Syntax</paragraph>
-<paragraph role="code" id="par_id3151203" xml-lang="en-US" l10n="U" oldref="248">ISEVEN(Value)</paragraph>
-<paragraph role="paragraph" id="par_id3150491" xml-lang="en-US" l10n="U" oldref="249">
-<emph>Value</emph> is the value to be checked.</paragraph>
-<paragraph role="paragraph" id="par_id3445844" xml-lang="en-US" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
-<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="3" l10n="U" oldref="250">Example</paragraph>
-<paragraph role="paragraph" id="par_id3163813" xml-lang="en-US" l10n="CHG" oldref="251">
+<paragraph xml-lang="en-US" id="hd_id3156048" role="heading" level="2" l10n="U"
+oldref="245">ISEVEN<comment>link from Information cat</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3149169" role="paragraph" l10n="U" oldref="246"><ahelp hid="HID_FUNC_ISTGERADE">Returns TRUE if the value is an even integer, or FALSE if the value is odd.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146928" role="heading" level="3" l10n="U"
+oldref="247">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151203" role="code" l10n="U" oldref="248">ISEVEN(Value)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150491" role="paragraph" l10n="U" oldref="249"><emph>Value</emph> is the value to be checked.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3445844" role="paragraph" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154136" role="heading" level="3" l10n="U"
+oldref="250">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163813" role="paragraph" l10n="CHG" oldref="251">
 <item type="input">=ISEVEN(48)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id8378856" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id8378856" role="paragraph" l10n="NEW">
 <item type="input">=ISEVEN(33)</item> returns FALSE</paragraph>
-<paragraph role="paragraph" id="par_id7154759" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id7154759" role="paragraph" l10n="NEW">
 <item type="input">=ISEVEN(0)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id1912289" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1912289" role="paragraph" l10n="NEW">
 <item type="input">=ISEVEN(-2.1)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id5627307" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5627307" role="paragraph" l10n="NEW">
 <item type="input">=ISEVEN(3.999)</item> returns FALSE</paragraph><comment>see also ISODD  </comment>
 </section>
 <section id="Section40">
@@ -452,21 +503,23 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>odd integers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTUNGERADE" id="bm_id3149298" localize="false"/>
-<paragraph role="heading" id="hd_id3156034" xml-lang="en-US" level="2" l10n="U" oldref="255">ISODD<comment>link from Information cat</comment></paragraph>
-<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="256"><ahelp hid="HID_FUNC_ISTUNGERADE">Returns TRUE if the value is odd, or FALSE if the number is even.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151006" xml-lang="en-US" level="3" l10n="U" oldref="257">Syntax</paragraph>
-<paragraph role="code" id="par_id3151375" xml-lang="en-US" l10n="U" oldref="258">ISODD(value)</paragraph>
-<paragraph role="paragraph" id="par_id3155139" xml-lang="en-US" l10n="U" oldref="259">
-<emph>Value</emph> is the value to be checked.</paragraph>
-<paragraph role="paragraph" id="par_id9027680" xml-lang="en-US" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
-<paragraph role="heading" id="hd_id3163723" xml-lang="en-US" level="3" l10n="U" oldref="260">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155345" xml-lang="en-US" l10n="CHG" oldref="261">
+<paragraph xml-lang="en-US" id="hd_id3156034" role="heading" level="2" l10n="U"
+oldref="255">ISODD<comment>link from Information cat</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155910" role="paragraph" l10n="U" oldref="256"><ahelp hid="HID_FUNC_ISTUNGERADE">Returns TRUE if the value is odd, or FALSE if the number is even.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151006" role="heading" level="3" l10n="U"
+oldref="257">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151375" role="code" l10n="U" oldref="258">ISODD(value)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155139" role="paragraph" l10n="U" oldref="259"><emph>Value</emph> is the value to be checked.</paragraph>
+<paragraph xml-lang="en-US" id="par_id9027680" role="paragraph" l10n="NEW">If Value is not an integer any digits after the decimal point are ignored. The sign of Value is also ignored.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163723" role="heading" level="3" l10n="U"
+oldref="260">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155345" role="paragraph" l10n="CHG" oldref="261">
 <item type="input">=ISODD(33)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id9392986" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id9392986" role="paragraph" l10n="NEW">
 <item type="input">=ISODD(48)</item> returns FALSE</paragraph>
-<paragraph role="paragraph" id="par_id5971251" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5971251" role="paragraph" l10n="NEW">
 <item type="input">=ISODD(3.999)</item> returns TRUE</paragraph>
-<paragraph role="paragraph" id="par_id4136478" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id4136478" role="paragraph" l10n="NEW">
 <item type="input">=ISODD(-3.1)</item> returns TRUE</paragraph><comment>see also ISEVEN</comment>
 </section>
 <section id="Section39">
@@ -475,28 +528,32 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>lowest common multiples</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KGV" id="bm_id3145225" localize="false"/>
-<paragraph role="heading" id="hd_id3145213" xml-lang="en-US" level="2" l10n="U" oldref="265">LCM</paragraph>
-<paragraph role="paragraph" id="par_id3146814" xml-lang="en-US" l10n="U" oldref="266"><ahelp hid="HID_FUNC_KGV">Returns the least common multiple of one or more integers.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148632" xml-lang="en-US" level="3" l10n="U" oldref="267">Syntax</paragraph>
-<paragraph role="code" id="par_id3147279" xml-lang="en-US" l10n="U" oldref="268">LCM(Integer1; Integer2; ...; Integer30)</paragraph>
-<paragraph role="paragraph" id="par_id3156348" xml-lang="en-US" l10n="U" oldref="269">
-<emph>Integer1 to 30</emph> are up to 30 integers whose lowest common multiple is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3156431" xml-lang="en-US" level="3" l10n="U" oldref="270">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154914" xml-lang="en-US" l10n="U" oldref="271">If you enter the numbers <item type="input">512</item>;<item type="input">1024</item> and <item type="input">2000</item> in the Integer 1;2 and 3 text boxes, 128000 will be returned as the result.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145213" role="heading" level="2" l10n="U"
+oldref="265">LCM</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146814" role="paragraph" l10n="U" oldref="266"><ahelp hid="HID_FUNC_KGV">Returns the least common multiple of one or more integers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148632" role="heading" level="3" l10n="U"
+oldref="267">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147279" role="code" l10n="U" oldref="268">LCM(Integer1; Integer2; ...; Integer30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156348" role="paragraph" l10n="U" oldref="269"><emph>Integer1 to 30</emph> are up to 30 integers whose lowest common multiple is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156431" role="heading" level="3" l10n="U"
+oldref="270">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154914" role="paragraph" l10n="U" oldref="271">If you enter the numbers <item type="input">512</item>;<item type="input">1024</item> and <item type="input">2000</item> in the Integer 1;2 and 3 text boxes, 128000 will be returned as the result.</paragraph>
 </section>
 <section id="Section38">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154230"><bookmark_value>LCM_ADD function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_LCM" id="bm_id3147222" localize="false"/>
-<paragraph role="heading" id="hd_id3154230" xml-lang="en-US" level="2" l10n="U" oldref="684">LCM_ADD</paragraph>
-<paragraph role="paragraph" id="par_id3149036" xml-lang="en-US" l10n="U" oldref="685"><ahelp hid="HID_AAI_FUNC_LCM"> The result is the lowest common multiple of a list of numbers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154230" role="heading" level="2" l10n="U"
+oldref="684">LCM_ADD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149036" role="paragraph" l10n="U" oldref="685"><ahelp hid="HID_AAI_FUNC_LCM"> The result is the lowest common multiple of a list of numbers.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-<paragraph role="heading" id="hd_id3153132" xml-lang="en-US" level="3" l10n="U" oldref="686">Syntax</paragraph>
-<paragraph role="code" id="par_id3154395" xml-lang="en-US" l10n="U" oldref="687">LCM_ADD(Number(s))</paragraph>
-<paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="688">
-<emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-<paragraph role="heading" id="hd_id3145122" xml-lang="en-US" level="3" l10n="U" oldref="689">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="690">
+<paragraph xml-lang="en-US" id="hd_id3153132" role="heading" level="3" l10n="U"
+oldref="686">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154395" role="code" l10n="U" oldref="687">LCM_ADD(Number(s))</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147377" role="paragraph" l10n="U" oldref="688"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145122" role="heading" level="3" l10n="U"
+oldref="689">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145135" role="paragraph" l10n="U" oldref="690">
 <item type="input">=LCM_ADD(5;15;25)</item> returns 75.</paragraph>
 </section>
 <section id="Section37">
@@ -504,18 +561,19 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>number of combinations</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KOMBINATIONEN" id="bm_id3155077" localize="false"/>
-<paragraph role="heading" id="hd_id3155802" xml-lang="en-US" level="2" l10n="U" oldref="273">COMBIN<comment>should be statistical--&gt;add a link there</comment></paragraph>
-<paragraph role="paragraph" id="par_id3156172" xml-lang="en-US" l10n="CHG" oldref="274"><ahelp hid="HID_FUNC_KOMBINATIONEN">Returns the number of combinations for elements without repetition.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="275">Syntax</paragraph>
-<paragraph role="code" id="par_id3150223" xml-lang="en-US" l10n="CHG" oldref="276">COMBIN(Count1; Count2)</paragraph>
-<paragraph role="paragraph" id="par_id3150313" xml-lang="en-US" l10n="CHG" oldref="277">
-<emph>Count1</emph> is the number of items in the set.</paragraph>
-<paragraph role="paragraph" id="par_id3153830" xml-lang="en-US" l10n="CHG" oldref="278">
-<emph>Count2</emph> is the number of items to choose from the set.</paragraph>
-<paragraph role="paragraph" id="par_id6807458" xml-lang="en-US" l10n="CHG">COMBIN returns the number of ordered ways to choose these items. For example if there are 3 items A, B and C in a set, you can choose 2 items in 3 different ways, namely AB, AC and BC.</paragraph>
-<paragraph role="paragraph" id="par_id7414471" xml-lang="en-US" l10n="NEW">COMBIN implements the formula: Count1!/(Count2!*(Count1-Count2)!)</paragraph>
-<paragraph role="heading" id="hd_id3153171" xml-lang="en-US" level="3" l10n="U" oldref="279">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153517" xml-lang="en-US" l10n="CHG" oldref="280">
+<paragraph xml-lang="en-US" id="hd_id3155802" role="heading" level="2" l10n="U"
+oldref="273">COMBIN<comment>should be statistical--&gt;add a link there</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3156172" role="paragraph" l10n="CHG" oldref="274"><ahelp hid="HID_FUNC_KOMBINATIONEN">Returns the number of combinations for elements without repetition.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156193" role="heading" level="3" l10n="U"
+oldref="275">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150223" role="code" l10n="CHG" oldref="276">COMBIN(Count1; Count2)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150313" role="paragraph" l10n="CHG" oldref="277"><emph>Count1</emph> is the number of items in the set.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153830" role="paragraph" l10n="CHG" oldref="278"><emph>Count2</emph> is the number of items to choose from the set.</paragraph>
+<paragraph xml-lang="en-US" id="par_id6807458" role="paragraph" l10n="CHG">COMBIN returns the number of ordered ways to choose these items. For example if there are 3 items A, B and C in a set, you can choose 2 items in 3 different ways, namely AB, AC and BC.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7414471" role="paragraph" l10n="NEW">COMBIN implements the formula: Count1!/(Count2!*(Count1-Count2)!)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153171" role="heading" level="3" l10n="U"
+oldref="279">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153517" role="paragraph" l10n="CHG" oldref="280">
 <item type="input">=COMBIN(3;2)</item> returns 3.</paragraph><comment>see also COMBINA  </comment>
 </section>
 <section id="Section36">
@@ -523,18 +581,19 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>number of combinations with repetitions</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KOMBINATIONEN2" id="bm_id3150295" localize="false"/>
-<paragraph role="heading" id="hd_id3150284" xml-lang="en-US" level="2" l10n="U" oldref="282">COMBINA<comment>should be statistical--&gt;add a link there</comment></paragraph>
-<paragraph role="paragraph" id="par_id3157894" xml-lang="en-US" l10n="CHG" oldref="283"><ahelp hid="HID_FUNC_KOMBINATIONEN2">Returns the number of combinations of a subset of items including repetitions.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145752" xml-lang="en-US" level="3" l10n="U" oldref="284">Syntax</paragraph>
-<paragraph role="code" id="par_id3145765" xml-lang="en-US" l10n="CHG" oldref="285">COMBINA(Count1; Count2)</paragraph>
-<paragraph role="paragraph" id="par_id3153372" xml-lang="en-US" l10n="CHG" oldref="286">
-<emph>Count1</emph> is the number of items in the set.</paragraph>
-<paragraph role="paragraph" id="par_id3155544" xml-lang="en-US" l10n="CHG" oldref="287">
-<emph>Count2</emph> is the number of items to choose from the set.</paragraph>
-<paragraph role="paragraph" id="par_id1997131" xml-lang="en-US" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AB, BA, AC, CA, BC and CB.</paragraph>
-<paragraph role="paragraph" id="par_id2052064" xml-lang="en-US" l10n="CHG">COMBINA implements the formula: (Count1+Count2-1)! / (Count2!(Count1-1)!)<comment>i88052</comment></paragraph>
-<paragraph role="heading" id="hd_id3154584" xml-lang="en-US" level="3" l10n="U" oldref="288">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152904" xml-lang="en-US" l10n="CHG" oldref="289">
+<paragraph xml-lang="en-US" id="hd_id3150284" role="heading" level="2" l10n="U"
+oldref="282">COMBINA<comment>should be statistical--&gt;add a link there</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3157894" role="paragraph" l10n="CHG" oldref="283"><ahelp hid="HID_FUNC_KOMBINATIONEN2">Returns the number of combinations of a subset of items including repetitions.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145752" role="heading" level="3" l10n="U"
+oldref="284">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145765" role="code" l10n="CHG" oldref="285">COMBINA(Count1; Count2)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153372" role="paragraph" l10n="CHG" oldref="286"><emph>Count1</emph> is the number of items in the set.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155544" role="paragraph" l10n="CHG" oldref="287"><emph>Count2</emph> is the number of items to choose from the set.</paragraph>
+<paragraph xml-lang="en-US" id="par_id1997131" role="paragraph" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AA, AB, AC, BB, BC and CC.</paragraph>
+<paragraph xml-lang="en-US" id="par_id2052064" role="paragraph" l10n="CHG">COMBINA implements the formula: (Count1+Count2-1)! / (Count2!(Count1-1)!)<comment>i88052</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154584" role="heading" level="3" l10n="U"
+oldref="288">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152904" role="paragraph" l10n="CHG" oldref="289">
 <item type="input">=COMBINA(3;2)</item> returns 6.</paragraph><comment>see also COMBIN</comment>
 </section>
 <section id="Section35">
@@ -542,18 +601,21 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>decimal places;cutting off</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KUERZEN" id="bm_id3157849" localize="false"/>
-<paragraph role="heading" id="hd_id3156086" xml-lang="en-US" level="2" l10n="U" oldref="291">TRUNC</paragraph>
-<paragraph role="paragraph" id="par_id3157866" xml-lang="en-US" l10n="CHG" oldref="292"><ahelp hid="HID_FUNC_KUERZEN">Truncates a number by removing decimal places.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148499" xml-lang="en-US" level="3" l10n="U" oldref="293">Syntax</paragraph>
-<paragraph role="code" id="par_id3148511" xml-lang="en-US" l10n="U" oldref="294">TRUNC(Number; Count)</paragraph>
-<paragraph role="paragraph" id="par_id3150796" xml-lang="en-US" l10n="CHG" oldref="295">Returns <emph>Number</emph> with at most <emph>Count</emph> decimal places. Excess decimal places are simply removed, irrespective of sign.</paragraph>
-<paragraph role="paragraph" id="par_id3150816" xml-lang="en-US" l10n="CHG" oldref="296">
+<paragraph xml-lang="en-US" id="hd_id3156086" role="heading" level="2" l10n="U"
+oldref="291">TRUNC</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157866" role="paragraph" l10n="CHG" oldref="292"><ahelp hid="HID_FUNC_KUERZEN">Truncates a number by removing decimal places.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148499" role="heading" level="3" l10n="U"
+oldref="293">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148511" role="code" l10n="U" oldref="294">TRUNC(Number; Count)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150796" role="paragraph" l10n="CHG" oldref="295">Returns <emph>Number</emph> with at most <emph>Count</emph> decimal places. Excess decimal places are simply removed, irrespective of sign.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150816" role="paragraph" l10n="CHG" oldref="296">
 <item type="literal">TRUNC(Number; 0)</item> behaves as <item type="literal">INT(Number)</item> for positive numbers, but effectively rounds towards zero for negative numbers.</paragraph>
-<paragraph role="warning" id="par_id3148548" xml-lang="en-US" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.</paragraph>
-<paragraph role="heading" id="hd_id3152555" xml-lang="en-US" level="3" l10n="U" oldref="297">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152569" xml-lang="en-US" l10n="CHG" oldref="298">
+<paragraph xml-lang="en-US" id="par_id3148548" role="warning" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152555" role="heading" level="3" l10n="U"
+oldref="297">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152569" role="paragraph" l10n="CHG" oldref="298">
 <item type="input">=TRUNC(1.239;2)</item> returns 1.23. The 9 is lost.</paragraph>
-<paragraph role="paragraph" id="par_id7050080" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id7050080" role="paragraph" l10n="NEW">
 <item type="input">=TRUNC(-1.234999;3)</item> returns -1.234. All the 9s are lost.</paragraph><comment>see also INT, ROUND, ROUNDDOWN, ROUNDUP,    
 CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 </section>
@@ -562,16 +624,18 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark_value>natural logarithm</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_LN" id="bm_id3153613" localize="false"/>
-<paragraph role="heading" id="hd_id3153601" xml-lang="en-US" level="2" l10n="U" oldref="301">LN</paragraph>
-<paragraph role="paragraph" id="par_id3154974" xml-lang="en-US" l10n="CHG" oldref="302"><ahelp hid="HID_FUNC_LN">Returns the natural logarithm based on the constant e of a number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
-<paragraph role="heading" id="hd_id3154993" xml-lang="en-US" level="3" l10n="U" oldref="303">Syntax</paragraph>
-<paragraph role="code" id="par_id3155284" xml-lang="en-US" l10n="U" oldref="304">LN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3155297" xml-lang="en-US" l10n="U" oldref="305">
-<emph>Number</emph> is the value whose natural logarithm is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3153852" xml-lang="en-US" level="3" l10n="U" oldref="306">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153866" xml-lang="en-US" l10n="CHG" oldref="307">
+<paragraph xml-lang="en-US" id="hd_id3153601" role="heading" level="2" l10n="U"
+oldref="301">LN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154974" role="paragraph" l10n="CHG" oldref="302"><ahelp hid="HID_FUNC_LN">Returns the natural logarithm based on the constant e of a number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154993" role="heading" level="3" l10n="U"
+oldref="303">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155284" role="code" l10n="U" oldref="304">LN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155297" role="paragraph" l10n="U" oldref="305"><emph>Number</emph> is the value whose natural logarithm is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153852" role="heading" level="3" l10n="U"
+oldref="306">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153866" role="paragraph" l10n="CHG" oldref="307">
 <item type="input">=LN(3)</item> returns the natural logarithm of 3 (approximately 1.0986).</paragraph>
-<paragraph role="paragraph" id="par_id5747245" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5747245" role="paragraph" l10n="NEW">
 <item type="input">=LN(EXP(321))</item> returns 321.</paragraph><comment>see also LOG, LOG10, EXP,  </comment>
 </section>
 <section id="Section33">
@@ -579,18 +643,19 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark_value>logarithms</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOG" id="bm_id3109824" localize="false"/>
-<paragraph role="heading" id="hd_id3109813" xml-lang="en-US" level="2" l10n="U" oldref="311">LOG</paragraph>
-<paragraph role="paragraph" id="par_id3109841" xml-lang="en-US" l10n="U" oldref="312"><ahelp hid="HID_FUNC_LOG">Returns the logarithm of a number to the specified base.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3144719" xml-lang="en-US" level="3" l10n="U" oldref="313">Syntax</paragraph>
-<paragraph role="code" id="par_id3144732" xml-lang="en-US" l10n="U" oldref="314">LOG(Number; Base)</paragraph>
-<paragraph role="paragraph" id="par_id3144746" xml-lang="en-US" l10n="U" oldref="315">
-<emph>Number</emph> is the value whose logarithm is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3152840" xml-lang="en-US" l10n="U" oldref="316">
-<emph>Base</emph> is the base for the logarithm calculation.</paragraph>
-<paragraph role="heading" id="hd_id3152860" xml-lang="en-US" level="3" l10n="U" oldref="317">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154429" xml-lang="en-US" l10n="CHG" oldref="318">
+<paragraph xml-lang="en-US" id="hd_id3109813" role="heading" level="2" l10n="U"
+oldref="311">LOG</paragraph>
+<paragraph xml-lang="en-US" id="par_id3109841" role="paragraph" l10n="U" oldref="312"><ahelp hid="HID_FUNC_LOG">Returns the logarithm of a number to the specified base.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144719" role="heading" level="3" l10n="U"
+oldref="313">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144732" role="code" l10n="U" oldref="314">LOG(Number; Base)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="315"><emph>Number</emph> is the value whose logarithm is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152840" role="paragraph" l10n="CHG" oldref="316"><emph>Base</emph> (optional) is the base for the logarithm calculation. If omitted, Base 10 is assumed.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152860" role="heading" level="3" l10n="U"
+oldref="317">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154429" role="paragraph" l10n="CHG" oldref="318">
 <item type="input">=LOG(10;3)</item> returns the logarithm to base 3 of 10 (approximately 2.0959).</paragraph>
-<paragraph role="paragraph" id="par_id5577562" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5577562" role="paragraph" l10n="NEW">
 <item type="input">=LOG(7^4;7)</item> returns 4.</paragraph><comment>see also LOG10, LN, POWER,  </comment>
 </section>
 <section id="Section32">
@@ -598,13 +663,16 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark_value>base-10 logarithm</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOG10" id="bm_id3155460" localize="false"/>
-<paragraph role="heading" id="hd_id3154187" xml-lang="en-US" level="2" l10n="U" oldref="322">LOG10</paragraph>
-<paragraph role="paragraph" id="par_id3155476" xml-lang="en-US" l10n="U" oldref="323"><ahelp hid="HID_FUNC_LOG10">Returns the base-10 logarithm of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155494" xml-lang="en-US" level="3" l10n="U" oldref="324">Syntax</paragraph>
-<paragraph role="code" id="par_id3159294" xml-lang="en-US" l10n="U" oldref="325">LOG10(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3159308" xml-lang="en-US" l10n="CHG" oldref="326">Returns the logarithm to base 10 of <emph>Number</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3159328" xml-lang="en-US" level="3" l10n="U" oldref="327">Example</paragraph>
-<paragraph role="paragraph" id="par_id3157916" xml-lang="en-US" l10n="CHG" oldref="328">
+<paragraph xml-lang="en-US" id="hd_id3154187" role="heading" level="2" l10n="U"
+oldref="322">LOG10</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155476" role="paragraph" l10n="U" oldref="323"><ahelp hid="HID_FUNC_LOG10">Returns the base-10 logarithm of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155494" role="heading" level="3" l10n="U"
+oldref="324">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159294" role="code" l10n="U" oldref="325">LOG10(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159308" role="paragraph" l10n="CHG" oldref="326">Returns the logarithm to base 10 of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159328" role="heading" level="3" l10n="U"
+oldref="327">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157916" role="paragraph" l10n="CHG" oldref="328">
 <item type="input">=LOG10(5)</item> returns the base-10 logarithm of 5 (approximately 0.69897).</paragraph><comment>see also LOG, LN, POWER  </comment>
 </section>
 <section id="Section31">
@@ -612,23 +680,23 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark_value>rounding;up to multiples of significance</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_OBERGRENZE" id="bm_id3152530" localize="false"/>
-<paragraph role="heading" id="hd_id3152518" xml-lang="en-US" level="2" l10n="U" oldref="332">CEILING</paragraph>
-<paragraph role="paragraph" id="par_id3153422" xml-lang="en-US" l10n="CHG" oldref="558"><ahelp hid="HID_FUNC_OBERGRENZE">Rounds a number up to the nearest multiple of Significance.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153440" xml-lang="en-US" level="3" l10n="U" oldref="334">Syntax</paragraph>
-<paragraph role="code" id="par_id3153454" xml-lang="en-US" l10n="CHG" oldref="335">CEILING(Number; Significance; Mode)</paragraph>
-<paragraph role="paragraph" id="par_id3153467" xml-lang="en-US" l10n="U" oldref="336">
-<emph>Number</emph> is the number that is to be rounded up.</paragraph>
-<paragraph role="paragraph" id="par_id3155000" xml-lang="en-US" l10n="CHG" oldref="337">
-<emph>Significance</emph> is the number to whose multiple the value is to be rounded up.</paragraph>
-<paragraph role="paragraph" id="par_id3155020" xml-lang="en-US" l10n="CHG" oldref="559">
-<emph>Mode</emph> is an optional value. If the Mode value is given and not equal to zero, and if Number and Significance are negative, then rounding is done based on the absolute value of Number. This parameter is ignored when exporting to MS Excel as Excel does not know any third parameter.</paragraph>
-<paragraph role="warning" id="par_id3163792" xml-lang="en-US" l10n="CHG" oldref="629">If both parameters Number and Significance are negative and the Mode value is equal to zero or is not given, the results in $[officename] and Excel will differ after the import has been completed. If you export the spreadsheet to Excel, use Mode=1 to see the same results in Excel as in Calc.</paragraph>
-<paragraph role="heading" id="hd_id3145697" xml-lang="en-US" level="3" l10n="U" oldref="338">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145710" xml-lang="en-US" l10n="CHG" oldref="339">
+<paragraph xml-lang="en-US" id="hd_id3152518" role="heading" level="2" l10n="U"
+oldref="332">CEILING</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153422" role="paragraph" l10n="CHG" oldref="558"><ahelp hid="HID_FUNC_OBERGRENZE">Rounds a number up to the nearest multiple of Significance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153440" role="heading" level="3" l10n="U"
+oldref="334">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153454" role="code" l10n="CHG" oldref="335">CEILING(Number; Significance; Mode)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153467" role="paragraph" l10n="U" oldref="336"><emph>Number</emph> is the number that is to be rounded up.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155000" role="paragraph" l10n="CHG" oldref="337"><emph>Significance</emph> is the number to whose multiple the value is to be rounded up.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155020" role="paragraph" l10n="CHG" oldref="559"><emph>Mode</emph> is an optional value. If the Mode value is given and not equal to zero, and if Number and Significance are negative, then rounding is done based on the absolute value of Number. This parameter is ignored when exporting to MS Excel as Excel does not know any third parameter.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163792" role="warning" l10n="CHG" oldref="629">If both parameters Number and Significance are negative and the Mode value is equal to zero or is not given, the results in $[officename] and Excel will differ after the import has been completed. If you export the spreadsheet to Excel, use Mode=1 to see the same results in Excel as in Calc.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145697" role="heading" level="3" l10n="U"
+oldref="338">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145710" role="paragraph" l10n="CHG" oldref="339">
 <item type="input">=CEILING(-11;-2)</item> returns -10</paragraph>
-<paragraph role="paragraph" id="par_id3145725" xml-lang="en-US" l10n="CHG" oldref="340">
+<paragraph xml-lang="en-US" id="par_id3145725" role="paragraph" l10n="CHG" oldref="340">
 <item type="input">=CEILING(-11;-2;0)</item> returns -10</paragraph>
-<paragraph role="paragraph" id="par_id3145740" xml-lang="en-US" l10n="CHG" oldref="341">
+<paragraph xml-lang="en-US" id="par_id3145740" role="paragraph" l10n="CHG" oldref="341">
 <item type="input">=CEILING(-11;-2;1)</item> returns -12</paragraph><comment>see also FLOOR, EVEN, ODD, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 </section>
@@ -636,63 +704,69 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3157762"><bookmark_value>PI function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_PI" id="bm_id3157774" localize="false"/>
-<paragraph role="heading" id="hd_id3157762" xml-lang="en-US" level="2" l10n="U" oldref="343">PI</paragraph>
-<paragraph role="paragraph" id="par_id3157790" xml-lang="en-US" l10n="CHG" oldref="344"><ahelp hid="HID_FUNC_PI">Returns 3.14159265358979, the value of the mathematical constant PI to 14 decimal places.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3157809" xml-lang="en-US" level="3" l10n="U" oldref="345">Syntax</paragraph>
-<paragraph role="code" id="par_id3157822" xml-lang="en-US" l10n="U" oldref="346">PI()</paragraph>
-<paragraph role="heading" id="hd_id3157836" xml-lang="en-US" level="3" l10n="U" oldref="347">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152370" xml-lang="en-US" l10n="CHG" oldref="348">
+<paragraph xml-lang="en-US" id="hd_id3157762" role="heading" level="2" l10n="U"
+oldref="343">PI</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157790" role="paragraph" l10n="CHG" oldref="344"><ahelp hid="HID_FUNC_PI">Returns 3.14159265358979, the value of the mathematical constant PI to 14 decimal places.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157809" role="heading" level="3" l10n="U"
+oldref="345">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157822" role="code" l10n="U" oldref="346">PI()</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157836" role="heading" level="3" l10n="U"
+oldref="347">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152370" role="paragraph" l10n="CHG" oldref="348">
 <item type="input">=PI()</item> returns 3.14159265358979.</paragraph>
 </section>
 <section id="Section29">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152418"><bookmark_value>MULTINOMIAL function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_MULTINOMIAL" id="bm_id3152429" localize="false"/>
-<paragraph role="heading" id="hd_id3152418" xml-lang="en-US" level="2" l10n="U" oldref="635">MULTINOMIAL</paragraph>
-<paragraph role="paragraph" id="par_id3152454" xml-lang="en-US" l10n="U" oldref="636"><ahelp hid="HID_AAI_FUNC_MULTINOMIAL"> Returns the factorial of the sum of the arguments divided by the product of the factorials of the arguments.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155646" xml-lang="en-US" level="3" l10n="U" oldref="637">Syntax</paragraph>
-<paragraph role="code" id="par_id3155660" xml-lang="en-US" l10n="U" oldref="638">MULTINOMIAL(Number(s))</paragraph>
-<paragraph role="paragraph" id="par_id3155673" xml-lang="en-US" l10n="U" oldref="639">
-<emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-<paragraph role="heading" id="hd_id3155687" xml-lang="en-US" level="3" l10n="U" oldref="640">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155701" xml-lang="en-US" l10n="U" oldref="641">
+<paragraph xml-lang="en-US" id="hd_id3152418" role="heading" level="2" l10n="U"
+oldref="635">MULTINOMIAL</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152454" role="paragraph" l10n="U" oldref="636"><ahelp hid="HID_AAI_FUNC_MULTINOMIAL"> Returns the factorial of the sum of the arguments divided by the product of the factorials of the arguments.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155646" role="heading" level="3" l10n="U"
+oldref="637">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155660" role="code" l10n="U" oldref="638">MULTINOMIAL(Number(s))</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155673" role="paragraph" l10n="U" oldref="639"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155687" role="heading" level="3" l10n="U"
+oldref="640">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155701" role="paragraph" l10n="U" oldref="641">
 <item type="input">=MULTINOMIAL(F11:H11)</item> returns 1260, if F11 to H11 contain the values <item type="input">2</item>, <item type="input">3</item> and <item type="input">4</item>. This corresponds to the formula =(2+3+4)! / (2!*3!*4!)</paragraph>
 </section>
 <section id="Section28">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155717"><bookmark_value>POWER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_POTENZ" id="bm_id3155728" localize="false"/>
-<paragraph role="heading" id="hd_id3155717" xml-lang="en-US" level="2" l10n="U" oldref="350">POWER</paragraph>
-<paragraph role="paragraph" id="par_id3159495" xml-lang="en-US" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to a power.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159513" xml-lang="en-US" level="3" l10n="U" oldref="352">Syntax</paragraph>
-<paragraph role="code" id="par_id3159526" xml-lang="en-US" l10n="U" oldref="353">POWER(Base; Power)</paragraph>
-<paragraph role="paragraph" id="par_id3159540" xml-lang="en-US" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Power</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id5081637" xml-lang="en-US" l10n="NEW">The same result may be achieved by using the exponentiation operator ^:</paragraph>
-<paragraph role="code" id="par_id9759514" xml-lang="en-US" l10n="NEW">
-<item type="literal">Base^Power</item>
+<paragraph xml-lang="en-US" id="hd_id3155717" role="heading" level="2" l10n="U"
+oldref="350">POWER</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159495" role="paragraph" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to another number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159513" role="heading" level="3" l10n="U"
+oldref="352">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159526" role="code" l10n="U" oldref="353">POWER(Base; Exponent)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159540" role="paragraph" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Exponent</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id5081637" role="paragraph" l10n="NEW">The same result may be achieved by using the exponentiation operator ^:</paragraph>
+<paragraph xml-lang="en-US" id="par_id9759514" role="code" l10n="NEW">
+<item type="literal">Base^Exponent</item>
 </paragraph>
-<paragraph role="heading" id="hd_id3159580" xml-lang="en-US" level="3" l10n="U" oldref="356">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159594" xml-lang="en-US" l10n="CHG" oldref="357">
+<paragraph xml-lang="en-US" id="hd_id3159580" role="heading" level="3" l10n="U"
+oldref="356">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159594" role="paragraph" l10n="CHG" oldref="357">
 <item type="input">=POWER(4;3)</item> returns 64, which is 4 to the power of 3.</paragraph>
-<paragraph role="paragraph" id="par_id1614429" xml-lang="en-US" l10n="NEW">=4^3 also returns 4 to the power of 3.</paragraph><comment>see also EXP, LOG, SQRT</comment>
+<paragraph xml-lang="en-US" id="par_id1614429" role="paragraph" l10n="NEW">=4^3 also returns 4 to the power of 3.</paragraph><comment>see also EXP, LOG, SQRT</comment>
 </section>
 <section id="Section27">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152651"><bookmark_value>SERIESSUM function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_SERIESSUM" id="bm_id3152662" localize="false"/>
-<paragraph role="heading" id="hd_id3152651" xml-lang="en-US" level="2" l10n="U" oldref="642">SERIESSUM</paragraph>
-<paragraph role="paragraph" id="par_id3152688" xml-lang="en-US" l10n="CHG" oldref="643"><ahelp hid=".">Sums the first terms of a power series.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3152708" xml-lang="en-US" l10n="U" oldref="644">SERIESSUM(x;n;m;coefficients) = coefficient_1*x^n + coefficient_2*x^(n+m) + coefficient_3*x^(n+2m) +...+ coefficient_i*x^(n+(i-1)m)</paragraph>
-<paragraph role="heading" id="hd_id3152724" xml-lang="en-US" level="3" l10n="U" oldref="645">Syntax</paragraph>
-<paragraph role="code" id="par_idN11BD9" xml-lang="en-US" l10n="NEW">SERIESSUM(X; N; M; Coefficients)</paragraph>
-<paragraph role="paragraph" id="par_id3152737" xml-lang="en-US" l10n="CHG" oldref="646">
-<emph>X</emph> is the input value for the power series.</paragraph>
-<paragraph role="paragraph" id="par_id3144344" xml-lang="en-US" l10n="CHG" oldref="647">
-<emph>N</emph> is the initial power</paragraph>
-<paragraph role="paragraph" id="par_id3144357" xml-lang="en-US" l10n="CHG" oldref="648">
-<emph>M</emph> is the increment to increase N</paragraph>
-<paragraph role="paragraph" id="par_id3144370" xml-lang="en-US" l10n="U" oldref="649">
-<emph>Coefficients</emph> is a series of coefficients. For each coefficient the series sum is extended by one section.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152651" role="heading" level="2" l10n="U"
+oldref="642">SERIESSUM</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152688" role="paragraph" l10n="CHG" oldref="643"><ahelp hid=".">Sums the first terms of a power series.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3152708" role="paragraph" l10n="U" oldref="644">SERIESSUM(x;n;m;coefficients) = coefficient_1*x^n + coefficient_2*x^(n+m) + coefficient_3*x^(n+2m) +...+ coefficient_i*x^(n+(i-1)m)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152724" role="heading" level="3" l10n="U"
+oldref="645">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_idN11BD9" role="code" l10n="NEW">SERIESSUM(X; N; M; Coefficients)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152737" role="paragraph" l10n="CHG" oldref="646"><emph>X</emph> is the input value for the power series.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144344" role="paragraph" l10n="CHG" oldref="647"><emph>N</emph> is the initial power</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144357" role="paragraph" l10n="CHG" oldref="648"><emph>M</emph> is the increment to increase N</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144370" role="paragraph" l10n="U" oldref="649"><emph>Coefficients</emph> is a series of coefficients. For each coefficient the series sum is extended by one section.</paragraph>
 </section>
 <section id="Section26">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3144386"><bookmark_value>PRODUCT function</bookmark_value>
@@ -700,15 +774,17 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>multiplying;numbers</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_PRODUKT" id="bm_id3144397" localize="false"/>
-<paragraph role="heading" id="hd_id3144386" xml-lang="en-US" level="2" l10n="U" oldref="361">PRODUCT</paragraph>
-<paragraph role="paragraph" id="par_id3144414" xml-lang="en-US" l10n="U" oldref="362"><ahelp hid="HID_FUNC_PRODUKT">Multiplies all the numbers given as arguments and returns the product.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3144433" xml-lang="en-US" level="3" l10n="U" oldref="363">Syntax</paragraph>
-<paragraph role="code" id="par_id3144446" xml-lang="en-US" l10n="U" oldref="364">PRODUCT(Number1; Number2; ...; Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3144460" xml-lang="en-US" l10n="U" oldref="365">
-<emph>Number1 to 30</emph> are up to 30 arguments whose product is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW">PRODUCT returns number1 * number2 * number3 * ...</paragraph>
-<paragraph role="heading" id="hd_id3144480" xml-lang="en-US" level="3" l10n="U" oldref="366">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144494" xml-lang="en-US" l10n="CHG" oldref="367">
+<paragraph xml-lang="en-US" id="hd_id3144386" role="heading" level="2" l10n="U"
+oldref="361">PRODUCT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144414" role="paragraph" l10n="U" oldref="362"><ahelp hid="HID_FUNC_PRODUKT">Multiplies all the numbers given as arguments and returns the product.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144433" role="heading" level="3" l10n="U"
+oldref="363">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144446" role="code" l10n="U" oldref="364">PRODUCT(Number1; Number2; ...; Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144460" role="paragraph" l10n="U" oldref="365"><emph>Number1 to 30</emph> are up to 30 arguments whose product is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW">PRODUCT returns number1 * number2 * number3 * ...</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144480" role="heading" level="3" l10n="U"
+oldref="366">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144494" role="paragraph" l10n="CHG" oldref="367">
 <item type="input">=PRODUCT(2;3;4)</item> returns 24.</paragraph><comment>see also FACT,  SUM</comment>
 </section>
 <section id="Section25">
@@ -717,30 +793,35 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>sums;of square numbers</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUADRATESUMME" id="bm_id3160351" localize="false"/>
-<paragraph role="heading" id="hd_id3160340" xml-lang="en-US" level="2" l10n="U" oldref="369">SUMSQ</paragraph>
-<paragraph role="paragraph" id="par_id3160368" xml-lang="en-US" l10n="U" oldref="370"><ahelp hid="HID_FUNC_QUADRATESUMME">If you want to calculate the sum of the squares of numbers (totaling up of the squares of the arguments), enter these into the text fields.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3160388" xml-lang="en-US" level="3" l10n="U" oldref="371">Syntax</paragraph>
-<paragraph role="code" id="par_id3160402" xml-lang="en-US" l10n="U" oldref="372">SUMSQ(Number1; Number2; ...; Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3160415" xml-lang="en-US" l10n="U" oldref="373">
-<emph>Number1 to 30</emph> are up to 30 arguments the sum of whose squares is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3160436" xml-lang="en-US" level="3" l10n="U" oldref="374">Example</paragraph>
-<paragraph role="paragraph" id="par_id3160449" xml-lang="en-US" l10n="U" oldref="375">If you enter the numbers <item type="input">2</item>; <item type="input">3</item> and <item type="input">4</item> in the Number 1; 2 and 3 text boxes, 29 is returned as the result.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3160340" role="heading" level="2" l10n="U"
+oldref="369">SUMSQ</paragraph>
+<paragraph xml-lang="en-US" id="par_id3160368" role="paragraph" l10n="U" oldref="370"><ahelp hid="HID_FUNC_QUADRATESUMME">If you want to calculate the sum of the squares of numbers (totaling up of the squares of the arguments), enter these into the text fields.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3160388" role="heading" level="3" l10n="U"
+oldref="371">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3160402" role="code" l10n="U" oldref="372">SUMSQ(Number1; Number2; ...; Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3160415" role="paragraph" l10n="U" oldref="373"><emph>Number1 to 30</emph> are up to 30 arguments the sum of whose squares is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3160436" role="heading" level="3" l10n="U"
+oldref="374">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3160449" role="paragraph" l10n="U" oldref="375">If you enter the numbers <item type="input">2</item>; <item type="input">3</item> and <item type="input">4</item> in the Number 1; 2 and 3 text boxes, 29 is returned as the result.</paragraph>
 </section>
 <section id="Section24">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158247"><bookmark_value>MOD function</bookmark_value>
 <bookmark_value>remainders of divisions</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_REST" id="bm_id3158259" localize="false"/>
-<paragraph role="heading" id="hd_id3158247" xml-lang="en-US" level="2" l10n="U" oldref="387">MOD</paragraph>
-<paragraph role="paragraph" id="par_id3158276" xml-lang="en-US" l10n="CHG" oldref="388"><ahelp hid="HID_FUNC_REST">Returns the remainder when one integer is divided by another.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3158294" xml-lang="en-US" level="3" l10n="U" oldref="389">Syntax</paragraph>
-<paragraph role="code" id="par_id3158308" xml-lang="en-US" l10n="U" oldref="390">MOD(Dividend; Divisor)</paragraph>
-<paragraph role="paragraph" id="par_id3158321" xml-lang="en-US" l10n="CHG" oldref="391"> For integer arguments this function returns Dividend modulo Divisor, that is the remainder when <emph>Dividend</emph> is divided by <emph>Divisor</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3158341" xml-lang="en-US" l10n="CHG" oldref="392">This function is implemented as <item type="literal">Dividend - Divisor * INT(Dividend/Divisor)</item> , and this formula gives the result if the arguments are not integer.</paragraph>
-<paragraph role="heading" id="hd_id3158361" xml-lang="en-US" level="3" l10n="U" oldref="393">Example</paragraph>
-<paragraph role="paragraph" id="par_id3158374" xml-lang="en-US" l10n="CHG" oldref="394">
+<paragraph xml-lang="en-US" id="hd_id3158247" role="heading" level="2" l10n="U"
+oldref="387">MOD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158276" role="paragraph" l10n="CHG" oldref="388"><ahelp hid="HID_FUNC_REST">Returns the remainder when one integer is divided by another.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3158294" role="heading" level="3" l10n="U"
+oldref="389">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158308" role="code" l10n="U" oldref="390">MOD(Dividend; Divisor)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158321" role="paragraph" l10n="CHG" oldref="391"> For integer arguments this function returns Dividend modulo Divisor, that is the remainder when <emph>Dividend</emph> is divided by <emph>Divisor</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158341" role="paragraph" l10n="CHG" oldref="392">This function is implemented as <item type="literal">Dividend - Divisor * INT(Dividend/Divisor)</item> , and this formula gives the result if the arguments are not integer.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3158361" role="heading" level="3" l10n="U"
+oldref="393">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158374" role="paragraph" l10n="CHG" oldref="394">
 <item type="input">=MOD(22;3)</item> returns 1, the remainder when 22 is divided by 3.</paragraph>
-<paragraph role="paragraph" id="par_id1278420" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1278420" role="paragraph" l10n="NEW">
 <item type="input">=MOD(11.25;2.5)</item> returns 1.25.</paragraph><comment>see also QUOTIENT, INT,   </comment>
 </section>
 <section id="Section23">
@@ -748,14 +829,17 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>divisions</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_QUOTIENT" id="bm_id3144603" localize="false"/>
-<paragraph role="heading" id="hd_id3144592" xml-lang="en-US" level="2" l10n="E" oldref="652">QUOTIENT</paragraph>
-<paragraph role="paragraph" id="par_id3144627" xml-lang="en-US" l10n="CHG" oldref="653"><ahelp hid="HID_AAI_FUNC_QUOTIENT">Returns the integer part of a division operation.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3144646" xml-lang="en-US" level="3" l10n="U" oldref="654">Syntax</paragraph>
-<paragraph role="code" id="par_id3144659" xml-lang="en-US" l10n="U" oldref="655">QUOTIENT(Numerator; Denominator)</paragraph>
-<paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW">Returns the integer part of <emph>Numerator</emph> divided by <emph>Denominator</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id7985168" xml-lang="en-US" l10n="NEW">QUOTIENT is equivalent to <item type="literal">INT(numerator/denominator)</item>, except that it may report errors with different error codes.</paragraph>
-<paragraph role="heading" id="hd_id3144674" xml-lang="en-US" level="3" l10n="U" oldref="656">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144687" xml-lang="en-US" l10n="CHG" oldref="657">
+<paragraph xml-lang="en-US" id="hd_id3144592" role="heading" level="2" l10n="E"
+oldref="652">QUOTIENT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144627" role="paragraph" l10n="CHG" oldref="653"><ahelp hid="HID_AAI_FUNC_QUOTIENT">Returns the integer part of a division operation.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144646" role="heading" level="3" l10n="U"
+oldref="654">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144659" role="code" l10n="U" oldref="655">QUOTIENT(Numerator; Denominator)</paragraph>
+<paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW">Returns the integer part of <emph>Numerator</emph> divided by <emph>Denominator</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7985168" role="paragraph" l10n="NEW">QUOTIENT is equivalent to <item type="literal">INT(numerator/denominator)</item>, except that it may report errors with different error codes.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144674" role="heading" level="3" l10n="U"
+oldref="656">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144687" role="paragraph" l10n="CHG" oldref="657">
 <item type="input">=QUOTIENT(11;3)</item> returns 3. The remainder of 2 is lost.</paragraph><comment>see also MOD, INT </comment>
 </section>
 <section id="Section22">
@@ -763,36 +847,40 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>converting;degrees, into radians</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_RAD" id="bm_id3158008" localize="false"/>
-<paragraph role="heading" id="hd_id3144702" xml-lang="en-US" level="2" l10n="U" oldref="377">RADIANS</paragraph>
-<paragraph role="paragraph" id="par_id3158025" xml-lang="en-US" l10n="U" oldref="378"><ahelp hid="HID_FUNC_RAD">Converts degrees to radians.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3158042" xml-lang="en-US" level="3" l10n="U" oldref="379">Syntax</paragraph>
-<paragraph role="code" id="par_id3158055" xml-lang="en-US" l10n="U" oldref="380">RADIANS(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3158069" xml-lang="en-US" l10n="CHG" oldref="381">
-<emph>Number</emph> is the angle in degrees to be converted to radians.</paragraph>
-<paragraph role="heading" id="hd_id876186" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="hd_id3144702" role="heading" level="2" l10n="U"
+oldref="377">RADIANS</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158025" role="paragraph" l10n="U" oldref="378"><ahelp hid="HID_FUNC_RAD">Converts degrees to radians.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3158042" role="heading" level="3" l10n="U"
+oldref="379">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158055" role="code" l10n="U" oldref="380">RADIANS(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158069" role="paragraph" l10n="CHG" oldref="381"><emph>Number</emph> is the angle in degrees to be converted to radians.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="3" l10n="NEW">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">
 <item type="input">=RADIANS(90)</item> returns 1.5707963267949, which is PI/2 to Calc's accuracy.</paragraph><comment>see also DEGREES </comment>
 </section>
 <section id="Section21">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158121"><bookmark_value>ROUND function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_RUNDEN" id="bm_id3158133" localize="false"/>
-<paragraph role="heading" id="hd_id3158121" xml-lang="en-US" level="2" l10n="U" oldref="398">ROUND</paragraph>
-<paragraph role="paragraph" id="par_id3158150" xml-lang="en-US" l10n="CHG" oldref="399"><ahelp hid="HID_FUNC_RUNDEN">Rounds a number to a certain number of decimal places.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3158169" xml-lang="en-US" level="3" l10n="U" oldref="400">Syntax</paragraph>
-<paragraph role="code" id="par_id3158182" xml-lang="en-US" l10n="U" oldref="401">ROUND(Number; Count)</paragraph>
-<paragraph role="paragraph" id="par_id3158196" xml-lang="en-US" l10n="U" oldref="402">Returns <emph>Number</emph> rounded to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds to the nearest integer. If Ccunt is negative, the function rounds to the nearest 10, 100, 1000, etc.</paragraph>
-<paragraph role="paragraph" id="par_id599688" xml-lang="en-US" l10n="NEW">This function rounds to the nearest number. See ROUNDDOWN and ROUNDUP for alternatives.</paragraph>
-<paragraph role="heading" id="hd_id3145863" xml-lang="en-US" level="3" l10n="U" oldref="404">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145876" xml-lang="en-US" l10n="CHG" oldref="405">
+<paragraph xml-lang="en-US" id="hd_id3158121" role="heading" level="2" l10n="U"
+oldref="398">ROUND</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158150" role="paragraph" l10n="CHG" oldref="399"><ahelp hid="HID_FUNC_RUNDEN">Rounds a number to a certain number of decimal places.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3158169" role="heading" level="3" l10n="U"
+oldref="400">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158182" role="code" l10n="U" oldref="401">ROUND(Number; Count)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3158196" role="paragraph" l10n="U" oldref="402">Returns <emph>Number</emph> rounded to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds to the nearest integer. If Count is negative, the function rounds to the nearest 10, 100, 1000, etc.</paragraph>
+<paragraph xml-lang="en-US" id="par_id599688" role="paragraph" l10n="NEW">This function rounds to the nearest number. See ROUNDDOWN and ROUNDUP for alternatives.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145863" role="heading" level="3" l10n="U"
+oldref="404">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145876" role="paragraph" l10n="CHG" oldref="405">
 <item type="input">=ROUND(2.348;2)</item> returns 2.35</paragraph>
-<paragraph role="paragraph" id="par_id3145899" xml-lang="en-US" l10n="CHG" oldref="406">
+<paragraph xml-lang="en-US" id="par_id3145899" role="paragraph" l10n="CHG" oldref="406">
 <item type="input">=ROUND(-32.4834;3)</item> returns -32.483. Change the cell format to see all decimals.</paragraph>
-<paragraph role="paragraph" id="par_id1371501" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW">
 <item type="input">=ROUND(2.348;0)</item> returns 2.</paragraph>
-<paragraph role="paragraph" id="par_id4661702" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id4661702" role="paragraph" l10n="NEW">
 <item type="input">=ROUND(2.5)</item> returns 3. </paragraph>
-<paragraph role="paragraph" id="par_id7868892" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="NEW">
 <item type="input">=ROUND(987.65;-2)</item> returns 1000.</paragraph><comment>see also INT, TRUNC, ROUNDDOWN, ROUNDUP,    
 CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 </section>
@@ -800,20 +888,23 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145991"><bookmark_value>ROUNDDOWN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ABRUNDEN" id="bm_id3146003" localize="false"/>
-<paragraph role="heading" id="hd_id3145991" xml-lang="en-US" level="2" l10n="U" oldref="24">ROUNDDOWN</paragraph>
-<paragraph role="paragraph" id="par_id3146020" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="HID_FUNC_ABRUNDEN">Rounds a number down, toward zero, to a certain precision.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146037" xml-lang="en-US" level="3" l10n="U" oldref="26">Syntax</paragraph>
-<paragraph role="code" id="par_id3146051" xml-lang="en-US" l10n="U" oldref="27">ROUNDDOWN(Number; Count)</paragraph>
-<paragraph role="paragraph" id="par_id3146064" xml-lang="en-US" l10n="CHG" oldref="28">Returns <emph>Number</emph> rounded down (towards zero) to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds down to an integer. If Count is negative, the function rounds down to the next 10, 100, 1000, etc.</paragraph>
-<paragraph role="paragraph" id="par_id2188787" xml-lang="en-US" l10n="NEW">This function rounds towards zero. See ROUNDUP and ROUND for alternatives.</paragraph>
-<paragraph role="heading" id="hd_id3163164" xml-lang="en-US" level="3" l10n="U" oldref="30">Example</paragraph>
-<paragraph role="paragraph" id="par_id3163178" xml-lang="en-US" l10n="CHG" oldref="31">
+<paragraph xml-lang="en-US" id="hd_id3145991" role="heading" level="2" l10n="U"
+oldref="24">ROUNDDOWN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146020" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="HID_FUNC_ABRUNDEN">Rounds a number down, toward zero, to a certain precision.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146037" role="heading" level="3" l10n="U"
+oldref="26">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146051" role="code" l10n="U" oldref="27">ROUNDDOWN(Number; Count)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146064" role="paragraph" l10n="CHG" oldref="28">Returns <emph>Number</emph> rounded down (towards zero) to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds down to an integer. If Count is negative, the function rounds down to the next 10, 100, 1000, etc.</paragraph>
+<paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW">This function rounds towards zero. See ROUNDUP and ROUND for alternatives.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163164" role="heading" level="3" l10n="U"
+oldref="30">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163178" role="paragraph" l10n="CHG" oldref="31">
 <item type="input">=ROUNDDOWN(1.234;2)</item> returns 1.23.</paragraph>
-<paragraph role="paragraph" id="par_id5833307" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5833307" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDDOWN(45.67;0)</item> returns 45.</paragraph>
-<paragraph role="paragraph" id="par_id7726676" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDDOWN(-45.67)</item> returns -45.</paragraph>
-<paragraph role="paragraph" id="par_id3729361" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id3729361" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDDOWN(987.65;-2)</item> returns 900.</paragraph><comment>see also INT, TRUNC, ROUND, ROUNDUP,    
 CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 </section>
@@ -821,22 +912,25 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163268"><bookmark_value>ROUNDUP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_AUFRUNDEN" id="bm_id3163280" localize="false"/>
-<paragraph role="heading" id="hd_id3163268" xml-lang="en-US" level="2" l10n="U" oldref="140">ROUNDUP</paragraph>
-<paragraph role="paragraph" id="par_id3163297" xml-lang="en-US" l10n="CHG" oldref="141"><ahelp hid="HID_FUNC_AUFRUNDEN">Rounds a number up, away from zero, to a certain precision.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3163315" xml-lang="en-US" level="3" l10n="U" oldref="142">Syntax</paragraph>
-<paragraph role="code" id="par_id3163328" xml-lang="en-US" l10n="U" oldref="143">ROUNDUP(Number; Count)</paragraph>
-<paragraph role="paragraph" id="par_id3163342" xml-lang="en-US" l10n="CHG" oldref="144">Returns <emph>Number</emph> rounded up (away from zero) to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds up to an integer. If Count is negative, the function rounds up to the next 10, 100, 1000, etc.</paragraph>
-<paragraph role="paragraph" id="par_id9573961" xml-lang="en-US" l10n="NEW">This function rounds away from zero. See ROUNDDOWN and ROUND for alternatives.</paragraph>
-<paragraph role="heading" id="hd_id3163381" xml-lang="en-US" level="3" l10n="U" oldref="146">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144786" xml-lang="en-US" l10n="CHG" oldref="147">
+<paragraph xml-lang="en-US" id="hd_id3163268" role="heading" level="2" l10n="U"
+oldref="140">ROUNDUP</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163297" role="paragraph" l10n="CHG" oldref="141"><ahelp hid="HID_FUNC_AUFRUNDEN">Rounds a number up, away from zero, to a certain precision.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163315" role="heading" level="3" l10n="U"
+oldref="142">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163328" role="code" l10n="U" oldref="143">ROUNDUP(Number; Count)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163342" role="paragraph" l10n="CHG" oldref="144">Returns <emph>Number</emph> rounded up (away from zero) to <emph>Count</emph> decimal places. If Count is omitted or zero, the function rounds up to an integer. If Count is negative, the function rounds up to the next 10, 100, 1000, etc.</paragraph>
+<paragraph xml-lang="en-US" id="par_id9573961" role="paragraph" l10n="NEW">This function rounds away from zero. See ROUNDDOWN and ROUND for alternatives.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163381" role="heading" level="3" l10n="U"
+oldref="146">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144786" role="paragraph" l10n="CHG" oldref="147">
 <item type="input">=ROUNDUP(1.1111;2)</item> returns 1.12.</paragraph>
-<paragraph role="paragraph" id="par_id7700430" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id7700430" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDUP(1.2345;1)</item> returns 1.3.</paragraph>
-<paragraph role="paragraph" id="par_id1180455" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDUP(45.67;0)</item> returns 46.</paragraph>
-<paragraph role="paragraph" id="par_id3405560" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id3405560" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDUP(-45.67)</item> returns -46.</paragraph>
-<paragraph role="paragraph" id="par_id3409527" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id3409527" role="paragraph" l10n="NEW">
 <item type="input">=ROUNDUP(987.65;-2)</item> returns 1000.</paragraph><comment>see also INT, TRUNC, ROUND, ROUNDDOWN,    
 CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 </section>
@@ -844,16 +938,19 @@ CEILING, FLOOR, EVEN, ODD, MROUND</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3144877"><bookmark_value>SIN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SIN" id="bm_id3144889" localize="false"/>
-<paragraph role="heading" id="hd_id3144877" xml-lang="en-US" level="2" l10n="U" oldref="408">SIN</paragraph>
-<paragraph role="paragraph" id="par_id3144906" xml-lang="en-US" l10n="CHG" oldref="409"><ahelp hid="HID_FUNC_SIN">Returns the sine of the given angle (in radians).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3144923" xml-lang="en-US" level="3" l10n="U" oldref="410">Syntax</paragraph>
-<paragraph role="code" id="par_id3144937" xml-lang="en-US" l10n="U" oldref="411">SIN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3144950" xml-lang="en-US" l10n="CHG" oldref="412">Returns the (trigonometric) sine of <emph>Number</emph>, the angle in radians.</paragraph>
-<paragraph role="paragraph" id="par_id8079470" xml-lang="en-US" l10n="NEW">To return the sine of an angle in degrees, use the RADIANS function.</paragraph>
-<paragraph role="heading" id="hd_id3144969" xml-lang="en-US" level="3" l10n="U" oldref="413">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144983" xml-lang="en-US" l10n="CHG" oldref="414">
+<paragraph xml-lang="en-US" id="hd_id3144877" role="heading" level="2" l10n="U"
+oldref="408">SIN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144906" role="paragraph" l10n="CHG" oldref="409"><ahelp hid="HID_FUNC_SIN">Returns the sine of the given angle (in radians).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144923" role="heading" level="3" l10n="U"
+oldref="410">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144937" role="code" l10n="U" oldref="411">SIN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144950" role="paragraph" l10n="CHG" oldref="412">Returns the (trigonometric) sine of <emph>Number</emph>, the angle in radians.</paragraph>
+<paragraph xml-lang="en-US" id="par_id8079470" role="paragraph" l10n="NEW">To return the sine of an angle in degrees, use the RADIANS function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144969" role="heading" level="3" l10n="U"
+oldref="413">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144983" role="paragraph" l10n="CHG" oldref="414">
 <item type="input">=SIN(PI()/2)</item> returns 1, the sine of PI/2 radians.</paragraph>
-<paragraph role="paragraph" id="par_id3916440" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id3916440" role="paragraph" l10n="NEW">
 <item type="input">=SIN(RADIANS(30))</item> returns 0.5, the sine of 30 degrees.</paragraph><comment>see also COS, TAN, COT, 
 ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 </section>
@@ -861,13 +958,16 @@ ACOS, ASIN, ATAN, ATAN2, ACOT  </comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163397"><bookmark_value>SINH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SINHYP" id="bm_id3163409" localize="false"/>
-<paragraph role="heading" id="hd_id3163397" xml-lang="en-US" level="2" l10n="U" oldref="418">SINH</paragraph>
-<paragraph role="paragraph" id="par_id3163426" xml-lang="en-US" l10n="U" oldref="419"><ahelp hid="HID_FUNC_SINHYP">Returns the hyperbolic sine of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3163444" xml-lang="en-US" level="3" l10n="U" oldref="420">Syntax</paragraph>
-<paragraph role="code" id="par_id3163457" xml-lang="en-US" l10n="U" oldref="421">SINH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3163471" xml-lang="en-US" l10n="CHG" oldref="422">Returns the hyperbolic sine of <emph>Number</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3163491" xml-lang="en-US" level="3" l10n="U" oldref="423">Example</paragraph>
-<paragraph role="paragraph" id="par_id3163504" xml-lang="en-US" l10n="CHG" oldref="424">
+<paragraph xml-lang="en-US" id="hd_id3163397" role="heading" level="2" l10n="U"
+oldref="418">SINH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163426" role="paragraph" l10n="U" oldref="419"><ahelp hid="HID_FUNC_SINHYP">Returns the hyperbolic sine of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163444" role="heading" level="3" l10n="U"
+oldref="420">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163457" role="code" l10n="U" oldref="421">SINH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163471" role="paragraph" l10n="CHG" oldref="422">Returns the hyperbolic sine of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163491" role="heading" level="3" l10n="U"
+oldref="423">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163504" role="paragraph" l10n="CHG" oldref="424">
 <item type="input">=SINH(0)</item> returns 0, the hyperbolic sine of 0.</paragraph><comment>see also COSH, TANH, COTH,     
 ACOSH, ASINH, ATANH, ACOTH</comment>
 </section>
@@ -876,64 +976,70 @@ ACOSH, ASINH, ATANH, ACOTH</comment>
 <bookmark_value>adding;numbers in cell ranges</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUMME" id="bm_id3163608" localize="false"/>
-<paragraph role="heading" id="hd_id3163596" xml-lang="en-US" level="2" l10n="U" oldref="428">SUM</paragraph>
-<paragraph role="paragraph" id="par_id3163625" xml-lang="en-US" l10n="U" oldref="429"><ahelp hid="HID_FUNC_SUMME">Adds all the numbers in a range of cells.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3163643" xml-lang="en-US" level="3" l10n="U" oldref="430">Syntax</paragraph>
-<paragraph role="code" id="par_id3163656" xml-lang="en-US" l10n="U" oldref="431">SUM(Number1; Number2; ...; Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3163671" xml-lang="en-US" l10n="U" oldref="432">
-<emph>Number 1 to Number 30</emph> are up to 30 arguments whose sum is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3163690" xml-lang="en-US" level="3" l10n="U" oldref="433">Example</paragraph>
-<paragraph role="paragraph" id="par_id3163704" xml-lang="en-US" l10n="U" oldref="434">If you enter the numbers <item type="input">2</item>; <item type="input">3 </item>and <item type="input">4</item> in the Number 1; 2 and 3 text boxes, 9 will be returned as the result.</paragraph>
-<paragraph role="paragraph" id="par_id3151740" xml-lang="en-US" l10n="U" oldref="556">
+<paragraph xml-lang="en-US" id="hd_id3163596" role="heading" level="2" l10n="U"
+oldref="428">SUM</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163625" role="paragraph" l10n="U" oldref="429"><ahelp hid="HID_FUNC_SUMME">Adds all the numbers in a range of cells.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163643" role="heading" level="3" l10n="U"
+oldref="430">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163656" role="code" l10n="U" oldref="431">SUM(Number1; Number2; ...; Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163671" role="paragraph" l10n="U" oldref="432"><emph>Number 1 to Number 30</emph> are up to 30 arguments whose sum is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163690" role="heading" level="3" l10n="U"
+oldref="433">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163704" role="paragraph" l10n="U" oldref="434">If you enter the numbers <item type="input">2</item>; <item type="input">3 </item>and <item type="input">4</item> in the Number 1; 2 and 3 text boxes, 9 will be returned as the result.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151740" role="paragraph" l10n="U" oldref="556">
 <item type="input">=SUM(A1;A3;B5)</item> calculates the sum of the three cells. <item type="input">=SUM (A1:E10)</item> calculates the sum of all cells in the A1 to E10 cell range.</paragraph>
-<paragraph role="paragraph" id="par_id3151756" xml-lang="en-US" l10n="U" oldref="619">Conditions linked by AND can be used with the function SUM() in the following manner:</paragraph>
-<paragraph role="paragraph" id="par_id3151774" xml-lang="en-US" l10n="CHG" oldref="620">Example assumption: You have entered invoices into a table. Column A contains the date value of the invoice, column B the amounts. You want to find a formula that you can use to return the total of all amounts only for a specific month, e.g. only the amount for the period &gt;=2008-01-01 to &lt;2008-02-01. The range with the date values covers A1:A40, the range containing the amounts to be totaled is B1:B40. C1 contains the start date, 2008<item type="input">-01-01</item>, of the invoices to be included and C2 the date, 2008<item type="input">-02-01</item>, that is no longer included.</paragraph>
-<paragraph role="paragraph" id="par_id3151799" xml-lang="en-US" l10n="U" oldref="621">Enter the following formula as an array formula:</paragraph>
-<paragraph role="paragraph" id="par_id3151813" xml-lang="en-US" l10n="U" oldref="622">
+<paragraph xml-lang="en-US" id="par_id3151756" role="paragraph" l10n="U" oldref="619">Conditions linked by AND can be used with the function SUM() in the following manner:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151774" role="paragraph" l10n="CHG" oldref="620">Example assumption: You have entered invoices into a table. Column A contains the date value of the invoice, column B the amounts. You want to find a formula that you can use to return the total of all amounts only for a specific month, e.g. only the amount for the period &gt;=2008-01-01 to &lt;2008-02-01. The range with the date values covers A1:A40, the range containing the amounts to be totaled is B1:B40. C1 contains the start date, 2008<item type="input">-01-01</item>, of the invoices to be included and C2 the date, 2008<item type="input">-02-01</item>, that is no longer included.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151799" role="paragraph" l10n="U" oldref="621">Enter the following formula as an array formula:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151813" role="paragraph" l10n="U" oldref="622">
 <item type="input">=SUM((A1:A40&gt;=C1)*(A1:A40&lt;C2)*B1:B40)</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id3151828" xml-lang="en-US" l10n="U" oldref="623">In order to enter this as an array formula, you must press the Shift<switchinline select="sys"><caseinline select="MAC">+Command</caseinline><defaultinline>+ Ctrl</defaultinline></switchinline>+ Enter keys instead of simply pressing the Enter key to close the formula. The formula will then be shown in the <emph>Formula</emph> bar enclosed in braces.</paragraph>
-<paragraph role="paragraph" id="par_id3151869" xml-lang="en-US" l10n="U" oldref="624">{=SUM((A1:A40&gt;=C1)*(A1:A40&lt;C2)*B1:B40)}</paragraph>
-<paragraph role="paragraph" id="par_id3151884" xml-lang="en-US" l10n="CHG" oldref="625">The formula is based on the fact that the result of a comparison is 1 if the criterion is met and 0 if it is not met. The individual comparison results will be treated as an array and used in matrix multiplication, and at the end the individual values will be totaled to give the result matrix.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151828" role="paragraph" l10n="U" oldref="623">In order to enter this as an array formula, you must press the Shift<switchinline select="sys"><caseinline select="MAC">+Command 
+</caseinline><defaultinline>+ Ctrl</defaultinline></switchinline>+ Enter keys instead of simply pressing the Enter key to close the formula. The formula will then be shown in the <emph>Formula</emph> bar enclosed in braces.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151869" role="paragraph" l10n="U" oldref="624">{=SUM((A1:A40&gt;=C1)*(A1:A40&lt;C2)*B1:B40)}</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151884" role="paragraph" l10n="CHG" oldref="625">The formula is based on the fact that the result of a comparison is 1 if the criterion is met and 0 if it is not met. The individual comparison results will be treated as an array and used in matrix multiplication, and at the end the individual values will be totaled to give the result matrix.</paragraph>
 </section>
 <section id="Section15">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151957"><bookmark_value>SUMIF function</bookmark_value>
 <bookmark_value>adding;specified numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUMMEWENN" id="bm_id3151969" localize="false"/>
-<paragraph role="heading" id="hd_id3151957" xml-lang="en-US" level="2" l10n="U" oldref="436">SUMIF</paragraph>
-<paragraph role="paragraph" id="par_id3151986" xml-lang="en-US" l10n="U" oldref="437"><ahelp hid="HID_FUNC_SUMMEWENN">Adds the cells specified by a given criteria.</ahelp> This function is used to browse a range when you search for a certain value.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151957" role="heading" level="2" l10n="U"
+oldref="436">SUMIF</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151986" role="paragraph" l10n="U" oldref="437"><ahelp hid="HID_FUNC_SUMMEWENN">Adds the cells specified by a given criteria.</ahelp> This function is used to browse a range when you search for a certain value.</paragraph>
 <embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3152015" xml-lang="en-US" level="3" l10n="U" oldref="438">Syntax</paragraph>
-<paragraph role="code" id="par_id3152028" xml-lang="en-US" l10n="U" oldref="439">SUMIF(Range; Criteria; SumRange)</paragraph>
-<paragraph role="paragraph" id="par_id3152043" xml-lang="en-US" l10n="U" oldref="440">
-<emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
-<paragraph role="paragraph" id="par_id3152062" xml-lang="en-US" l10n="CHG" oldref="441">
-<emph>Criteria</emph> is the cell in which the search criterion is shown, or the search criterion itself. If the criteria is written into the formula, it has to be surrounded by double quotes.</paragraph>
-<paragraph role="paragraph" id="par_id3152083" xml-lang="en-US" l10n="U" oldref="442">
-<emph>SumRange</emph> is the range from which values are summed. If this parameter has not been indicated, the values found in the Range are summed.</paragraph>
-<paragraph role="note" id="par_id8347422" xml-lang="en-US" l10n="NEW">SUMIF supports the reference concatenation operator (~) only in the Criteria parameter, and only if the optional SumRange parameter is not given.</paragraph>
-<paragraph role="heading" id="hd_id3152110" xml-lang="en-US" level="3" l10n="U" oldref="443">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152148" xml-lang="en-US" l10n="CHG" oldref="626">To sum up only negative numbers: <item type="input">=SUMIF(A1:A10;"&lt;0")</item>
+<paragraph xml-lang="en-US" id="hd_id3152015" role="heading" level="3" l10n="U"
+oldref="438">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152028" role="code" l10n="U" oldref="439">SUMIF(Range; Criteria; SumRange)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152043" role="paragraph" l10n="U" oldref="440"><emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152062" role="paragraph" l10n="CHG" oldref="441"><emph>Criteria</emph> is the cell in which the search criterion is shown, or the search criterion itself. If the criteria is written into the formula, it has to be surrounded by double quotes.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152083" role="paragraph" l10n="U" oldref="442"><emph>SumRange</emph> is the range from which values are summed. If this parameter has not been indicated, the values found in the Range are summed.</paragraph>
+<paragraph xml-lang="en-US" id="par_id8347422" role="note" l10n="NEW">SUMIF supports the reference concatenation operator (~) only in the Criteria parameter, and only if the optional SumRange parameter is not given.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152110" role="heading" level="3" l10n="U"
+oldref="443">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152148" role="paragraph" l10n="CHG" oldref="626">To sum up only negative numbers: <item type="input">=SUMIF(A1:A10;"&lt;0")</item>
 </paragraph>
-<paragraph role="paragraph" id="par_id6670125" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id6670125" role="paragraph" l10n="NEW">
 <item type="input">=SUMIF(A1:A10;"&gt;0";B1:10)</item> - sums values from the range B1:B10 only if the corresponding values in the range A1:A10 are &gt;0.</paragraph>
-<paragraph role="paragraph" id="par_id6062196" xml-lang="en-US" l10n="NEW">See COUNTIF() for some more syntax examples that can be used with SUMIF().</paragraph>
+<paragraph xml-lang="en-US" id="par_id6062196" role="paragraph" l10n="NEW">See COUNTIF() for some more syntax examples that can be used with SUMIF().</paragraph>
 </section>
 <section id="Section14">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152195"><bookmark_value>TAN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TAN" id="bm_id3152207" localize="false"/>
-<paragraph role="heading" id="hd_id3152195" xml-lang="en-US" level="2" l10n="U" oldref="446">TAN</paragraph>
-<paragraph role="paragraph" id="par_id3152224" xml-lang="en-US" l10n="CHG" oldref="447"><ahelp hid="HID_FUNC_TAN">Returns the tangent of the given angle (in radians).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152242" xml-lang="en-US" level="3" l10n="U" oldref="448">Syntax</paragraph>
-<paragraph role="code" id="par_id3152255" xml-lang="en-US" l10n="U" oldref="449">TAN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3152269" xml-lang="en-US" l10n="CHG" oldref="450">Returns the (trigonometric) tangent of <emph>Number</emph>, the angle in radians.</paragraph>
-<paragraph role="paragraph" id="par_id5752128" xml-lang="en-US" l10n="NEW">To return the tangent of an angle in degrees, use the RADIANS function.</paragraph>
-<paragraph role="heading" id="hd_id3152287" xml-lang="en-US" level="3" l10n="U" oldref="451">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152301" xml-lang="en-US" l10n="CHG" oldref="452">
+<paragraph xml-lang="en-US" id="hd_id3152195" role="heading" level="2" l10n="U"
+oldref="446">TAN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152224" role="paragraph" l10n="CHG" oldref="447"><ahelp hid="HID_FUNC_TAN">Returns the tangent of the given angle (in radians).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152242" role="heading" level="3" l10n="U"
+oldref="448">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152255" role="code" l10n="U" oldref="449">TAN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152269" role="paragraph" l10n="CHG" oldref="450">Returns the (trigonometric) tangent of <emph>Number</emph>, the angle in radians.</paragraph>
+<paragraph xml-lang="en-US" id="par_id5752128" role="paragraph" l10n="NEW">To return the tangent of an angle in degrees, use the RADIANS function.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152287" role="heading" level="3" l10n="U"
+oldref="451">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152301" role="paragraph" l10n="CHG" oldref="452">
 <item type="input">=TAN(PI()/4) </item>returns 1, the tangent of PI/4 radians.</paragraph>
-<paragraph role="paragraph" id="par_id1804864" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id1804864" role="paragraph" l10n="NEW">
 <item type="input">=TAN(RADIANS(45))</item> returns 1, the tangent of 45 degrees.</paragraph><comment>see also COS, SIN, COT, 
 ACOS, ASIN, ATAN, ATAN2, ACOT</comment>
 </section>
@@ -941,13 +1047,16 @@ ACOS, ASIN, ATAN, ATAN2, ACOT</comment>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3165434"><bookmark_value>TANH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TANHYP" id="bm_id3165446" localize="false"/>
-<paragraph role="heading" id="hd_id3165434" xml-lang="en-US" level="2" l10n="U" oldref="456">TANH</paragraph>
-<paragraph role="paragraph" id="par_id3165462" xml-lang="en-US" l10n="U" oldref="457"><ahelp hid="HID_FUNC_TANHYP">Returns the hyperbolic tangent of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3165480" xml-lang="en-US" level="3" l10n="U" oldref="458">Syntax</paragraph>
-<paragraph role="code" id="par_id3165494" xml-lang="en-US" l10n="U" oldref="459">TANH(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3165508" xml-lang="en-US" l10n="CHG" oldref="460">Returns the hyperbolic tangent of <emph>Number</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3165527" xml-lang="en-US" level="3" l10n="U" oldref="461">Example</paragraph>
-<paragraph role="paragraph" id="par_id3165541" xml-lang="en-US" l10n="CHG" oldref="462">
+<paragraph xml-lang="en-US" id="hd_id3165434" role="heading" level="2" l10n="U"
+oldref="456">TANH</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165462" role="paragraph" l10n="U" oldref="457"><ahelp hid="HID_FUNC_TANHYP">Returns the hyperbolic tangent of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165480" role="heading" level="3" l10n="U"
+oldref="458">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165494" role="code" l10n="U" oldref="459">TANH(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165508" role="paragraph" l10n="CHG" oldref="460">Returns the hyperbolic tangent of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165527" role="heading" level="3" l10n="U"
+oldref="461">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165541" role="paragraph" l10n="CHG" oldref="462">
 <item type="input">=TANH(0)</item> returns 0, the hyperbolic tangent of 0.</paragraph><comment>see also COSH, SINH, COTH,     
 ACOSH, ASINH, ATANH, ACOTH</comment>
 </section>
@@ -958,161 +1067,180 @@ ACOSH, ASINH, ATANH, ACOTH</comment>
 <bookmark_value>SUBTOTAL function</bookmark_value>
 </bookmark><comment>mw made "sums..." a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEILERGEBNIS" id="bm_id3165644" localize="false"/>
-<paragraph role="heading" id="hd_id3165633" xml-lang="en-US" level="2" l10n="U" oldref="466">SUBTOTAL</paragraph>
-<paragraph role="paragraph" id="par_id3165682" xml-lang="en-US" l10n="U" oldref="467"><ahelp hid="HID_FUNC_TEILERGEBNIS">Calculates subtotals.</ahelp> If a range already contains subtotals, these are not used for further calculations. Use this function with the AutoFilters to take only the filtered records into account.</paragraph>
-<paragraph role="heading" id="hd_id3165704" xml-lang="en-US" level="3" l10n="U" oldref="495">Syntax</paragraph>
-<paragraph role="code" id="par_id3165717" xml-lang="en-US" l10n="U" oldref="496">SUBTOTAL(Function; Range)</paragraph>
-<paragraph role="paragraph" id="par_id3165731" xml-lang="en-US" l10n="U" oldref="497">
-<emph>Function</emph> is a number that stands for one of the following functions:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165633" role="heading" level="2" l10n="U"
+oldref="466">SUBTOTAL</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165682" role="paragraph" l10n="U" oldref="467"><ahelp hid="HID_FUNC_TEILERGEBNIS">Calculates subtotals.</ahelp> If a range already contains subtotals, these are not used for further calculations. Use this function with the AutoFilters to take only the filtered records into account.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165704" role="heading" level="3" l10n="U"
+oldref="495">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165717" role="code" l10n="U" oldref="496">SUBTOTAL(Function; Range)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165731" role="paragraph" l10n="U" oldref="497"><emph>Function</emph> is a number that stands for one of the following functions:</paragraph>
 <table id="tbl_id3165752">
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165782" xml-lang="en-US" l10n="U" oldref="469">Function index</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165782" role="paragraph" l10n="U" oldref="469">Function index</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165806" xml-lang="en-US" l10n="U" oldref="470">Function</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165806" role="paragraph" l10n="U" oldref="470">Function</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165833" xml-lang="en-US" l10n="U" oldref="471">1</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165833" role="paragraph" l10n="U" oldref="471">1</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165856" xml-lang="en-US" l10n="U" oldref="472">AVERAGE</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165856" role="paragraph" l10n="U" oldref="472">AVERAGE</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165883" xml-lang="en-US" l10n="U" oldref="473">2</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165883" role="paragraph" l10n="U" oldref="473">2</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165906" xml-lang="en-US" l10n="U" oldref="474">COUNT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165906" role="paragraph" l10n="U" oldref="474">COUNT</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165933" xml-lang="en-US" l10n="U" oldref="475">3</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165933" role="paragraph" l10n="U" oldref="475">3</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165956" xml-lang="en-US" l10n="U" oldref="476">COUNTA</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165956" role="paragraph" l10n="U" oldref="476">COUNTA</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3165983" xml-lang="en-US" l10n="U" oldref="477">4</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165983" role="paragraph" l10n="U" oldref="477">4</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3166006" xml-lang="en-US" l10n="U" oldref="478">MAX</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166006" role="paragraph" l10n="U" oldref="478">MAX</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3166033" xml-lang="en-US" l10n="U" oldref="479">5</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166033" role="paragraph" l10n="U" oldref="479">5</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3166056" xml-lang="en-US" l10n="U" oldref="480">MIN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166056" role="paragraph" l10n="U" oldref="480">MIN</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143316" xml-lang="en-US" l10n="U" oldref="481">6</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143316" role="paragraph" l10n="U" oldref="481">6</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143339" xml-lang="en-US" l10n="U" oldref="482">PRODUCT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143339" role="paragraph" l10n="U" oldref="482">PRODUCT</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143366" xml-lang="en-US" l10n="U" oldref="483">7</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143366" role="paragraph" l10n="U" oldref="483">7</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143389" xml-lang="en-US" l10n="U" oldref="484">STDEV</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143389" role="paragraph" l10n="U" oldref="484">STDEV</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143416" xml-lang="en-US" l10n="U" oldref="485">8</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143416" role="paragraph" l10n="U" oldref="485">8</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143439" xml-lang="en-US" l10n="U" oldref="486">STDEVP</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143439" role="paragraph" l10n="U" oldref="486">STDEVP</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143466" xml-lang="en-US" l10n="U" oldref="487">9</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143466" role="paragraph" l10n="U" oldref="487">9</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143489" xml-lang="en-US" l10n="U" oldref="488">SUM</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143489" role="paragraph" l10n="U" oldref="488">SUM</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143516" xml-lang="en-US" l10n="U" oldref="489">10</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143516" role="paragraph" l10n="U" oldref="489">10</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143539" xml-lang="en-US" l10n="U" oldref="490">VAR</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143539" role="paragraph" l10n="U" oldref="490">VAR</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143566" xml-lang="en-US" l10n="U" oldref="491">11</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143566" role="paragraph" l10n="U" oldref="491">11</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3143589" xml-lang="en-US" l10n="U" oldref="492">VARP</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143589" role="paragraph" l10n="U" oldref="492">VARP</paragraph>
 </tablecell>
 </tablerow>
 </table>
 
-<paragraph role="paragraph" id="par_id3143606" xml-lang="en-US" l10n="U" oldref="498">
-<emph>Range</emph> is the range whose cells are included.</paragraph>
-<paragraph role="heading" id="hd_id3143625" xml-lang="en-US" level="3" l10n="U" oldref="499">Example</paragraph>
-<paragraph role="paragraph" id="par_id3143638" xml-lang="en-US" l10n="U" oldref="562">You have a table in the cell range A1:B5 containing cities in column A and accompanying figures in column B. You have used an AutoFilter so that you only see rows containing the city Hamburg. You want to see the sum of the figures that are displayed; that is, just the subtotal for the filtered rows. In this case the correct formula would be:</paragraph>
-<paragraph role="paragraph" id="par_id3143658" xml-lang="en-US" l10n="U" oldref="563">
+<paragraph xml-lang="en-US" id="par_id3143606" role="paragraph" l10n="U" oldref="498"><emph>Range</emph> is the range whose cells are included.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3143625" role="heading" level="3" l10n="U"
+oldref="499">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143638" role="paragraph" l10n="U" oldref="562">You have a table in the cell range A1:B5 containing cities in column A and accompanying figures in column B. You have used an AutoFilter so that you only see rows containing the city Hamburg. You want to see the sum of the figures that are displayed; that is, just the subtotal for the filtered rows. In this case the correct formula would be:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143658" role="paragraph" l10n="U" oldref="563">
 <item type="input">=SUBTOTAL(9;B2:B5)</item>
 </paragraph>
 </section>
 <section id="Section11">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143672"><bookmark_value>Euro; converting in</bookmark_value>
-<bookmark_value>CONVERT function</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3143672"><bookmark_value>Euro; converting</bookmark_value>
+<bookmark_value>EUROCONVERT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_UMRECHNEN" id="bm_id3143684" localize="false"/>
-<paragraph role="heading" id="hd_id3143672" xml-lang="en-US" level="2" l10n="U" oldref="564">CONVERT<comment>insert link in financial</comment></paragraph>
-<paragraph role="paragraph" id="par_id3143708" xml-lang="en-US" l10n="CHG" oldref="565"><ahelp hid="HID_FUNC_UMRECHNEN">Converts old European national currency to and from Euros.</ahelp></paragraph>
-<paragraph role="heading" id="par_id3143731" xml-lang="en-US" level="3" l10n="U" oldref="566">
-<emph>Syntax</emph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_EUROCONVERT" id="bm_id0119200904282677" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3143672" role="heading" level="2" l10n="CHG"
+oldref="564">EUROCONVERT<comment>insert link in financial</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3143708" role="paragraph" l10n="CHG" oldref="565"><ahelp hid="HID_FUNC_UMRECHNEN">Converts between old European national currency and to and from Euros.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3143731" role="heading" level="3" l10n="U"
+oldref="566"><emph>Syntax</emph>
 </paragraph>
-<paragraph role="code" id="par_id3143748" xml-lang="en-US" l10n="CHG" oldref="567">CONVERT(Value; "Currency1"; "Currency2")</paragraph>
-<paragraph role="paragraph" id="par_id3143763" xml-lang="en-US" l10n="U" oldref="568">
-<emph>Value</emph> is the amount of the currency to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id3143782" xml-lang="en-US" l10n="U" oldref="569">
-<emph>Currency1</emph> and <emph>Currency2</emph> are the currency units to convert from and to respectively. These must be text, the official abbreviation for the currency (for example, "EUR"). The rates (shown per Euro) were set by the European Commission.</paragraph>
-<paragraph role="paragraph" id="par_id2361217" xml-lang="en-US" l10n="NEW">Either <emph>Currency1</emph> or <emph>Currency2</emph> must be specified as Euros.</paragraph>
-<paragraph role="heading" id="par_id3143819" xml-lang="en-US" level="3" l10n="U" oldref="570">
-<emph>Examples</emph>
+<paragraph xml-lang="en-US" id="par_id3143748" role="code" l10n="CHG" oldref="567">EUROCONVERT(Value; "From_currency"; "To_currency", full_precision, triangulation_precision)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143763" role="paragraph" l10n="U" oldref="568"><emph>Value</emph> is the amount of the currency to be converted.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143782" role="paragraph" l10n="CHG" oldref="569"><emph>From_currency</emph> and <emph>To_currency</emph> are the currency units to convert from and to respectively. These must be text, the official abbreviation for the currency (for example, "EUR"). The rates (shown per Euro) were set by the European Commission.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0119200904301810" role="paragraph" l10n="NEW"><emph>Full_precision</emph> is optional. If omitted or False, the result is rounded according to the decimals of the To currency. If Full_precision is True, the result is not rounded.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0119200904301815" role="paragraph" l10n="NEW"><emph>Triangulation_precision</emph> is optional. If Triangulation_precision is given and &gt;=3, the intermediate result of a triangular conversion (currency1,EUR,currency2) is rounded to that precision. If Triangulation_precision is omitted, the intermediate result is not rounded. Also if To currency is "EUR", Triangulation_precision is used as if triangulation was needed and conversion from EUR to EUR was applied.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143819" role="heading" level="3" l10n="U"
+oldref="570"><emph>Examples</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3143837" xml-lang="en-US" l10n="U" oldref="571">
-<item type="input">=CONVERT(100;"ATS";"EUR")</item> converts 100 Austrian Schillings into Euros.</paragraph>
-<paragraph role="paragraph" id="par_id3143853" xml-lang="en-US" l10n="U" oldref="572">
-<item type="input">=CONVERT(100;"EUR";"DEM")</item> converts 100 Euros into German Marks.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143837" role="paragraph" l10n="U" oldref="571">
+<item type="input">=EUROCONVERT(100;"ATS";"EUR")</item> converts 100 Austrian Schillings into Euros.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143853" role="paragraph" l10n="U" oldref="572">
+<item type="input">=EUROCONVERT(100;"EUR";"DEM")</item> converts 100 Euros into German Marks.</paragraph>
+</section>
+<section id="convert">
+<bookmark xml-lang="en-US" branch="index" id="bm_id0908200902090676"><bookmark_value>CONVERT function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_UMRECHNEN" id="bm_id0908200902093111" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0908200902074836" role="heading" level="2" l10n="NEW">CONVERT</paragraph>
+<paragraph xml-lang="en-US" id="par_id0908200902131122" role="paragraph" l10n="NEW"><ahelp hid=".">Converts a value from one unit of measurement to another unit of measurement. The conversion factors are given in a list in the configuration.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0908200902475420" role="paragraph" l10n="NEW">At one time the list of conversion factors included the legacy European currencies and the Euro (see examples below). We suggest using the new function EUROCONVERT for converting these currencies.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0908200902131071" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id0908200902131191" role="code" l10n="NEW">CONVERT(value;"text";"text")</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0908200902131152" role="heading" level="3" l10n="NEW">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id090820090213112" role="paragraph" l10n="NEW">
+<item type="input">=CONVERT(100;"ATS";"EUR")</item> returns the Euro value of 100 Austrian Schillings.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0908200902475431" role="paragraph" l10n="NEW">=CONVERT(100;"EUR";"DEM") converts 100 Euros into German Marks. </paragraph>
 </section>
 <section id="Section10">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3157177"><bookmark_value>ODD function</bookmark_value>
 <bookmark_value>rounding;up/down to nearest odd integer</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_UNGERADE" id="bm_id3157188" localize="false"/>
-<paragraph role="heading" id="hd_id3157177" xml-lang="en-US" level="2" l10n="U" oldref="502">ODD</paragraph>
-<paragraph role="paragraph" id="par_id3157205" xml-lang="en-US" l10n="CHG" oldref="503"><ahelp hid="HID_FUNC_UNGERADE">Rounds a positive number up to the nearest odd integer and a negative number down to the nearest odd integer.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3157223" xml-lang="en-US" level="3" l10n="U" oldref="504">Syntax</paragraph>
-<paragraph role="code" id="par_id3157237" xml-lang="en-US" l10n="U" oldref="505">ODD(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3157250" xml-lang="en-US" l10n="CHG" oldref="506"> Returns <emph>Number</emph> rounded to the next odd integer up, away from zero.</paragraph>
-<paragraph role="heading" id="hd_id3157270" xml-lang="en-US" level="3" l10n="U" oldref="507">Example</paragraph>
-<paragraph role="paragraph" id="par_id3157283" xml-lang="en-US" l10n="CHG" oldref="508">
+<paragraph xml-lang="en-US" id="hd_id3157177" role="heading" level="2" l10n="U"
+oldref="502">ODD</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157205" role="paragraph" l10n="CHG" oldref="503"><ahelp hid="HID_FUNC_UNGERADE">Rounds a positive number up to the nearest odd integer and a negative number down to the nearest odd integer.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157223" role="heading" level="3" l10n="U"
+oldref="504">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157237" role="code" l10n="U" oldref="505">ODD(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157250" role="paragraph" l10n="CHG" oldref="506"> Returns <emph>Number</emph> rounded to the next odd integer up, away from zero.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157270" role="heading" level="3" l10n="U"
+oldref="507">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157283" role="paragraph" l10n="CHG" oldref="508">
 <item type="input">=ODD(1.2)</item> returns 3.</paragraph>
-<paragraph role="paragraph" id="par_id8746910" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id8746910" role="paragraph" l10n="NEW">
 <item type="input">=ODD(1)</item> returns 1.</paragraph>
-<paragraph role="paragraph" id="par_id9636524" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">
 <item type="input">=ODD(0)</item> returns 1.</paragraph>
-<paragraph role="paragraph" id="par_id5675527" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5675527" role="paragraph" l10n="NEW">
 <item type="input">=ODD(-3.1)</item> returns -5.</paragraph><comment>see also CEILING, FLOOR, EVEN, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 </section>
@@ -1121,23 +1249,23 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>rounding;down to nearest multiple of significance</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_UNTERGRENZE" id="bm_id3157415" localize="false"/>
-<paragraph role="heading" id="hd_id3157404" xml-lang="en-US" level="2" l10n="U" oldref="512">FLOOR</paragraph>
-<paragraph role="paragraph" id="par_id3157432" xml-lang="en-US" l10n="U" oldref="513"><ahelp hid="HID_FUNC_UNTERGRENZE">Rounds a number down to the nearest multiple of Significance.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3157451" xml-lang="en-US" level="3" l10n="U" oldref="514">Syntax</paragraph>
-<paragraph role="code" id="par_id3157464" xml-lang="en-US" l10n="U" oldref="515">FLOOR(Number; Significance; Mode)</paragraph>
-<paragraph role="paragraph" id="par_id3157478" xml-lang="en-US" l10n="U" oldref="516">
-<emph>Number</emph> is the number that is to be rounded down.</paragraph>
-<paragraph role="paragraph" id="par_id3157497" xml-lang="en-US" l10n="U" oldref="517">
-<emph>Significance</emph> is the value to whose multiple the number is to be rounded down.</paragraph>
-<paragraph role="paragraph" id="par_id3157517" xml-lang="en-US" l10n="CHG" oldref="561">
-<emph>Mode</emph> is an optional value. If the Mode value is given and not equal to zero, and if Number and Significance are negative, then rounding is done based on the absolute value of the number. This parameter is ignored when exporting to MS Excel as Excel does not know any third parameter.</paragraph>
-<paragraph role="warning" id="par_id3163894" xml-lang="en-US" l10n="CHG" oldref="630">If both parameters Number and Significance are negative, and if the Mode value is equal to zero or is not specified, then the results in $[officename] Calc and Excel will differ after exporting. If you export the spreadsheet to Excel, use Mode=1 to see the same results in Excel as in Calc.</paragraph>
-<paragraph role="heading" id="hd_id3163932" xml-lang="en-US" level="3" l10n="U" oldref="518">Example</paragraph>
-<paragraph role="paragraph" id="par_id3163945" xml-lang="en-US" l10n="CHG" oldref="519">
+<paragraph xml-lang="en-US" id="hd_id3157404" role="heading" level="2" l10n="U"
+oldref="512">FLOOR</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157432" role="paragraph" l10n="U" oldref="513"><ahelp hid="HID_FUNC_UNTERGRENZE">Rounds a number down to the nearest multiple of Significance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157451" role="heading" level="3" l10n="U"
+oldref="514">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157464" role="code" l10n="U" oldref="515">FLOOR(Number; Significance; Mode)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157478" role="paragraph" l10n="U" oldref="516"><emph>Number</emph> is the number that is to be rounded down.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157497" role="paragraph" l10n="U" oldref="517"><emph>Significance</emph> is the value to whose multiple the number is to be rounded down.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157517" role="paragraph" l10n="CHG" oldref="561"><emph>Mode</emph> is an optional value. If the Mode value is given and not equal to zero, and if Number and Significance are negative, then rounding is done based on the absolute value of the number. This parameter is ignored when exporting to MS Excel as Excel does not know any third parameter.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163894" role="warning" l10n="CHG" oldref="630">If both parameters Number and Significance are negative, and if the Mode value is equal to zero or is not specified, then the results in $[officename] Calc and Excel will differ after exporting. If you export the spreadsheet to Excel, use Mode=1 to see the same results in Excel as in Calc.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163932" role="heading" level="3" l10n="U"
+oldref="518">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3163945" role="paragraph" l10n="CHG" oldref="519">
 <item type="input">=FLOOR( -11;-2)</item> returns -12</paragraph>
-<paragraph role="paragraph" id="par_id3163966" xml-lang="en-US" l10n="CHG" oldref="520">
+<paragraph xml-lang="en-US" id="par_id3163966" role="paragraph" l10n="CHG" oldref="520">
 <item type="input">=FLOOR( -11;-2;0)</item> returns -12</paragraph>
-<paragraph role="paragraph" id="par_id3163988" xml-lang="en-US" l10n="CHG" oldref="521">
+<paragraph xml-lang="en-US" id="par_id3163988" role="paragraph" l10n="CHG" oldref="521">
 <item type="input">=FLOOR( -11;-2;1)</item> returns -10</paragraph><comment>see also CEILING, EVEN, ODD, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP,  </comment>
 </section>
@@ -1146,16 +1274,18 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP,  </comment>
 <bookmark_value>algebraic signs</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VORZEICHEN" id="bm_id3164098" localize="false"/>
-<paragraph role="heading" id="hd_id3164086" xml-lang="en-US" level="2" l10n="U" oldref="523">SIGN</paragraph>
-<paragraph role="paragraph" id="par_id3164115" xml-lang="en-US" l10n="CHG" oldref="524"><ahelp hid="HID_FUNC_VORZEICHEN">Returns the sign of a number. Returns 1 if the number is positive, -1 if negative and 0 if zero.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3164136" xml-lang="en-US" level="3" l10n="U" oldref="525">Syntax</paragraph>
-<paragraph role="code" id="par_id3164150" xml-lang="en-US" l10n="U" oldref="526">SIGN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3164164" xml-lang="en-US" l10n="U" oldref="527">
-<emph>Number</emph> is the number whose sign is to be determined.</paragraph>
-<paragraph role="heading" id="hd_id3164183" xml-lang="en-US" level="3" l10n="U" oldref="528">Example</paragraph>
-<paragraph role="paragraph" id="par_id3164197" xml-lang="en-US" l10n="CHG" oldref="529">
+<paragraph xml-lang="en-US" id="hd_id3164086" role="heading" level="2" l10n="U"
+oldref="523">SIGN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164115" role="paragraph" l10n="CHG" oldref="524"><ahelp hid="HID_FUNC_VORZEICHEN">Returns the sign of a number. Returns 1 if the number is positive, -1 if negative and 0 if zero.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164136" role="heading" level="3" l10n="U"
+oldref="525">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164150" role="code" l10n="U" oldref="526">SIGN(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164164" role="paragraph" l10n="U" oldref="527"><emph>Number</emph> is the number whose sign is to be determined.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164183" role="heading" level="3" l10n="U"
+oldref="528">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164197" role="paragraph" l10n="CHG" oldref="529">
 <item type="input">=SIGN(3.4)</item> returns 1.</paragraph>
-<paragraph role="paragraph" id="par_id3164212" xml-lang="en-US" l10n="CHG" oldref="530">
+<paragraph xml-lang="en-US" id="par_id3164212" role="paragraph" l10n="CHG" oldref="530">
 <item type="input">=SIGN(-4.5)</item> returns -1.</paragraph><comment>see also ABS</comment>
 </section>
 <section id="Section7">
@@ -1163,16 +1293,19 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP,  </comment>
 <bookmark_value>nearest multiple</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_MROUND" id="bm_id3164264" localize="false"/>
-<paragraph role="heading" id="hd_id3164252" xml-lang="en-US" level="2" l10n="E" oldref="658">MROUND</paragraph>
-<paragraph role="paragraph" id="par_id3164288" xml-lang="en-US" l10n="CHG" oldref="659"><ahelp hid="HID_AAI_FUNC_MROUND">Returns a number rounded to the nearest multiple of another number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3164306" xml-lang="en-US" level="3" l10n="U" oldref="660">Syntax</paragraph>
-<paragraph role="code" id="par_id3164320" xml-lang="en-US" l10n="U" oldref="661">MROUND(Number; Multiple)</paragraph>
-<paragraph role="paragraph" id="par_id3486434" xml-lang="en-US" l10n="NEW">Returns <emph>Number</emph> rounded to the nearest multiple of <emph>Multiple</emph>. </paragraph>
-<paragraph role="paragraph" id="par_id3068636" xml-lang="en-US" l10n="NEW">An alternative implementation would be <item type="literal">Multiple * ROUND(Number/Multiple)</item>.</paragraph>
-<paragraph role="heading" id="hd_id3164333" xml-lang="en-US" level="3" l10n="U" oldref="662">Example</paragraph>
-<paragraph role="paragraph" id="par_id3164347" xml-lang="en-US" l10n="CHG" oldref="663">
+<paragraph xml-lang="en-US" id="hd_id3164252" role="heading" level="2" l10n="E"
+oldref="658">MROUND</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164288" role="paragraph" l10n="CHG" oldref="659"><ahelp hid="HID_AAI_FUNC_MROUND">Returns a number rounded to the nearest multiple of another number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164306" role="heading" level="3" l10n="U"
+oldref="660">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164320" role="code" l10n="U" oldref="661">MROUND(Number; Multiple)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3486434" role="paragraph" l10n="NEW">Returns <emph>Number</emph> rounded to the nearest multiple of <emph>Multiple</emph>. </paragraph>
+<paragraph xml-lang="en-US" id="par_id3068636" role="paragraph" l10n="NEW">An alternative implementation would be <item type="literal">Multiple * ROUND(Number/Multiple)</item>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164333" role="heading" level="3" l10n="U"
+oldref="662">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164347" role="paragraph" l10n="CHG" oldref="663">
 <item type="input">=MROUND(15.5;3)</item> returns 15, as 15.5 is closer to 15 (= 3*5) than to 18 (= 3*6).</paragraph>
-<paragraph role="paragraph" id="par_idN14DD6" xml-lang="en-US" l10n="CHG">
+<paragraph xml-lang="en-US" id="par_idN14DD6" role="paragraph" l10n="CHG">
 <item type="input">=MROUND(1.4;0.5)</item> returns 1.5 (= 0.5*3).</paragraph><comment>see also CEILING, FLOOR, EVEN, ODD,    
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 </section>
@@ -1181,16 +1314,19 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>square roots;positive numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WURZEL" id="bm_id3164387" localize="false"/>
-<paragraph role="heading" id="hd_id3164375" xml-lang="en-US" level="2" l10n="U" oldref="532">SQRT</paragraph>
-<paragraph role="paragraph" id="par_id3164404" xml-lang="en-US" l10n="CHG" oldref="533"><ahelp hid="HID_FUNC_WURZEL">Returns the positive square root of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3164424" xml-lang="en-US" level="3" l10n="U" oldref="534">Syntax</paragraph>
-<paragraph role="code" id="par_id3164437" xml-lang="en-US" l10n="U" oldref="535">SQRT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3164451" xml-lang="en-US" l10n="CHG" oldref="536">Returns the positive square root of <emph>Number</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id6870021" xml-lang="en-US" l10n="NEW"> Number must be positive.</paragraph>
-<paragraph role="heading" id="hd_id3164471" xml-lang="en-US" level="3" l10n="U" oldref="537">Example</paragraph>
-<paragraph role="paragraph" id="par_id3164484" xml-lang="en-US" l10n="CHG" oldref="538">
+<paragraph xml-lang="en-US" id="hd_id3164375" role="heading" level="2" l10n="U"
+oldref="532">SQRT</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164404" role="paragraph" l10n="CHG" oldref="533"><ahelp hid="HID_FUNC_WURZEL">Returns the positive square root of a number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164424" role="heading" level="3" l10n="U"
+oldref="534">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164437" role="code" l10n="U" oldref="535">SQRT(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164451" role="paragraph" l10n="CHG" oldref="536">Returns the positive square root of <emph>Number</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id6870021" role="paragraph" l10n="NEW"> Number must be positive.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164471" role="heading" level="3" l10n="U"
+oldref="537">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164484" role="paragraph" l10n="CHG" oldref="538">
 <item type="input">=SQRT(16)</item> returns 4.</paragraph>
-<paragraph role="paragraph" id="par_id3591723" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id3591723" role="paragraph" l10n="NEW">
 <item type="input">=SQRT(-16)</item> returns an <item type="literal">invalid argument</item> error.</paragraph><comment>see also SQRTPI, POWER  </comment>
 </section>
 <section id="Section5">
@@ -1198,14 +1334,17 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>square roots;products of Pi</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_SQRTPI" id="bm_id3164572" localize="false"/>
-<paragraph role="heading" id="hd_id3164560" xml-lang="en-US" level="2" l10n="E" oldref="665">SQRTPI</paragraph>
-<paragraph role="paragraph" id="par_id3164596" xml-lang="en-US" l10n="CHG" oldref="666"><ahelp hid="HID_AAI_FUNC_SQRTPI">Returns the square root of (PI times a number).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3164614" xml-lang="en-US" level="3" l10n="U" oldref="667">Syntax</paragraph>
-<paragraph role="code" id="par_id3164627" xml-lang="en-US" l10n="U" oldref="668">SQRTPI(Number)</paragraph>
-<paragraph role="paragraph" id="par_id1501510" xml-lang="en-US" l10n="NEW">Returns the positive square root of (PI multiplied by <emph>Number</emph>).</paragraph>
-<paragraph role="paragraph" id="par_id9929197" xml-lang="en-US" l10n="NEW">This is equivalent to <item type="literal">SQRT(PI()*Number)</item>.</paragraph>
-<paragraph role="heading" id="hd_id3164641" xml-lang="en-US" level="3" l10n="U" oldref="669">Example</paragraph>
-<paragraph role="paragraph" id="par_id3164654" xml-lang="en-US" l10n="CHG" oldref="670">
+<paragraph xml-lang="en-US" id="hd_id3164560" role="heading" level="2" l10n="E"
+oldref="665">SQRTPI</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164596" role="paragraph" l10n="CHG" oldref="666"><ahelp hid="HID_AAI_FUNC_SQRTPI">Returns the square root of (PI times a number).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164614" role="heading" level="3" l10n="U"
+oldref="667">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164627" role="code" l10n="U" oldref="668">SQRTPI(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id1501510" role="paragraph" l10n="NEW">Returns the positive square root of (PI multiplied by <emph>Number</emph>).</paragraph>
+<paragraph xml-lang="en-US" id="par_id9929197" role="paragraph" l10n="NEW">This is equivalent to <item type="literal">SQRT(PI()*Number)</item>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164641" role="heading" level="3" l10n="U"
+oldref="669">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164654" role="paragraph" l10n="CHG" oldref="670">
 <item type="input">=SQRTPI(2)</item> returns the squareroot of (2PI), approximately 2.506628.</paragraph><comment>see also SQRT</comment>
 </section>
 <section id="Section4">
@@ -1213,15 +1352,19 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>RANDBETWEEN function</bookmark_value>
 </bookmark><comment>mw changed "random numbers;"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_RANDBETWEEN" id="bm_id3164680" localize="false"/>
-<paragraph role="heading" id="hd_id3164669" xml-lang="en-US" level="2" l10n="E" oldref="671">RANDBETWEEN</paragraph>
-<paragraph role="paragraph" id="par_id3164711" xml-lang="en-US" l10n="CHG" oldref="672"><ahelp hid="HID_AAI_FUNC_RANDBETWEEN">Returns an integer random number in a specified range.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3164745" xml-lang="en-US" level="3" l10n="U" oldref="673">Syntax</paragraph>
-<paragraph role="code" id="par_id3164758" xml-lang="en-US" l10n="U" oldref="674">RANDBETWEEN(Bottom; Top)</paragraph>
-<paragraph role="paragraph" id="par_id7112338" xml-lang="en-US" l10n="NEW">Returns an integer random number between integers <emph>Bottom</emph> and <emph>Top</emph> (both inclusive).</paragraph>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
-<paragraph role="paragraph" id="par_id2091433" xml-lang="en-US" l10n="NEW">To generate random numbers which never recalculate, copy cells containing this function, and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
-<paragraph role="heading" id="hd_id3164772" xml-lang="en-US" level="3" l10n="U" oldref="675">Example</paragraph>
-<paragraph role="paragraph" id="par_id3164785" xml-lang="en-US" l10n="U" oldref="676">
+<paragraph xml-lang="en-US" id="hd_id3164669" role="heading" level="2" l10n="E"
+oldref="671">RANDBETWEEN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164711" role="paragraph" l10n="CHG" oldref="672"><ahelp hid="HID_AAI_FUNC_RANDBETWEEN">Returns an integer random number in a specified range.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164745" role="heading" level="3" l10n="U"
+oldref="673">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164758" role="code" l10n="U" oldref="674">RANDBETWEEN(Bottom; Top)</paragraph>
+<paragraph xml-lang="en-US" id="par_id7112338" role="paragraph" l10n="NEW">Returns an integer random number between integers <emph>Bottom</emph> and <emph>Top</emph> (both inclusive).</paragraph>
+<paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
+<paragraph xml-lang="en-US" id="par_id2091433" role="paragraph" l10n="NEW">To generate random numbers which never recalculate, copy cells containing this function, and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164772" role="heading" level="3" l10n="U"
+oldref="675">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164785" role="paragraph" l10n="U" oldref="676">
 <item type="input">=RANDBETWEEN(20;30)</item> returns an integer of between 20 and 30.</paragraph><comment>see also RAND</comment>
 </section>
 <section id="Section3">
@@ -1229,14 +1372,17 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>random numbers;between 0 and 1</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZUFALLSZAHL" id="bm_id3164812" localize="false"/>
-<paragraph role="heading" id="hd_id3164800" xml-lang="en-US" level="2" l10n="U" oldref="542">RAND</paragraph>
-<paragraph role="paragraph" id="par_id3164829" xml-lang="en-US" l10n="CHG" oldref="543"><ahelp hid="HID_FUNC_ZUFALLSZAHL">Returns a random number between 0 and 1.</ahelp><comment>The value of 0 can be returned, the value of 1 not.</comment><comment>this is really true after issue 53642 will be fixed</comment></paragraph>
-<paragraph role="heading" id="hd_id3164870" xml-lang="en-US" level="3" l10n="U" oldref="545">Syntax</paragraph>
-<paragraph role="code" id="par_id3164884" xml-lang="en-US" l10n="U" oldref="546">RAND()</paragraph>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
-<paragraph role="paragraph" id="par_id9312417" xml-lang="en-US" l10n="NEW">To generate random numbers which never recalculate, copy cells each containing =RAND(), and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
-<paragraph role="heading" id="hd_id9089022" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id9569078" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="hd_id3164800" role="heading" level="2" l10n="U"
+oldref="542">RAND</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164829" role="paragraph" l10n="CHG" oldref="543"><ahelp hid="HID_FUNC_ZUFALLSZAHL">Returns a random number between 0 and 1.</ahelp><comment>The value of 0 can be returned, the value of 1 not.</comment><comment>this is really true after issue 53642 will be fixed</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164870" role="heading" level="3" l10n="U"
+oldref="545">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164884" role="code" l10n="U" oldref="546">RAND()</paragraph>
+<paragraph xml-lang="en-US" id="par_id5092318" role="paragraph" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
+<paragraph xml-lang="en-US" id="par_id9312417" role="paragraph" l10n="NEW">To generate random numbers which never recalculate, copy cells each containing =RAND(), and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
+<paragraph xml-lang="en-US" id="hd_id9089022" role="heading" level="3" l10n="NEW">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id9569078" role="paragraph" l10n="NEW">
 <item type="input">=RAND()</item> returns a random number between 0 and 1.</paragraph><comment>see also RANDBETWEEN  
 </comment>
 </section>
@@ -1245,28 +1391,29 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <bookmark_value>counting;specified cells</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZAEHLENWENN" id="bm_id3164909" localize="false"/>
-<paragraph role="heading" id="hd_id3164897" xml-lang="en-US" level="2" l10n="U" oldref="547">COUNTIF</paragraph>
-<paragraph role="paragraph" id="par_id3164926" xml-lang="en-US" l10n="CHG" oldref="548"><ahelp hid="HID_FUNC_ZAEHLENWENN">Returns the number of cells that meet with certain criteria within a cell range.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3164897" role="heading" level="2" l10n="U"
+oldref="547">COUNTIF</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164926" role="paragraph" l10n="CHG" oldref="548"><ahelp hid="HID_FUNC_ZAEHLENWENN">Returns the number of cells that meet with certain criteria within a cell range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3164953" xml-lang="en-US" level="3" l10n="U" oldref="549">Syntax</paragraph>
-<paragraph role="code" id="par_id3164967" xml-lang="en-US" l10n="U" oldref="550">COUNTIF(Range; Criteria)</paragraph>
-<paragraph role="paragraph" id="par_id3164980" xml-lang="en-US" l10n="U" oldref="551">
-<emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
-<paragraph role="paragraph" id="par_id3165000" xml-lang="en-US" l10n="CHG" oldref="552">
-<emph>Criteria</emph> indicates the criteria in the form of a number, an expression or a character string. These criteria determine which cells are counted. You may also enter a search text in the form of a regular expression, e.g. b.* for all words that begin with b. You may also indicate a cell range that contains the search criterion. If you search for literal text, enclose the text in double quotes.</paragraph>
-<paragraph role="heading" id="hd_id3165037" xml-lang="en-US" level="3" l10n="U" oldref="553">Example</paragraph>
-<paragraph role="paragraph" id="par_id3166505" xml-lang="en-US" l10n="CHG" oldref="627">A1:A10 is a cell range containing the numbers <item type="input">2000</item> to <item type="input">2009</item>. Cell B1 contains the number <item type="input">2006</item>. In cell B2, you enter a formula:</paragraph>
-<paragraph role="paragraph" id="par_id3581652" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="hd_id3164953" role="heading" level="3" l10n="U"
+oldref="549">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164967" role="code" l10n="U" oldref="550">COUNTIF(Range; Criteria)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3164980" role="paragraph" l10n="U" oldref="551"><emph>Range</emph> is the range to which the criteria are to be applied.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3165000" role="paragraph" l10n="CHG" oldref="552"><emph>Criteria</emph> indicates the criteria in the form of a number, an expression or a character string. These criteria determine which cells are counted. You may also enter a search text in the form of a regular expression, e.g. b.* for all words that begin with b. You may also indicate a cell range that contains the search criterion. If you search for literal text, enclose the text in double quotes.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3165037" role="heading" level="3" l10n="U"
+oldref="553">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166505" role="paragraph" l10n="CHG" oldref="627">A1:A10 is a cell range containing the numbers <item type="input">2000</item> to <item type="input">2009</item>. Cell B1 contains the number <item type="input">2006</item>. In cell B2, you enter a formula:</paragraph>
+<paragraph xml-lang="en-US" id="par_id3581652" role="paragraph" l10n="NEW">
 <item type="input">=COUNTIF(A1:A10;2006)</item> - this returns 1</paragraph>
-<paragraph role="paragraph" id="par_id708639" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id708639" role="paragraph" l10n="NEW">
 <item type="input">=COUNTIF(A1:A10;B1)</item> - this returns 1</paragraph>
-<paragraph role="paragraph" id="par_id5169225" xml-lang="en-US" l10n="NEW">
-<item type="input">=COUNTIF(A1:A10;"&gt;=2006") </item>- this returns 3</paragraph>
-<paragraph role="paragraph" id="par_id2118594" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id5169225" role="paragraph" l10n="NEW">
+<item type="input">=COUNTIF(A1:A10;"&gt;=2006") </item>- this returns 4</paragraph>
+<paragraph xml-lang="en-US" id="par_id2118594" role="paragraph" l10n="NEW">
 <item type="input">=COUNTIF(A1:A10;"&lt;"&amp;B1)</item> - when B1 contains <item type="input">2006</item>, this returns 6</paragraph>
-<paragraph role="paragraph" id="par_id166020" xml-lang="en-US" l10n="NEW">
+<paragraph xml-lang="en-US" id="par_id166020" role="paragraph" l10n="NEW">
 <item type="input">=COUNTIF(A1:A10;C2)</item> where cell C2 contains the text <item type="input">&gt;2006</item> counts the number of cells in the range A1:A10 which are &gt;2006 </paragraph>
-<paragraph role="paragraph" id="par_id6386913" xml-lang="en-US" l10n="NEW">To count only negative numbers: <item type="input">=COUNTIF(A1:A10;"&lt;0")</item>
+<paragraph xml-lang="en-US" id="par_id6386913" role="paragraph" l10n="NEW">To count only negative numbers: <item type="input">=COUNTIF(A1:A10;"&lt;0")</item>
 </paragraph>
 </section>
 </sort>
@@ -1274,4 +1421,4 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
 <embed href="text/scalc/01/04060100.xhp#drking"/>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060107.xhp b/helpcontent2/source/text/scalc/01/04060107.xhp
index 01dd9640d1..7e9b4fcd6b 100644
--- a/helpcontent2/source/text/scalc/01/04060107.xhp
+++ b/helpcontent2/source/text/scalc/01/04060107.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060107.xhp,v $
- * $Revision: 1.17.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1203,7 +1200,7 @@ for bug #i31051#</comment></paragraph>
 <paragraph role="paragraph" id="par_id3163417" xml-lang="en-US" l10n="U" oldref="182">
 <emph>ArrayX</emph> represents the first array whose arguments are to be squared and added.</paragraph>
 <paragraph role="paragraph" id="par_id3163437" xml-lang="en-US" l10n="U" oldref="183">
-<emph>ArrayY</emph> represents the second array, whose elements are to be added and squared.</paragraph>
+<emph>ArrayY</emph> represents the second array, whose elements are to be squared and added.</paragraph>
 <paragraph role="paragraph" id="par_idN11E45" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/scalc/00/00000004.xhp#moreontop"/>
 </paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060108.xhp b/helpcontent2/source/text/scalc/01/04060108.xhp
index 90c927e940..b7fe1f036e 100755
--- a/helpcontent2/source/text/scalc/01/04060108.xhp
+++ b/helpcontent2/source/text/scalc/01/04060108.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060108.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index e40c995eb9..c7b3bc4227 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04060109.xhp,v $
- * $Revision: 1.20.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,543 +29,599 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textscalc0104060109xml" indexer="include">
-<title id="tit" xml-lang="en-US">Spreadsheet Functions</title>
-<filename>/text/scalc/01/04060109.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060109xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Spreadsheet Functions</title>
+         <filename>/text/scalc/01/04060109.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148522"><bookmark_value>spreadsheets; functions</bookmark_value>
-<bookmark_value>Function Wizard; spreadsheets</bookmark_value>
-<bookmark_value>functions; spreadsheets</bookmark_value>
+      <bookmark_value>Function Wizard; spreadsheets</bookmark_value>
+      <bookmark_value>functions; spreadsheets</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3148522" xml-lang="en-US" level="1" l10n="U" oldref="1">Spreadsheet Functions</paragraph>
-<paragraph role="paragraph" id="par_id3144508" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelletext">This section contains descriptions of the <emph>Spreadsheet</emph> functions together with an example. 
+<paragraph xml-lang="en-US" id="hd_id3148522" role="heading" level="1" l10n="U" oldref="1">Spreadsheet Functions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144508" role="paragraph" l10n="U" oldref="2"><variable id="tabelletext">This section contains descriptions of the <emph>Spreadsheet</emph> functions together with an example.
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000404.xhp#efefft"/>
-</section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000404.xhp#efefft"/>
+      </section>
 <sort order="asc">
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146968"><bookmark_value>ADDRESS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ADRESSE" id="bm_id3147546" localize="false"/>
-<paragraph role="heading" id="hd_id3146968" xml-lang="en-US" level="2" l10n="U" oldref="3">ADDRESS</paragraph>
-<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_FUNC_ADRESSE">Returns a cell address (reference) as text, according to the specified row and column numbers.</ahelp> You can determine whether the address is interpreted as an absolute address (for example, $A$1) or as a relative address (as A1) or in a mixed form (A$1 or $A1). You can also specify the name of the sheet.</paragraph>
-<section id="r1c1">
-<paragraph role="paragraph" id="par_id1027200802301348" xml-lang="en-US" l10n="NEW">For interoperability the ADDRESS and INDIRECT functions support an optional parameter to specify whether the R1C1 address notation instead of the usual A1 notation should be used.</paragraph>
-<paragraph role="paragraph" id="par_id1027200802301445" xml-lang="en-US" l10n="NEW">In ADDRESS, the parameter is inserted as the fourth parameter, shifting the optional sheet name parameter to the fifth position.</paragraph>
-<paragraph role="paragraph" id="par_id102720080230153" xml-lang="en-US" l10n="NEW">In INDIRECT, the parameter is appended as the second parameter.</paragraph>
-<paragraph role="paragraph" id="par_id102720080230151" xml-lang="en-US" l10n="NEW">In both functions, if the argument is inserted with the value 0, then the R1C1 notation is used. If the argument is not given or has a value other than 0, then the A1 notation is used. </paragraph>
-<paragraph role="paragraph" id="par_id1027200802301556" xml-lang="en-US" l10n="NEW">In case of R1C1 notation, ADDRESS returns address strings using the exclamation mark '!' as the sheet name separator, and INDIRECT expects the exclamation mark as sheet name separator. Both functions still use the dot '.' sheet name separator with A1 notation.</paragraph>
-<paragraph role="paragraph" id="par_id1027200802301521" xml-lang="en-US" l10n="NEW">When opening documents from ODF 1.0/1.1 format, the ADDRESS functions that show a sheet name as the fourth paramater will shift that sheet name to become the fifth parameter. A new fourth parameter with the value 1 will be inserted.</paragraph>
-<paragraph role="paragraph" id="par_id1027200802301650" xml-lang="en-US" l10n="NEW">When storing a document in ODF 1.0/1.1 format, if ADDRESS functions have a fourth parameter, that parameter will be removed.</paragraph>
-<paragraph role="note" id="par_id102720080230162" xml-lang="en-US" l10n="NEW">Do not save a spreadsheet in the old ODF 1.0/1.1 format if the ADDRESS function's new fourth parameter was used with a value of 0.</paragraph>
-<paragraph role="note" id="par_id1027200802301756" xml-lang="en-US" l10n="NEW">The INDIRECT function is saved without conversion to ODF 1.0/1.1 format. If the second parameter was present, an older version of Calc will return an error for that function.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3151196" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
-<paragraph role="code" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="6">ADDRESS(Row; Column; Abs; A1; "Sheet")</paragraph>
-<paragraph role="paragraph" id="par_id3147505" xml-lang="en-US" l10n="U" oldref="7">
-<emph>Row</emph> represents the row number for the cell reference</paragraph>
-<paragraph role="paragraph" id="par_id3145323" xml-lang="en-US" l10n="U" oldref="8">
-<emph>Column</emph> represents the column number for the cell reference (the number, not the letter)</paragraph>
-<paragraph role="paragraph" id="par_id3153074" xml-lang="en-US" l10n="U" oldref="9">
-<emph>Abs</emph> determines the type of reference:</paragraph>
-<paragraph role="paragraph" id="par_id3153298" xml-lang="en-US" l10n="CHG" oldref="10">1: absolute ($A$1)</paragraph>
-<paragraph role="paragraph" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="11">2: row reference type is absolute; column reference is relative (A$1)</paragraph>
-<paragraph role="paragraph" id="par_id3146096" xml-lang="en-US" l10n="U" oldref="12">3: row (relative); column (absolute) ($A1)</paragraph>
-<paragraph role="paragraph" id="par_id3153334" xml-lang="en-US" l10n="U" oldref="13">4: relative (A1)</paragraph>
-<paragraph role="paragraph" id="par_id1027200802465915" xml-lang="en-US" l10n="NEW">
-<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
-<paragraph role="paragraph" id="par_id3153962" xml-lang="en-US" l10n="U" oldref="14">
-<emph>Sheet</emph> represents the name of the sheet. It must be placed in double quotes.</paragraph>
-<paragraph role="heading" id="hd_id3147299" xml-lang="en-US" level="3" l10n="U" oldref="15">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3148744" xml-lang="en-US" l10n="U" oldref="16">
-<item type="input">=ADDRESS(1;1;2;"Sheet2")</item> returns the following: Sheet2.A$1</paragraph>
-<paragraph role="paragraph" id="par_id3159260" xml-lang="en-US" l10n="U" oldref="17">If the cell A1 in sheet 2 contains the value <item type="input">-6</item>, you can refer indirectly to the referenced cell using a function in B2 by entering <item type="input">=ABS(INDIRECT(B2))</item>. The result is the absolute value of the cell reference specified in B2, which in this case is 6.</paragraph>
-</section>
-<section id="Section2">
+<paragraph xml-lang="en-US" id="hd_id3146968" role="heading" level="2" l10n="U" oldref="3">ADDRESS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155762" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_FUNC_ADRESSE">Returns a cell address (reference) as text, according to the specified row and column numbers.</ahelp> You can determine whether the address is interpreted as an absolute address (for example, $A$1) or as a relative address (as A1) or in a mixed form (A$1 or $A1). You can also specify the name of the sheet.</paragraph>
+         <section id="r1c1">
+            <paragraph xml-lang="en-US" id="par_id1027200802301348" role="paragraph" l10n="NEW">For interoperability the ADDRESS and INDIRECT functions support an optional parameter to specify whether the R1C1 address notation instead of the usual A1 notation should be used.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1027200802301445" role="paragraph" l10n="NEW">In ADDRESS, the parameter is inserted as the fourth parameter, shifting the optional sheet name parameter to the fifth position.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id102720080230153" role="paragraph" l10n="NEW">In INDIRECT, the parameter is appended as the second parameter.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id102720080230151" role="paragraph" l10n="NEW">In both functions, if the argument is inserted with the value 0, then the R1C1 notation is used. If the argument is not given or has a value other than 0, then the A1 notation is used. </paragraph>
+            <paragraph xml-lang="en-US" id="par_id1027200802301556" role="paragraph" l10n="NEW">In case of R1C1 notation, ADDRESS returns address strings using the exclamation mark '!' as the sheet name separator, and INDIRECT expects the exclamation mark as sheet name separator. Both functions still use the dot '.' sheet name separator with A1 notation.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1027200802301521" role="paragraph" l10n="NEW">When opening documents from ODF 1.0/1.1 format, the ADDRESS functions that show a sheet name as the fourth paramater will shift that sheet name to become the fifth parameter. A new fourth parameter with the value 1 will be inserted.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1027200802301650" role="paragraph" l10n="NEW">When storing a document in ODF 1.0/1.1 format, if ADDRESS functions have a fourth parameter, that parameter will be removed.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id102720080230162" role="note" l10n="NEW">Do not save a spreadsheet in the old ODF 1.0/1.1 format if the ADDRESS function's new fourth parameter was used with a value of 0.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1027200802301756" role="note" l10n="NEW">The INDIRECT function is saved without conversion to ODF 1.0/1.1 format. If the second parameter was present, an older version of Calc will return an error for that function.</paragraph>
+         </section>
+         <paragraph xml-lang="en-US" id="hd_id3151196" role="heading" level="3" l10n="U" oldref="5">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154707" role="code" l10n="U" oldref="6">ADDRESS(Row; Column; Abs; A1; "Sheet")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147505" role="paragraph" l10n="U" oldref="7">
+            <emph>Row</emph> represents the row number for the cell reference</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145323" role="paragraph" l10n="U" oldref="8">
+            <emph>Column</emph> represents the column number for the cell reference (the number, not the letter)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153074" role="paragraph" l10n="U" oldref="9">
+            <emph>Abs</emph> determines the type of reference:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153298" role="paragraph" l10n="CHG" oldref="10">1: absolute ($A$1)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150431" role="paragraph" l10n="U" oldref="11">2: row reference type is absolute; column reference is relative (A$1)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146096" role="paragraph" l10n="U" oldref="12">3: row (relative); column (absolute) ($A1)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153334" role="paragraph" l10n="U" oldref="13">4: relative (A1)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1027200802465915" role="paragraph" l10n="NEW">
+            <emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153962" role="paragraph" l10n="U" oldref="14">
+            <emph>Sheet</emph> represents the name of the sheet. It must be placed in double quotes.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147299" role="heading" level="3" l10n="U"
+                    oldref="15">Example:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148744" role="paragraph" l10n="CHG" oldref="16">
+            <item type="input">=ADDRESS(1;1;2;;"Sheet2")</item> returns the following: Sheet2.A$1<comment>i 101187</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159260" role="paragraph" l10n="U" oldref="17">If the cell A1 in sheet 2 contains the value <item type="input">-6</item>, you can refer indirectly to the referenced cell using a function in B2 by entering <item type="input">=ABS(INDIRECT(B2))</item>. The result is the absolute value of the cell reference specified in B2, which in this case is 6.</paragraph>
+      </section>
+      <section id="Section2">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150372"><bookmark_value>AREAS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BEREICHE" id="bm_id3149721" localize="false"/>
-<paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="19">AREAS</paragraph>
-<paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_BEREICHE">Returns the number of individual ranges that belong to a multiple range.</ahelp> A range can consist of contiguous cells or a single cell.</paragraph>
-<paragraph role="heading" id="hd_id3145222" xml-lang="en-US" level="3" l10n="U" oldref="21">Syntax</paragraph>
-<paragraph role="code" id="par_id3155907" xml-lang="en-US" l10n="U" oldref="22">AREAS(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3153118" xml-lang="en-US" l10n="U" oldref="23">Reference represents the reference to a cell or cell range.</paragraph>
-<paragraph role="heading" id="hd_id3148891" xml-lang="en-US" level="3" l10n="U" oldref="24">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149946" xml-lang="en-US" l10n="U" oldref="25">
-<item type="input">=AREAS(A1:B3;F2;G1)</item> returns 3, as it is a reference to three cells and/or areas.</paragraph>
-<paragraph role="paragraph" id="par_id3146820" xml-lang="en-US" l10n="U" oldref="26">
-<item type="input">=AREAS(All)</item> returns 1 if you have defined an area named All under <emph>Data - Define Range</emph>.</paragraph>
-</section>
-<section id="Section3">
+<paragraph xml-lang="en-US" id="hd_id3150372" role="heading" level="2" l10n="U"
+                    oldref="19">AREAS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150036" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FUNC_BEREICHE">Returns the number of individual ranges that belong to a multiple range.</ahelp> A range can consist of contiguous cells or a single cell.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id061020090307073" role="paragraph" l10n="NEW">The function expects a single argument. If you state multiple ranges, you must enclose them into additional parentheses. Multiple ranges can be entered using the semicolon (;) as divider, but this gets automatically converted to the tilde (~) operator. The tilde is used to join ranges.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145222" role="heading" level="3" l10n="U"
+                    oldref="21">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155907" role="code" l10n="U" oldref="22">AREAS(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153118" role="paragraph" l10n="U" oldref="23">Reference represents the reference to a cell or cell range.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148891" role="heading" level="3" l10n="U"
+                    oldref="24">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149946" role="paragraph" l10n="U" oldref="25">
+            <item type="input">=AREAS((A1:B3;F2;G1))</item> returns 3, as it is a reference to three cells and/or areas. After entry this gets converted to =AREAS((A1:B3~F2~G1)).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146820" role="paragraph" l10n="U" oldref="26">
+            <item type="input">=AREAS(All)</item> returns 1 if you have defined an area named All under <emph>Data - Define Range</emph>.</paragraph>
+      </section>
+      <section id="Section3">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148727"><bookmark_value>DDE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DDE" id="bm_id3154680" localize="false"/>
-<paragraph role="heading" id="hd_id3148727" xml-lang="en-US" level="2" l10n="U" oldref="28">DDE</paragraph>
-<paragraph role="paragraph" id="par_id3149434" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_FUNC_DDE">Returns the result of a DDE-based link.</ahelp> If the contents of the linked range or section changes, the returned value will also change. You must reload the spreadsheet or choose <emph>Edit - Links</emph> to see the updated links. Cross-platform links, for example from a <item type="productname">%PRODUCTNAME</item> installation running on a Windows machine to a document created on a Linux machine, are not allowed.</paragraph>
-<paragraph role="heading" id="hd_id3150700" xml-lang="en-US" level="3" l10n="U" oldref="30">Syntax</paragraph>
-<paragraph role="code" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="31">DDE("Server"; "File"; "Range"; Mode)</paragraph>
-<paragraph role="paragraph" id="par_id3154842" xml-lang="en-US" l10n="U" oldref="32">
-<emph>Server</emph> is the name of a server application. <item type="productname">%PRODUCTNAME</item>applications have the server name "Soffice".</paragraph>
-<paragraph role="paragraph" id="par_id3153034" xml-lang="en-US" l10n="U" oldref="33">
-<emph>File</emph> is the complete file name, including path specification.</paragraph>
-<paragraph role="paragraph" id="par_id3147472" xml-lang="en-US" l10n="U" oldref="34">
-<emph>Range</emph> is the area containing the data to be evaluated.</paragraph>
-<paragraph role="paragraph" id="par_id3152773" xml-lang="en-US" l10n="U" oldref="184">
-<emph>Mode</emph> is an optional parameter that controls the method by which the DDE server converts its data into numbers.</paragraph>
-<table id="tbl_id3155828">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="185">
-<emph>Mode</emph>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145146" xml-lang="en-US" l10n="U" oldref="186">
-<emph>Effect</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="187">0 or missing</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="188">Number format from the "Default" cell style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152785" xml-lang="en-US" l10n="U" oldref="189">1</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="190">Data are always interpreted in the standard format for US English</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="U" oldref="191">2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153775" xml-lang="en-US" l10n="U" oldref="192">Data are retrieved as text; no conversion to numbers</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3148727" role="heading" level="2" l10n="U"
+                    oldref="28">DDE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149434" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_FUNC_DDE">Returns the result of a DDE-based link.</ahelp> If the contents of the linked range or section changes, the returned value will also change. You must reload the spreadsheet or choose <emph>Edit - Links</emph> to see the updated links. Cross-platform links, for example from a <item type="productname">%PRODUCTNAME</item> installation running on a Windows machine to a document created on a Linux machine, are not allowed.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150700" role="heading" level="3" l10n="U"
+                    oldref="30">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148886" role="code" l10n="U" oldref="31">DDE("Server"; "File"; "Range"; Mode)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154842" role="paragraph" l10n="U" oldref="32">
+            <emph>Server</emph> is the name of a server application. <item type="productname">%PRODUCTNAME</item>applications have the server name "Soffice".</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153034" role="paragraph" l10n="U" oldref="33">
+            <emph>File</emph> is the complete file name, including path specification.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147472" role="paragraph" l10n="U" oldref="34">
+            <emph>Range</emph> is the area containing the data to be evaluated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152773" role="paragraph" l10n="U" oldref="184">
+            <emph>Mode</emph> is an optional parameter that controls the method by which the DDE server converts its data into numbers.</paragraph>
+         <table id="tbl_id3155828">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154383" role="paragraph" l10n="U" oldref="185">
+                     <emph>Mode</emph>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145146" role="paragraph" l10n="U" oldref="186">
+                     <emph>Effect</emph>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154558" role="paragraph" l10n="U" oldref="187">0 or missing</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145596" role="paragraph" l10n="U" oldref="188">Number format from the "Default" cell style</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152785" role="paragraph" l10n="U" oldref="189">1</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154380" role="paragraph" l10n="U" oldref="190">Data are always interpreted in the standard format for US English</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150279" role="paragraph" l10n="U" oldref="191">2</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153775" role="paragraph" l10n="U" oldref="192">Data are retrieved as text; no conversion to numbers</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-<paragraph role="heading" id="hd_id3149546" xml-lang="en-US" level="3" l10n="U" oldref="35">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148734" xml-lang="en-US" l10n="U" oldref="36">
-<item type="input">=DDE("soffice";"c:\office\document\data1.sxc";"sheet1.A1")</item> reads the contents of cell A1 in sheet1 of the <item type="productname">%PRODUCTNAME</item> Calc spreadsheet data1.sxc.</paragraph>
-<paragraph role="paragraph" id="par_id3153081" xml-lang="en-US" l10n="U" oldref="37">
-<item type="input">=DDE("soffice";"c:\office\document\motto.sxw";"Today's motto")</item> returns a motto in the cell containing this formula. First, you must enter a line in the motto.sxw document containing the motto text and define it as the first line of a section named <item type="literal">Today's Motto</item> (in <item type="productname">%PRODUCTNAME</item> Writer under <emph>Insert - Section</emph>). If the motto is modified (and saved) in the <item type="productname">%PRODUCTNAME</item> Writer document, the motto is updated in all <item type="productname">%PRODUCTNAME</item> Calc cells in which this DDE link is defined.</paragraph>
-</section>
-<section id="Section4">
+         <paragraph xml-lang="en-US" id="hd_id3149546" role="heading" level="3" l10n="U"
+                    oldref="35">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148734" role="paragraph" l10n="U" oldref="36">
+            <item type="input">=DDE("soffice";"c:\office\document\data1.sxc";"sheet1.A1")</item> reads the contents of cell A1 in sheet1 of the <item type="productname">%PRODUCTNAME</item> Calc spreadsheet data1.sxc.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153081" role="paragraph" l10n="U" oldref="37">
+            <item type="input">=DDE("soffice";"c:\office\document\motto.sxw";"Today's motto")</item> returns a motto in the cell containing this formula. First, you must enter a line in the motto.sxw document containing the motto text and define it as the first line of a section named <item type="literal">Today's Motto</item> (in <item type="productname">%PRODUCTNAME</item> Writer under <emph>Insert - Section</emph>). If the motto is modified (and saved) in the <item type="productname">%PRODUCTNAME</item> Writer document, the motto is updated in all <item type="productname">%PRODUCTNAME</item> Calc cells in which this DDE link is defined.</paragraph>
+      </section>
+      <section id="Section4">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153114"><bookmark_value>ERRORTYPE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEHLERTYP" id="bm_id3153000" localize="false"/>
-<paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="2" l10n="U" oldref="38">ERRORTYPE</paragraph>
-<paragraph role="paragraph" id="par_id3148568" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_FUNC_FEHLERTYP">Returns the number corresponding to an <link href="text/scalc/05/02140000.xhp" name="error value">error value</link> occurring in a different cell.</ahelp> With the aid of this number, you can generate an error message text.</paragraph>
-<embed href="text/shared/00/00000001.xhp#wahr"/>
-<paragraph role="note" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="40">The Status Bar displays the predefined error code from <item type="productname">%PRODUCTNAME</item> if you click the cell containing the error.</paragraph>
-<paragraph role="heading" id="hd_id3154327" xml-lang="en-US" level="3" l10n="U" oldref="41">Syntax</paragraph>
-<paragraph role="code" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="42">ERRORTYPE(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3150132" xml-lang="en-US" l10n="U" oldref="43">
-<emph>Reference</emph> contains the address of the cell in which the error occurs.</paragraph>
-<paragraph role="heading" id="hd_id3145248" xml-lang="en-US" level="3" l10n="U" oldref="44">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146904" xml-lang="en-US" l10n="U" oldref="45">If cell A1 displays Err:518, the function <item type="input">=ERRORTYPE(A1)</item> returns the number 518.</paragraph>
-</section>
-<section id="Section5">
+<paragraph xml-lang="en-US" id="hd_id3153114" role="heading" level="2" l10n="U"
+                    oldref="38">ERRORTYPE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148568" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_FUNC_FEHLERTYP">Returns the number corresponding to an <link href="text/scalc/05/02140000.xhp" name="error value">error value</link> occurring in a different cell.</ahelp> With the aid of this number, you can generate an error message text.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#wahr"/>
+         <paragraph xml-lang="en-US" id="par_id3149877" role="note" l10n="U" oldref="40">The Status Bar displays the predefined error code from <item type="productname">%PRODUCTNAME</item> if you click the cell containing the error.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154327" role="heading" level="3" l10n="U"
+                    oldref="41">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151322" role="code" l10n="U" oldref="42">ERRORTYPE(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150132" role="paragraph" l10n="U" oldref="43">
+            <emph>Reference</emph> contains the address of the cell in which the error occurs.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145248" role="heading" level="3" l10n="U"
+                    oldref="44">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146904" role="paragraph" l10n="U" oldref="45">If cell A1 displays Err:518, the function <item type="input">=ERRORTYPE(A1)</item> returns the number 518.</paragraph>
+      </section>
+      <section id="Section5">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151221"><bookmark_value>INDEX function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDEX" id="bm_id3157989" localize="false"/>
-<paragraph role="heading" id="hd_id3151221" xml-lang="en-US" level="2" l10n="U" oldref="47">INDEX</paragraph>
-<paragraph role="paragraph" id="par_id3150268" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid="HID_FUNC_INDEX">INDEX returns a sub range, specified by row and column number, or an optional range index. Depending on context, INDEX returns a reference or content.</ahelp><comment>UFI: will change with i4904; see http://so-web.germany.sun.com/iBIS/servlet/edit.ControlPanel?tid=i57108</comment><comment>changed by i83070</comment></paragraph>
-<paragraph role="heading" id="hd_id3156063" xml-lang="en-US" level="3" l10n="U" oldref="49">Syntax</paragraph>
-<paragraph role="code" id="par_id3149007" xml-lang="en-US" l10n="U" oldref="50">INDEX(Reference; Row; Column; Range)</paragraph>
-<paragraph role="paragraph" id="par_id3153260" xml-lang="en-US" l10n="CHG" oldref="51">
-<emph>Reference</emph> is a reference, entered either directly or by specifying a range name. If the reference consists of multiple ranges, you must enclose the reference or range name in parentheses.</paragraph>
-<paragraph role="paragraph" id="par_id3145302" xml-lang="en-US" l10n="CHG" oldref="52">
-<emph>Row</emph> (optional) represents the row index of the reference range, for which to return a value. In case of zero (no specific row) all referenced rows are returned.</paragraph>
-<paragraph role="paragraph" id="par_id3154628" xml-lang="en-US" l10n="CHG" oldref="53">
-<emph>Column</emph> (optional) represents the column index of the reference range, for which to return a value. In case of zero (no specific column) all referenced columns are returned.</paragraph>
-<paragraph role="paragraph" id="par_id3155514" xml-lang="en-US" l10n="U" oldref="54">
-<emph>Range</emph> (optional) represents the index of the subrange if referring to a multiple range.</paragraph>
-<paragraph role="heading" id="hd_id3145264" xml-lang="en-US" level="3" l10n="U" oldref="55">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159112" xml-lang="en-US" l10n="U" oldref="56">
-<item type="input">=INDEX(Prices;4;1)</item> returns the value from row 4 and column 1 of the database range defined in <emph>Data - Define</emph> as <emph>Prices</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150691" xml-lang="en-US" l10n="U" oldref="57">
-<item type="input">=INDEX(SumX;4;1)</item> returns the value from the range <emph>SumX</emph> in row 4 and column 1 as defined in <emph>Insert - Names - Define</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id4109012" xml-lang="en-US" l10n="NEW">
-<item type="input">=INDEX(A1:B6;1)</item> returns a reference to the first row of A1:B6.</paragraph>
-<paragraph role="paragraph" id="par_id9272133" xml-lang="en-US" l10n="NEW">
-<item type="input">=INDEX(A1:B6;0;1)</item> returns a reference to the first column of A1:B6.</paragraph>
-<paragraph role="paragraph" id="par_id3158419" xml-lang="en-US" l10n="U" oldref="58">
-<item type="input">=INDEX((multi);4;1)</item> indicates the value contained in row 4 and column 1 of the (multiple) range, which you named under <emph>Insert - Names - Set</emph> as <emph>multi</emph>. The multiple range may consist of several rectangular ranges, each with a row 4 and column 1. If you now want to call the second block of this multiple range enter the number <item type="input">2</item> as the <emph>range</emph> parameter.</paragraph>
-<paragraph role="paragraph" id="par_id3148595" xml-lang="en-US" l10n="U" oldref="59">
-<item type="input">=INDEX(A1:B6;1;1)</item> indicates the value in the upper-left of the A1:B6 range.</paragraph>
-<paragraph role="paragraph" id="par_id9960020" xml-lang="en-US" l10n="NEW">
-<item type="input">=INDEX((multi);0;0;2)</item> returns a reference to the second range of the multiple range.</paragraph>
-</section>
-<section id="Section6">
+<paragraph xml-lang="en-US" id="hd_id3151221" role="heading" level="2" l10n="U"
+                    oldref="47">INDEX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150268" role="paragraph" l10n="CHG" oldref="48"><ahelp hid="HID_FUNC_INDEX">INDEX returns a sub range, specified by row and column number, or an optional range index. Depending on context, INDEX returns a reference or content.</ahelp><comment>UFI: will change with i4904; see http://so-web.germany.sun.com/iBIS/servlet/edit.ControlPanel?tid=i57108</comment><comment>changed by i83070</comment></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156063" role="heading" level="3" l10n="U"
+                    oldref="49">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149007" role="code" l10n="U" oldref="50">INDEX(Reference; Row; Column; Range)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153260" role="paragraph" l10n="CHG" oldref="51">
+            <emph>Reference</emph> is a reference, entered either directly or by specifying a range name. If the reference consists of multiple ranges, you must enclose the reference or range name in parentheses.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145302" role="paragraph" l10n="CHG" oldref="52">
+            <emph>Row</emph> (optional) represents the row index of the reference range, for which to return a value. In case of zero (no specific row) all referenced rows are returned.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154628" role="paragraph" l10n="CHG" oldref="53">
+            <emph>Column</emph> (optional) represents the column index of the reference range, for which to return a value. In case of zero (no specific column) all referenced columns are returned.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155514" role="paragraph" l10n="U" oldref="54">
+            <emph>Range</emph> (optional) represents the index of the subrange if referring to a multiple range.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145264" role="heading" level="3" l10n="U"
+                    oldref="55">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159112" role="paragraph" l10n="U" oldref="56">
+            <item type="input">=INDEX(Prices;4;1)</item> returns the value from row 4 and column 1 of the database range defined in <emph>Data - Define</emph> as <emph>Prices</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150691" role="paragraph" l10n="U" oldref="57">
+            <item type="input">=INDEX(SumX;4;1)</item> returns the value from the range <emph>SumX</emph> in row 4 and column 1 as defined in <emph>Insert - Names - Define</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4109012" role="paragraph" l10n="NEW">
+            <item type="input">=INDEX(A1:B6;1)</item> returns a reference to the first row of A1:B6.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9272133" role="paragraph" l10n="NEW">
+            <item type="input">=INDEX(A1:B6;0;1)</item> returns a reference to the first column of A1:B6.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158419" role="paragraph" l10n="U" oldref="58">
+            <item type="input">=INDEX((multi);4;1)</item> indicates the value contained in row 4 and column 1 of the (multiple) range, which you named under <emph>Insert - Names - Set</emph> as <emph>multi</emph>. The multiple range may consist of several rectangular ranges, each with a row 4 and column 1. If you now want to call the second block of this multiple range enter the number <item type="input">2</item> as the <emph>range</emph> parameter.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148595" role="paragraph" l10n="U" oldref="59">
+            <item type="input">=INDEX(A1:B6;1;1)</item> indicates the value in the upper-left of the A1:B6 range.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9960020" role="paragraph" l10n="NEW">
+            <item type="input">=INDEX((multi);0;0;2)</item> returns a reference to the second range of the multiple range.</paragraph>
+      </section>
+      <section id="Section6">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153181"><bookmark_value>INDIRECT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDIREKT" id="bm_id3153922" localize="false"/>
-<paragraph role="heading" id="hd_id3153181" xml-lang="en-US" level="2" l10n="U" oldref="62">INDIRECT</paragraph>
-<paragraph role="paragraph" id="par_id3147169" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="HID_FUNC_INDIREKT">Returns the <emph>reference</emph> specified by a text string.</ahelp> This function can also be used to return the area of a corresponding string.</paragraph>
-<embed href="text/scalc/01/04060109.xhp#r1c1"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="64">Syntax</paragraph>
-<paragraph role="code" id="par_id3149824" xml-lang="en-US" l10n="U" oldref="65">INDIRECT(Ref; A1)</paragraph>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="U" oldref="66">
-<emph>Ref</emph> represents a reference to a cell or an area (in text form) for which to return the contents.</paragraph>
-<paragraph role="paragraph" id="par_id1027200802470312" xml-lang="en-US" l10n="NEW">
-<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
-<paragraph role="note" id="par_idN10CAE" xml-lang="en-US" l10n="NEW">If you open an Excel spreadsheet that uses indirect addresses calculated from string functions, the sheet addresses will not be translated automatically. For example, the Excel address in INDIRECT("filename!sheetname"&amp;B1) is not converted into the Calc address in INDIRECT("filename.sheetname"&amp;B1).<comment>UFI: for #i34465#</comment></paragraph>
-<paragraph role="note" id="par_id7687917" xml-lang="en-US" l10n="NEW">INDIRECT cannot resolve range names as in INDIRECT("RangeName").<comment>i83070</comment></paragraph>
-<paragraph role="heading" id="hd_id3150389" xml-lang="en-US" level="3" l10n="U" oldref="67">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150608" xml-lang="en-US" l10n="U" oldref="68">
-<item type="input">=INDIRECT(A1)</item> equals 100 if A1 contains C108 as a reference and cell C108 contains a value of <item type="input">100</item>.</paragraph>
-<paragraph role="paragraph" id="par_id3083286" xml-lang="en-US" l10n="CHG" oldref="181">
-<item type="input">=SUM(INDIRECT("a1:" &amp; ADDRESS(1;3)))</item> totals the cells in the area of A1 up to the cell with the address defined by row 1 and column 3. This means that area A1:C1 is totaled.</paragraph>
-</section>
-<section id="Section7">
+<paragraph xml-lang="en-US" id="hd_id3153181" role="heading" level="2" l10n="U"
+                    oldref="62">INDIRECT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147169" role="paragraph" l10n="U" oldref="63"><ahelp hid="HID_FUNC_INDIREKT">Returns the <emph>reference</emph> specified by a text string.</ahelp> This function can also be used to return the area of a corresponding string.</paragraph>
+         <embed href="text/scalc/01/04060109.xhp#r1c1"/>
+         <paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="3" l10n="U"
+                    oldref="64">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149824" role="code" l10n="U" oldref="65">INDIRECT(Ref; A1)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="U" oldref="66">
+            <emph>Ref</emph> represents a reference to a cell or an area (in text form) for which to return the contents.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1027200802470312" role="paragraph" l10n="NEW">
+            <emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10CAE" role="note" l10n="NEW">If you open an Excel spreadsheet that uses indirect addresses calculated from string functions, the sheet addresses will not be translated automatically. For example, the Excel address in INDIRECT("filename!sheetname"&amp;B1) is not converted into the Calc address in INDIRECT("filename.sheetname"&amp;B1).<comment>UFI: for #i34465#</comment></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150389" role="heading" level="3" l10n="U"
+                    oldref="67">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150608" role="paragraph" l10n="U" oldref="68">
+            <item type="input">=INDIRECT(A1)</item> equals 100 if A1 contains C108 as a reference and cell C108 contains a value of <item type="input">100</item>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083286" role="paragraph" l10n="CHG" oldref="181">
+            <item type="input">=SUM(INDIRECT("a1:" &amp; ADDRESS(1;3)))</item> totals the cells in the area of A1 up to the cell with the address defined by row 1 and column 3. This means that area A1:C1 is totaled.</paragraph>
+      </section>
+      <section id="Section7">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154818"><bookmark_value>COLUMN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTE" id="bm_id3156378" localize="false"/>
-<paragraph role="heading" id="hd_id3154818" xml-lang="en-US" level="2" l10n="U" oldref="70">COLUMN</paragraph>
-<paragraph role="paragraph" id="par_id3149711" xml-lang="en-US" l10n="U" oldref="193"><ahelp hid="HID_FUNC_SPALTE">Returns the column number of a cell reference.</ahelp> If the reference is a cell the column number of the cell is returned; if the parameter is a cell area, the corresponding column numbers are returned in a single-row <link href="text/scalc/01/04060107.xhp#wasmatrix" name="array">array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the COLUMN function with an area reference parameter is not used for an array formula, only the column number of the first cell within the area is determined.</paragraph>
-<paragraph role="heading" id="hd_id3149283" xml-lang="en-US" level="3" l10n="U" oldref="72">Syntax</paragraph>
-<paragraph role="code" id="par_id3149447" xml-lang="en-US" l10n="U" oldref="73">COLUMN(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3156310" xml-lang="en-US" l10n="U" oldref="74">
-<emph>Reference</emph> is the reference to a cell or cell area whose first column number is to be found.</paragraph>
-<paragraph role="paragraph" id="par_id3155837" xml-lang="en-US" l10n="U" oldref="194">If no reference is entered, the column number of the cell in which the formula is entered is found. <item type="productname">%PRODUCTNAME</item> Calc automatically sets the reference to the current cell.</paragraph>
-<paragraph role="heading" id="hd_id3152932" xml-lang="en-US" level="3" l10n="U" oldref="75">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="76">
-<item type="input">=COLUMN(A1)</item> equals 1. Column A is the first column in the table.</paragraph>
-<paragraph role="paragraph" id="par_id3147079" xml-lang="en-US" l10n="U" oldref="77">
-<item type="input">=COLUMN(C3:E3)</item> equals 3. Column C is the third column in the table.</paragraph>
-<paragraph role="paragraph" id="par_id3146861" xml-lang="en-US" l10n="U" oldref="195">
-<item type="input">=COLUMN(D3:G10)</item> returns 4 because column D is the fourth column in the table and the COLUMN function is not used as an array formula. (In this case, the first value of the array is always used as the result.)</paragraph>
-<paragraph role="paragraph" id="par_id3156320" xml-lang="en-US" l10n="U" oldref="196">
-<item type="input">{=COLUMN(B2:B7)}</item> and <item type="input">=COLUMN(B2:B7)</item> both return 2 because the reference only contains column B as the second column in the table. Because single-column areas have only one column number, it does not make a difference whether or not the formula is used as an array formula.</paragraph>
-<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="197">
-<item type="input">=COLUMN()</item> returns 3 if the formula was entered in column C.</paragraph>
-<paragraph role="paragraph" id="par_id3153277" xml-lang="en-US" l10n="U" oldref="198">
-<item type="input">{=COLUMN(Rabbit)}</item> returns the single-row array (3, 4) if "Rabbit" is the named area (C1:D3).</paragraph>
-</section>
-<section id="Section8">
+<paragraph xml-lang="en-US" id="hd_id3154818" role="heading" level="2" l10n="U"
+                    oldref="70">COLUMN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149711" role="paragraph" l10n="U" oldref="193"><ahelp hid="HID_FUNC_SPALTE">Returns the column number of a cell reference.</ahelp> If the reference is a cell the column number of the cell is returned; if the parameter is a cell area, the corresponding column numbers are returned in a single-row <link href="text/scalc/01/04060107.xhp#wasmatrix" name="array">array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the COLUMN function with an area reference parameter is not used for an array formula, only the column number of the first cell within the area is determined.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149283" role="heading" level="3" l10n="U"
+                    oldref="72">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149447" role="code" l10n="U" oldref="73">COLUMN(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156310" role="paragraph" l10n="U" oldref="74">
+            <emph>Reference</emph> is the reference to a cell or cell area whose first column number is to be found.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155837" role="paragraph" l10n="U" oldref="194">If no reference is entered, the column number of the cell in which the formula is entered is found. <item type="productname">%PRODUCTNAME</item> Calc automatically sets the reference to the current cell.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152932" role="heading" level="3" l10n="U"
+                    oldref="75">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="76">
+            <item type="input">=COLUMN(A1)</item> equals 1. Column A is the first column in the table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147079" role="paragraph" l10n="U" oldref="77">
+            <item type="input">=COLUMN(C3:E3)</item> equals 3. Column C is the third column in the table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146861" role="paragraph" l10n="U" oldref="195">
+            <item type="input">=COLUMN(D3:G10)</item> returns 4 because column D is the fourth column in the table and the COLUMN function is not used as an array formula. (In this case, the first value of the array is always used as the result.)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156320" role="paragraph" l10n="U" oldref="196">
+            <item type="input">{=COLUMN(B2:B7)}</item> and <item type="input">=COLUMN(B2:B7)</item> both return 2 because the reference only contains column B as the second column in the table. Because single-column areas have only one column number, it does not make a difference whether or not the formula is used as an array formula.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150872" role="paragraph" l10n="U" oldref="197">
+            <item type="input">=COLUMN()</item> returns 3 if the formula was entered in column C.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153277" role="paragraph" l10n="U" oldref="198">
+            <item type="input">{=COLUMN(Rabbit)}</item> returns the single-row array (3, 4) if "Rabbit" is the named area (C1:D3).</paragraph>
+      </section>
+      <section id="Section8">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154643"><bookmark_value>COLUMNS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTEN" id="bm_id3156134" localize="false"/>
-<paragraph role="heading" id="hd_id3154643" xml-lang="en-US" level="2" l10n="U" oldref="79">COLUMNS</paragraph>
-<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="HID_FUNC_SPALTEN">Returns the number of columns in the given reference.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149141" xml-lang="en-US" level="3" l10n="U" oldref="81">Syntax</paragraph>
-<paragraph role="code" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="82">COLUMNS(Array)</paragraph>
-<paragraph role="paragraph" id="par_id3154745" xml-lang="en-US" l10n="U" oldref="83">
-<emph>Array</emph> is the reference to a cell range whose total number of columns is to be found. The argument can also be a single cell.</paragraph>
-<paragraph role="heading" id="hd_id3153622" xml-lang="en-US" level="3" l10n="U" oldref="84">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149577" xml-lang="en-US" l10n="U" oldref="200">
-<item type="input">=COLUMNS(B5)</item> returns 1 because a cell only contains one column.</paragraph>
-<paragraph role="paragraph" id="par_id3145649" xml-lang="en-US" l10n="U" oldref="85">
-<item type="input">=COLUMNS(A1:C5)</item> equals 3. The reference comprises three columns.</paragraph>
-<paragraph role="paragraph" id="par_id3155846" xml-lang="en-US" l10n="U" oldref="201">
-<item type="input">=COLUMNS(Rabbit)</item> returns 2 if <item type="literal">Rabbit</item> is the named range (C1:D3).</paragraph>
-</section>
-<section id="Section9">
+<paragraph xml-lang="en-US" id="hd_id3154643" role="heading" level="2" l10n="U"
+                    oldref="79">COLUMNS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151182" role="paragraph" l10n="U" oldref="80"><ahelp hid="HID_FUNC_SPALTEN">Returns the number of columns in the given reference.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149141" role="heading" level="3" l10n="U"
+                    oldref="81">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154047" role="code" l10n="U" oldref="82">COLUMNS(Array)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154745" role="paragraph" l10n="U" oldref="83">
+            <emph>Array</emph> is the reference to a cell range whose total number of columns is to be found. The argument can also be a single cell.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153622" role="heading" level="3" l10n="U"
+                    oldref="84">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149577" role="paragraph" l10n="U" oldref="200">
+            <item type="input">=COLUMNS(B5)</item> returns 1 because a cell only contains one column.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145649" role="paragraph" l10n="U" oldref="85">
+            <item type="input">=COLUMNS(A1:C5)</item> equals 3. The reference comprises three columns.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155846" role="paragraph" l10n="U" oldref="201">
+            <item type="input">=COLUMNS(Rabbit)</item> returns 2 if <item type="literal">Rabbit</item> is the named range (C1:D3).</paragraph>
+      </section>
+      <section id="Section9">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153152"><bookmark_value>vertical search function</bookmark_value>
-<bookmark_value>VLOOKUP function</bookmark_value>
+         <bookmark_value>VLOOKUP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SVERWEIS" id="bm_id3152809" localize="false"/>
-<paragraph role="heading" id="hd_id3153152" xml-lang="en-US" level="2" l10n="U" oldref="87">VLOOKUP</paragraph>
-<paragraph role="paragraph" id="par_id3149984" xml-lang="en-US" l10n="CHG" oldref="88"><ahelp hid="HID_FUNC_SVERWEIS">Vertical search with reference to adjacent cells to the right.</ahelp> This function checks if a specific value is contained in the first column of an array. The function then returns the value in the same row of the column named by <item type="literal">Index</item>. If the <item type="literal">SortOrder</item> parameter is omitted or set to TRUE or one, it is assumed that the data is sorted in ascending order. In this case, if the exact <item type="literal">SearchCriterion</item> is not found, the last value that is smaller than the criterion will be returned. If <item type="literal">SortOrder</item> is set to FALSE or zero, an exact match must be found, otherwise the error <emph>Error: Value Not Available</emph> will be the result. Thus with a value of zero the data does not need to be sorted in ascending order.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
-<paragraph role="code" id="par_id3150156" xml-lang="en-US" l10n="U" oldref="90">=VLOOKUP(SearchCriterion; Array; Index; SortOrder)</paragraph>
-<paragraph role="paragraph" id="par_id3149289" xml-lang="en-US" l10n="U" oldref="91">
-<emph>SearchCriterion</emph> is the value searched for in the first column of the array.</paragraph>
-<paragraph role="paragraph" id="par_id3153884" xml-lang="en-US" l10n="U" oldref="92">
-<emph>Array</emph> is the reference, which is to comprise at least two columns.</paragraph>
-<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="93">
-<emph>Index</emph> is the number of the column in the array that contains the value to be returned. The first column has the number 1.</paragraph>
-<paragraph role="paragraph" id="par_id3151208" xml-lang="en-US" l10n="U" oldref="94">
-<emph>SortOrder</emph> is an optional parameter that indicates whether the first column in the array is sorted in ascending order. Enter the Boolean value FALSE or zero if the first column is not sorted in ascending order. Sorted columns can be searched much faster and the function always returns a value, even if the search value was not matched exactly, if it is between the lowest and highest value of the sorted list. In unsorted lists, the search value must be matched exactly. Otherwise the function will return this message: <emph>Error: Value Not Available</emph>.</paragraph>
-<embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
-<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="95">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154129" xml-lang="en-US" l10n="U" oldref="96">You want to enter the number of a dish on the menu in cell A1, and the name of the dish is to appear as text in the neighboring cell (B1) immediately. The Number to Name assignment is contained in the D1:E100 array. D1 contains <item type="input">100</item>, E1 contains the name <item type="input">Vegetable Soup</item>, and so forth, for 100 menu items. The numbers in column D are sorted in ascending order; thus, the optional <item type="literal">SortOrder</item> parameter is not necessary.</paragraph>
-<paragraph role="paragraph" id="par_id3145663" xml-lang="en-US" l10n="U" oldref="97">Enter the following formula in B1:</paragraph>
-<paragraph role="paragraph" id="par_id3151172" xml-lang="en-US" l10n="U" oldref="98">
-<item type="input">=VLOOKUP(A1;D1:E100;2)</item>
-</paragraph>
-<paragraph role="paragraph" id="par_id3149200" xml-lang="en-US" l10n="U" oldref="99">As soon as you enter a number in A1 B1 will show the corresponding text contained in the second column of reference D1:E100. Entering a nonexistent number displays the text with the next number down. To prevent this, enter FALSE as the last parameter in the formula so that an error message is generated when a nonexistent number is entered.</paragraph>
-</section>
-<section id="Section10">
+<paragraph xml-lang="en-US" id="hd_id3153152" role="heading" level="2" l10n="U"
+                    oldref="87">VLOOKUP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149984" role="paragraph" l10n="CHG" oldref="88"><ahelp hid="HID_FUNC_SVERWEIS">Vertical search with reference to adjacent cells to the right.</ahelp> This function checks if a specific value is contained in the first column of an array. The function then returns the value in the same row of the column named by <item type="literal">Index</item>. If the <item type="literal">SortOrder</item> parameter is omitted or set to TRUE or one, it is assumed that the data is sorted in ascending order. In this case, if the exact <item type="literal">SearchCriterion</item> is not found, the last value that is smaller than the criterion will be returned. If <item type="literal">SortOrder</item> is set to FALSE or zero, an exact match must be found, otherwise the error <emph>Error: Value Not Available</emph> will be the result. Thus with a value of zero the data does not need to be sorted in ascending order.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3146898" role="heading" level="3" l10n="U"
+                    oldref="89">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150156" role="code" l10n="U" oldref="90">=VLOOKUP(SearchCriterion; Array; Index; SortOrder)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="U" oldref="91">
+            <emph>SearchCriterion</emph> is the value searched for in the first column of the array.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153884" role="paragraph" l10n="U" oldref="92">
+            <emph>Array</emph> is the reference, which is to comprise at least two columns.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="U" oldref="93">
+            <emph>Index</emph> is the number of the column in the array that contains the value to be returned. The first column has the number 1.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151208" role="paragraph" l10n="U" oldref="94">
+            <emph>SortOrder</emph> is an optional parameter that indicates whether the first column in the array is sorted in ascending order. Enter the Boolean value FALSE or zero if the first column is not sorted in ascending order. Sorted columns can be searched much faster and the function always returns a value, even if the search value was not matched exactly, if it is between the lowest and highest value of the sorted list. In unsorted lists, the search value must be matched exactly. Otherwise the function will return this message: <emph>Error: Value Not Available</emph>.</paragraph>
+         <embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
+         <paragraph xml-lang="en-US" id="hd_id3147487" role="heading" level="3" l10n="U"
+                    oldref="95">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="U" oldref="96">You want to enter the number of a dish on the menu in cell A1, and the name of the dish is to appear as text in the neighboring cell (B1) immediately. The Number to Name assignment is contained in the D1:E100 array. D1 contains <item type="input">100</item>, E1 contains the name <item type="input">Vegetable Soup</item>, and so forth, for 100 menu items. The numbers in column D are sorted in ascending order; thus, the optional <item type="literal">SortOrder</item> parameter is not necessary.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145663" role="paragraph" l10n="U" oldref="97">Enter the following formula in B1:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151172" role="paragraph" l10n="U" oldref="98">
+            <item type="input">=VLOOKUP(A1;D1:E100;2)</item>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149200" role="paragraph" l10n="U" oldref="99">As soon as you enter a number in A1 B1 will show the corresponding text contained in the second column of reference D1:E100. Entering a nonexistent number displays the text with the next number down. To prevent this, enter FALSE as the last parameter in the formula so that an error message is generated when a nonexistent number is entered.</paragraph>
+      </section>
+      <section id="Section10">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153905"><bookmark_value>sheet numbers; looking up</bookmark_value>
-<bookmark_value>SHEET function</bookmark_value>
+         <bookmark_value>SHEET function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLE" id="bm_id3154693" localize="false"/>
-<paragraph role="heading" id="hd_id3153905" xml-lang="en-US" level="2" l10n="U" oldref="215">SHEET</paragraph>
-<paragraph role="paragraph" id="par_id3150309" xml-lang="en-US" l10n="U" oldref="216"><ahelp hid="HID_FUNC_TABELLE">Returns the sheet number of a reference or a string representing a sheet name.</ahelp> If you do not enter any parameters, the result is the sheet number of the spreadsheet containing the formula.</paragraph>
-<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="217">Syntax</paragraph>
-<paragraph role="code" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="218">SHEET(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3154588" xml-lang="en-US" l10n="U" oldref="219">
-<emph>Reference</emph> is optional and is the reference to a cell, an area, or a sheet name string.</paragraph>
-<paragraph role="heading" id="hd_id3155399" xml-lang="en-US" level="3" l10n="U" oldref="220">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146988" xml-lang="en-US" l10n="U" oldref="221">
-<item type="input">=SHEET(Sheet2.A1)</item> returns 2 if Sheet2 is the second sheet in the spreadsheet document.</paragraph>
-</section>
-<section id="Section11">
+<paragraph xml-lang="en-US" id="hd_id3153905" role="heading" level="2" l10n="U"
+                    oldref="215">SHEET</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150309" role="paragraph" l10n="U" oldref="216"><ahelp hid="HID_FUNC_TABELLE">Returns the sheet number of a reference or a string representing a sheet name.</ahelp> If you do not enter any parameters, the result is the sheet number of the spreadsheet containing the formula.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148564" role="heading" level="3" l10n="U"
+                    oldref="217">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153095" role="code" l10n="U" oldref="218">SHEET(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154588" role="paragraph" l10n="U" oldref="219">
+            <emph>Reference</emph> is optional and is the reference to a cell, an area, or a sheet name string.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155399" role="heading" level="3" l10n="U"
+                    oldref="220">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="221">
+            <item type="input">=SHEET(Sheet2.A1)</item> returns 2 if Sheet2 is the second sheet in the spreadsheet document.</paragraph>
+      </section>
+      <section id="Section11">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148829"><bookmark_value>number of sheets; function</bookmark_value>
-<bookmark_value>SHEETS function</bookmark_value>
+         <bookmark_value>SHEETS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLEN" id="bm_id3150524" localize="false"/>
-<paragraph role="heading" id="hd_id3148829" xml-lang="en-US" level="2" l10n="U" oldref="222">SHEETS</paragraph>
-<paragraph role="paragraph" id="par_id3148820" xml-lang="en-US" l10n="U" oldref="223"><ahelp hid="HID_FUNC_TABELLEN">Determines the number of sheets in a reference.</ahelp> If you do not enter any parameters, it returns the number of sheets in the current document.</paragraph>
-<paragraph role="heading" id="hd_id3154220" xml-lang="en-US" level="3" l10n="U" oldref="224">Syntax</paragraph>
-<paragraph role="code" id="par_id3150777" xml-lang="en-US" l10n="U" oldref="225">SHEETS(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3153060" xml-lang="en-US" l10n="U" oldref="226">
-<emph>Reference</emph> is the reference to a sheet or an area. This parameter is optional.</paragraph>
-<paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="227">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150507" xml-lang="en-US" l10n="U" oldref="228">
-<item type="input">=SHEETS(Sheet1.A1:Sheet3.G12)</item> returns 3 if Sheet1, Sheet2, and Sheet3 exist in the sequence indicated.</paragraph>
-</section>
-<section id="Section12">
+<paragraph xml-lang="en-US" id="hd_id3148829" role="heading" level="2" l10n="U"
+                    oldref="222">SHEETS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148820" role="paragraph" l10n="U" oldref="223"><ahelp hid="HID_FUNC_TABELLEN">Determines the number of sheets in a reference.</ahelp> If you do not enter any parameters, it returns the number of sheets in the current document.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154220" role="heading" level="3" l10n="U"
+                    oldref="224">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150777" role="code" l10n="U" oldref="225">SHEETS(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153060" role="paragraph" l10n="U" oldref="226">
+            <emph>Reference</emph> is the reference to a sheet or an area. This parameter is optional.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149766" role="heading" level="3" l10n="U"
+                    oldref="227">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150507" role="paragraph" l10n="U" oldref="228">
+            <item type="input">=SHEETS(Sheet1.A1:Sheet3.G12)</item> returns 3 if Sheet1, Sheet2, and Sheet3 exist in the sequence indicated.</paragraph>
+      </section>
+      <section id="Section12">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158407"><bookmark_value>MATCH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERGLEICH" id="bm_id3154210" localize="false"/>
-<paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="2" l10n="U" oldref="101">MATCH</paragraph>
-<paragraph role="paragraph" id="par_id3154896" xml-lang="en-US" l10n="U" oldref="102"><ahelp hid="HID_FUNC_VERGLEICH">Returns the relative position of an item in an array that matches a specified value.</ahelp> The function returns the position of the value found in the lookup_array as a number.</paragraph>
-<paragraph role="heading" id="hd_id3153834" xml-lang="en-US" level="3" l10n="U" oldref="103">Syntax</paragraph>
-<paragraph role="code" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="104">MATCH(SearchCriterion; LookupArray; Type)</paragraph>
-<paragraph role="paragraph" id="par_id3149336" xml-lang="en-US" l10n="U" oldref="105">
-<emph>SearchCriterion</emph> is the value which is to be searched for in the single-row or single-column array.</paragraph>
-<paragraph role="paragraph" id="par_id3159167" xml-lang="en-US" l10n="U" oldref="106">
-<emph>LookupArray</emph> is the reference searched. A lookup array can be a single row or column, or part of a single row or column.</paragraph>
-<paragraph role="paragraph" id="par_id3147239" xml-lang="en-US" l10n="U" oldref="107">
-<emph>Type</emph> may take the values 1, 0, or -1. If Type = 1 or if this optional parameter is missing, it is assumed that the first column of the search array is sorted in ascending order. If Type = -1 it is assumed that the column in sorted in descending order. This corresponds to the same function in Microsoft Excel.</paragraph>
-<paragraph role="paragraph" id="par_id3154265" xml-lang="en-US" l10n="CHG" oldref="231">If Type = 0, only exact matches are found. If the search criterion is found more than once, the function returns the index of the first matching value. Only if Type = 0 can you search for regular expressions.</paragraph>
-<paragraph role="paragraph" id="par_id3147528" xml-lang="en-US" l10n="CHG" oldref="232">If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. This applies even when the search array is not sorted. For Type = -1, the first value that is larger or equal is returned.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3155119" xml-lang="en-US" level="3" l10n="U" oldref="108">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155343" xml-lang="en-US" l10n="U" oldref="109">
-<item type="input">=MATCH(200;D1:D100)</item> searches the area D1:D100, which is sorted by column D, for the value 200. As soon as this value is reached, the number of the row in which it was found is returned. If a higher value is found during the search in the column, the number of the previous row is returned.</paragraph>
-</section>
-<section id="Section13">
+<paragraph xml-lang="en-US" id="hd_id3158407" role="heading" level="2" l10n="U"
+                    oldref="101">MATCH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154896" role="paragraph" l10n="U" oldref="102"><ahelp hid="HID_FUNC_VERGLEICH">Returns the relative position of an item in an array that matches a specified value.</ahelp> The function returns the position of the value found in the lookup_array as a number.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153834" role="heading" level="3" l10n="U"
+                    oldref="103">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159152" role="code" l10n="U" oldref="104">MATCH(SearchCriterion; LookupArray; Type)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="105">
+            <emph>SearchCriterion</emph> is the value which is to be searched for in the single-row or single-column array.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159167" role="paragraph" l10n="U" oldref="106">
+            <emph>LookupArray</emph> is the reference searched. A lookup array can be a single row or column, or part of a single row or column.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147239" role="paragraph" l10n="U" oldref="107">
+            <emph>Type</emph> may take the values 1, 0, or -1. If Type = 1 or if this optional parameter is missing, it is assumed that the first column of the search array is sorted in ascending order. If Type = -1 it is assumed that the column in sorted in descending order. This corresponds to the same function in Microsoft Excel.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph" l10n="CHG" oldref="231">If Type = 0, only exact matches are found. If the search criterion is found more than once, the function returns the index of the first matching value. Only if Type = 0 can you search for regular expressions.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147528" role="paragraph" l10n="CHG" oldref="232">If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. This applies even when the search array is not sorted. For Type = -1, the first value that is larger or equal is returned.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3155119" role="heading" level="3" l10n="U"
+                    oldref="108">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155343" role="paragraph" l10n="U" oldref="109">
+            <item type="input">=MATCH(200;D1:D100)</item> searches the area D1:D100, which is sorted by column D, for the value 200. As soon as this value is reached, the number of the row in which it was found is returned. If a higher value is found during the search in the column, the number of the previous row is returned.</paragraph>
+      </section>
+      <section id="Section13">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158430"><bookmark_value>OFFSET function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERSCHIEBUNG" id="bm_id3148926" localize="false"/>
-<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="2" l10n="U" oldref="111">OFFSET</paragraph>
-<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FUNC_VERSCHIEBUNG">Returns the value of a cell offset by a certain number of rows and columns from a given reference point.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146952" xml-lang="en-US" level="3" l10n="U" oldref="113">Syntax</paragraph>
-<paragraph role="code" id="par_id3159194" xml-lang="en-US" l10n="U" oldref="114">OFFSET(Reference; Rows; Columns; Height; Width)</paragraph>
-<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="CHG" oldref="115">
-<emph>Reference</emph> is the reference from which the function searches for the new reference.</paragraph>
-<paragraph role="paragraph" id="par_id3156032" xml-lang="en-US" l10n="CHG" oldref="116">
-<emph>Rows</emph> is the number of rows by which the reference was corrected up (negative value) or down.</paragraph>
-<paragraph role="paragraph" id="par_id3166458" xml-lang="en-US" l10n="CHG" oldref="117">
-<emph>Columns</emph> (optional) is the number of columns by which the reference was corrected to the left (negative value) or to the right.</paragraph>
-<paragraph role="paragraph" id="par_id3150708" xml-lang="en-US" l10n="CHG" oldref="118">
-<emph>Height</emph> (optional) is the vertical height for an area that starts at the new reference position.</paragraph>
-<paragraph role="paragraph" id="par_id3147278" xml-lang="en-US" l10n="CHG" oldref="119">
-<emph>Width</emph> (optional) is the horizontal width for an area that starts at the new reference position.</paragraph>
-<paragraph role="paragraph" id="par_id8662373" xml-lang="en-US" l10n="NEW">Arguments <emph>Rows</emph> and <emph>Columns</emph> must not lead to zero or negative start row or column</paragraph>
-<paragraph role="paragraph" id="par_id9051484" xml-lang="en-US" l10n="NEW">Arguments <emph>Height</emph> and <emph>Width</emph> must not lead to zero or negative count of rows or columns.</paragraph>
-<paragraph role="paragraph" id="par_idN1104B" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3155586" xml-lang="en-US" level="3" l10n="U" oldref="120">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149744" xml-lang="en-US" l10n="CHG" oldref="121">
-<item type="input">=OFFSET(A1;2;2)</item> returns the value in cell C3 (A1 moved by two rows and two columns down). If C3 contains the value <item type="input">100</item> this function returns the value 100.</paragraph>
-<paragraph role="paragraph" id="par_id7439802" xml-lang="en-US" l10n="NEW">
-<item type="input">=OFFSET(B2:C3;1;1)</item> returns a reference to B2:C3 moved down by 1 row and one column to the right (C3:D4).</paragraph>
-<paragraph role="paragraph" id="par_id3009430" xml-lang="en-US" l10n="NEW">
-<item type="input">=OFFSET(B2:C3;-1;-1)</item> returns a reference to B2:C3 moved up by 1 row and one column to the left (A1:B2).</paragraph>
-<paragraph role="paragraph" id="par_id2629169" xml-lang="en-US" l10n="NEW">
-<item type="input">=OFFSET(B2:C3;0;0;3;4)</item> returns a reference to B2:C3 resized to 3 rows and 4 columns (B2:E4).</paragraph>
-<paragraph role="paragraph" id="par_id6668599" xml-lang="en-US" l10n="NEW">
-<item type="input">=OFFSET(B2:C3;1;0;3;4)</item> returns a reference to B2:C3 moved down by one row resized to 3 rows and 4 columns (B2:E4).</paragraph>
-<paragraph role="paragraph" id="par_id3153739" xml-lang="en-US" l10n="U" oldref="122">
-<item type="input">=SUM(OFFSET(A1;2;2;5;6))</item> determines the total of the area that starts in cell C3 and has a height of 5 rows and a width of 6 columns (area=C3:H7).</paragraph>
-</section>
-<section id="Section14">
+<paragraph xml-lang="en-US" id="hd_id3158430" role="heading" level="2" l10n="U"
+                    oldref="111">OFFSET</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149167" role="paragraph" l10n="U" oldref="112"><ahelp hid="HID_FUNC_VERSCHIEBUNG">Returns the value of a cell offset by a certain number of rows and columns from a given reference point.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146952" role="heading" level="3" l10n="U"
+                    oldref="113">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159194" role="code" l10n="U" oldref="114">OFFSET(Reference; Rows; Columns; Height; Width)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="CHG" oldref="115">
+            <emph>Reference</emph> is the reference from which the function searches for the new reference.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156032" role="paragraph" l10n="CHG" oldref="116">
+            <emph>Rows</emph> is the number of rows by which the reference was corrected up (negative value) or down.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166458" role="paragraph" l10n="CHG" oldref="117">
+            <emph>Columns</emph> (optional) is the number of columns by which the reference was corrected to the left (negative value) or to the right.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150708" role="paragraph" l10n="CHG" oldref="118">
+            <emph>Height</emph> (optional) is the vertical height for an area that starts at the new reference position.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147278" role="paragraph" l10n="CHG" oldref="119">
+            <emph>Width</emph> (optional) is the horizontal width for an area that starts at the new reference position.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8662373" role="paragraph" l10n="CHG">Arguments <emph>Rows</emph> and <emph>Columns</emph> must not lead to zero or negative start row or column.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9051484" role="paragraph" l10n="NEW">Arguments <emph>Height</emph> and <emph>Width</emph> must not lead to zero or negative count of rows or columns.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1104B" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155586" role="heading" level="3" l10n="U"
+                    oldref="120">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149744" role="paragraph" l10n="CHG" oldref="121">
+            <item type="input">=OFFSET(A1;2;2)</item> returns the value in cell C3 (A1 moved by two rows and two columns down). If C3 contains the value <item type="input">100</item> this function returns the value 100.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id7439802" role="paragraph" l10n="NEW">
+            <item type="input">=OFFSET(B2:C3;1;1)</item> returns a reference to B2:C3 moved down by 1 row and one column to the right (C3:D4).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3009430" role="paragraph" l10n="NEW">
+            <item type="input">=OFFSET(B2:C3;-1;-1)</item> returns a reference to B2:C3 moved up by 1 row and one column to the left (A1:B2).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2629169" role="paragraph" l10n="NEW">
+            <item type="input">=OFFSET(B2:C3;0;0;3;4)</item> returns a reference to B2:C3 resized to 3 rows and 4 columns (B2:E4).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6668599" role="paragraph" l10n="NEW">
+            <item type="input">=OFFSET(B2:C3;1;0;3;4)</item> returns a reference to B2:C3 moved down by one row resized to 3 rows and 4 columns (B2:E4).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153739" role="paragraph" l10n="U" oldref="122">
+            <item type="input">=SUM(OFFSET(A1;2;2;5;6))</item> determines the total of the area that starts in cell C3 and has a height of 5 rows and a width of 6 columns (area=C3:H7).</paragraph>
+      </section>
+      <section id="Section14">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159273"><bookmark_value>LOOKUP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERWEIS" id="bm_id3152877" localize="false"/>
-<paragraph role="heading" id="hd_id3159273" xml-lang="en-US" level="2" l10n="U" oldref="123">LOOKUP</paragraph>
-<paragraph role="paragraph" id="par_id3153389" xml-lang="en-US" l10n="CHG" oldref="124"><ahelp hid="HID_FUNC_VERWEIS">Returns the contents of a cell either from a one-row or one-column range.</ahelp> Optionally, the assigned value (of the same index) is returned in a different column and row. As opposed to <link href="text/scalc/01/04060109.xhp" name="VLOOKUP">VLOOKUP</link> and <link href="text/scalc/01/04060109.xhp" name="HLOOKUP">HLOOKUP</link>, search and result vector may be at different positions; they do not have to be adjacent. Additionally, the search vector for the LOOKUP must be sorted ascending, otherwise the search will not return any usable results.</paragraph>
-<paragraph role="note" id="par_id4484084" xml-lang="en-US" l10n="NEW">If LOOKUP cannot find the search criterion, it matches the largest value in the search vector that is less than or equal to the search criterion.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3152947" xml-lang="en-US" level="3" l10n="U" oldref="125">Syntax</paragraph>
-<paragraph role="code" id="par_id3154104" xml-lang="en-US" l10n="U" oldref="126">LOOKUP(SearchCriterion; SearchVector; ResultVector)</paragraph>
-<paragraph role="paragraph" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="127">
-<emph>SearchCriterion</emph> is the value to be searched for; entered either directly or as a reference.</paragraph>
-<paragraph role="paragraph" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="128">
-<emph>SearchVector</emph> is the single-row or single-column area to be searched.</paragraph>
-<paragraph role="paragraph" id="par_id3149925" xml-lang="en-US" l10n="U" oldref="129">
-<emph>ResultVector</emph> is another single-row or single-column range from which the result of the function is taken. The result is the cell of the result vector with the same index as the instance found in the search vector.</paragraph>
-<embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
-<paragraph role="heading" id="hd_id3148624" xml-lang="en-US" level="3" l10n="U" oldref="130">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="131">
-<item type="input">=LOOKUP(A1;D1:D100;F1:F100)</item> searches the corresponding cell in range D1:D100 for the number you entered in A1. For the instance found, the index is determined, for example, the 12th cell in this range. Then, the contents of the 12th cell are returned as the value of the function (in the result vector).</paragraph>
-</section>
-<section id="Section15">
+<paragraph xml-lang="en-US" id="hd_id3159273" role="heading" level="2" l10n="U"
+                    oldref="123">LOOKUP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153389" role="paragraph" l10n="CHG" oldref="124"><ahelp hid="HID_FUNC_VERWEIS">Returns the contents of a cell either from a one-row or one-column range.</ahelp> Optionally, the assigned value (of the same index) is returned in a different column and row. As opposed to <link href="text/scalc/01/04060109.xhp" name="VLOOKUP">VLOOKUP</link> and <link href="text/scalc/01/04060109.xhp" name="HLOOKUP">HLOOKUP</link>, search and result vector may be at different positions; they do not have to be adjacent. Additionally, the search vector for the LOOKUP must be sorted ascending, otherwise the search will not return any usable results.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4484084" role="note" l10n="NEW">If LOOKUP cannot find the search criterion, it matches the largest value in the search vector that is less than or equal to the search criterion.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3152947" role="heading" level="3" l10n="U"
+                    oldref="125">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154104" role="code" l10n="U" oldref="126">LOOKUP(SearchCriterion; SearchVector; ResultVector)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150646" role="paragraph" l10n="U" oldref="127">
+            <emph>SearchCriterion</emph> is the value to be searched for; entered either directly or as a reference.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154854" role="paragraph" l10n="U" oldref="128">
+            <emph>SearchVector</emph> is the single-row or single-column area to be searched.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149925" role="paragraph" l10n="U" oldref="129">
+            <emph>ResultVector</emph> is another single-row or single-column range from which the result of the function is taken. The result is the cell of the result vector with the same index as the instance found in the search vector.</paragraph>
+         <embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
+         <paragraph xml-lang="en-US" id="hd_id3148624" role="heading" level="3" l10n="U"
+                    oldref="130">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149809" role="paragraph" l10n="U" oldref="131">
+            <item type="input">=LOOKUP(A1;D1:D100;F1:F100)</item> searches the corresponding cell in range D1:D100 for the number you entered in A1. For the instance found, the index is determined, for example, the 12th cell in this range. Then, the contents of the 12th cell are returned as the value of the function (in the result vector).</paragraph>
+      </section>
+      <section id="Section15">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149425"><bookmark_value>STYLE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VORLAGE" id="bm_id3154342" localize="false"/>
-<paragraph role="heading" id="hd_id3149425" xml-lang="en-US" level="2" l10n="U" oldref="133">STYLE</paragraph>
-<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="134"><ahelp hid="HID_FUNC_VORLAGE">Applies a style to the cell containing the formula.</ahelp> After a set amount of time, another style can be applied. This function always returns the value 0, allowing you to add it to another function without changing the value. Together with the CURRENT function you can apply a color to a cell regardless of the value. For example: =...+STYLE(IF(CURRENT()&gt;3;"red";"green")) applies the style "red" to the cell if the value is greater than 3, otherwise the style "green" is applied. Both cell formats have to be defined beforehand.</paragraph>
-<paragraph role="heading" id="hd_id3145373" xml-lang="en-US" level="3" l10n="U" oldref="135">Syntax</paragraph>
-<paragraph role="code" id="par_id3149302" xml-lang="en-US" l10n="U" oldref="136">STYLE("Style"; Time; "Style2")</paragraph>
-<paragraph role="paragraph" id="par_id3150596" xml-lang="en-US" l10n="U" oldref="137">
-<emph>Style</emph> is the name of a cell style assigned to the cell. Style names must be entered in quotation marks.</paragraph>
-<paragraph role="paragraph" id="par_id3156149" xml-lang="en-US" l10n="U" oldref="138">
-<emph>Time</emph> is an optional time range in seconds. If this parameter is missing the style will not be changed after a certain amount of time has passed.</paragraph>
-<paragraph role="paragraph" id="par_id3149520" xml-lang="en-US" l10n="U" oldref="139">
-<emph>Style2</emph> is the optional name of a cell style assigned to the cell after a certain amount of time has passed. If this parameter is missing "Default" is assumed.</paragraph>
-<paragraph role="paragraph" id="par_idN111CA" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3159254" xml-lang="en-US" level="3" l10n="U" oldref="140">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151374" xml-lang="en-US" l10n="U" oldref="141">
-<item type="input">=STYLE("Invisible";60;"Default")</item> formats the cell in transparent format for 60 seconds after the document was recalculated or loaded, then the Default format is assigned. Both cell formats have to be defined beforehand.</paragraph>
-<paragraph role="paragraph" id="par_id8056886" xml-lang="en-US" l10n="NEW">Since STYLE() has a numeric return value of zero, this return value gets appended to a string. This can be avoided using T() as in the following example </paragraph>
-<paragraph role="paragraph" id="par_id3668935" xml-lang="en-US" l10n="NEW">
-<item type="input">="Text"&amp;T(STYLE("myStyle"))</item>
-</paragraph>
-<paragraph role="paragraph" id="par_id3042085" xml-lang="en-US" l10n="NEW">See also CURRENT() for another example.</paragraph>
-</section>
-<section id="Section16">
+<paragraph xml-lang="en-US" id="hd_id3149425" role="heading" level="2" l10n="U"
+                    oldref="133">STYLE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="134"><ahelp hid="HID_FUNC_VORLAGE">Applies a style to the cell containing the formula.</ahelp> After a set amount of time, another style can be applied. This function always returns the value 0, allowing you to add it to another function without changing the value. Together with the CURRENT function you can apply a color to a cell regardless of the value. For example: =...+STYLE(IF(CURRENT()&gt;3;"red";"green")) applies the style "red" to the cell if the value is greater than 3, otherwise the style "green" is applied. Both cell formats have to be defined beforehand.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145373" role="heading" level="3" l10n="U"
+                    oldref="135">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149302" role="code" l10n="U" oldref="136">STYLE("Style"; Time; "Style2")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150596" role="paragraph" l10n="U" oldref="137">
+            <emph>Style</emph> is the name of a cell style assigned to the cell. Style names must be entered in quotation marks.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156149" role="paragraph" l10n="U" oldref="138">
+            <emph>Time</emph> is an optional time range in seconds. If this parameter is missing the style will not be changed after a certain amount of time has passed.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149520" role="paragraph" l10n="U" oldref="139">
+            <emph>Style2</emph> is the optional name of a cell style assigned to the cell after a certain amount of time has passed. If this parameter is missing "Default" is assumed.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN111CA" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159254" role="heading" level="3" l10n="U"
+                    oldref="140">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151374" role="paragraph" l10n="U" oldref="141">
+            <item type="input">=STYLE("Invisible";60;"Default")</item> formats the cell in transparent format for 60 seconds after the document was recalculated or loaded, then the Default format is assigned. Both cell formats have to be defined beforehand.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8056886" role="paragraph" l10n="NEW">Since STYLE() has a numeric return value of zero, this return value gets appended to a string. This can be avoided using T() as in the following example </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3668935" role="paragraph" l10n="NEW">
+            <item type="input">="Text"&amp;T(STYLE("myStyle"))</item>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3042085" role="paragraph" l10n="NEW">See also CURRENT() for another example.</paragraph>
+      </section>
+      <section id="Section16">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150430"><bookmark_value>CHOOSE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHL" id="bm_id3153947" localize="false"/>
-<paragraph role="heading" id="hd_id3150430" xml-lang="en-US" level="2" l10n="U" oldref="142">CHOOSE</paragraph>
-<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="143"><ahelp hid="HID_FUNC_WAHL">Uses an index to return a value from a list of up to 30 values.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153533" xml-lang="en-US" level="3" l10n="U" oldref="144">Syntax</paragraph>
-<paragraph role="code" id="par_id3155425" xml-lang="en-US" l10n="U" oldref="145">CHOOSE(Index; Value1; ...; Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3144755" xml-lang="en-US" l10n="U" oldref="146">
-<emph>Index</emph> is a reference or number between 1 and 30 indicating which value is to be taken from the list.</paragraph>
-<paragraph role="paragraph" id="par_id3149939" xml-lang="en-US" l10n="U" oldref="147">
-<emph>Value1...Value30</emph> is the list of values entered as a reference to a cell or as individual values.</paragraph>
-<paragraph role="heading" id="hd_id3151253" xml-lang="en-US" level="3" l10n="U" oldref="148">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150625" xml-lang="en-US" l10n="U" oldref="149">
-<item type="input">=CHOOSE(A1;B1;B2;B3;"Today";"Yesterday";"Tomorrow")</item>, for example, returns the contents of cell B2 for A1 = 2; for A1 = 4, the function returns the text "Today".</paragraph>
-</section>
-<section id="Section17">
+<paragraph xml-lang="en-US" id="hd_id3150430" role="heading" level="2" l10n="U"
+                    oldref="142">CHOOSE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143270" role="paragraph" l10n="U" oldref="143"><ahelp hid="HID_FUNC_WAHL">Uses an index to return a value from a list of up to 30 values.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153533" role="heading" level="3" l10n="U"
+                    oldref="144">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155425" role="code" l10n="U" oldref="145">CHOOSE(Index; Value1; ...; Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144755" role="paragraph" l10n="U" oldref="146">
+            <emph>Index</emph> is a reference or number between 1 and 30 indicating which value is to be taken from the list.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149939" role="paragraph" l10n="U" oldref="147">
+            <emph>Value1...Value30</emph> is the list of values entered as a reference to a cell or as individual values.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="3" l10n="U"
+                    oldref="148">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150625" role="paragraph" l10n="U" oldref="149">
+            <item type="input">=CHOOSE(A1;B1;B2;B3;"Today";"Yesterday";"Tomorrow")</item>, for example, returns the contents of cell B2 for A1 = 2; for A1 = 4, the function returns the text "Today".</paragraph>
+      </section>
+      <section id="Section17">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151001"><bookmark_value>HLOOKUP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WVERWEIS" id="bm_id3149481" localize="false"/>
-<paragraph role="heading" id="hd_id3151001" xml-lang="en-US" level="2" l10n="U" oldref="151">HLOOKUP</paragraph>
-<paragraph role="paragraph" id="par_id3148688" xml-lang="en-US" l10n="U" oldref="152"><ahelp hid="HID_FUNC_WVERWEIS">Searches for a value and reference to the cells below the selected area.</ahelp> This function verifies if the first row of an array contains a certain value. The function returns then the value in a row of the array, named in the <emph>Index</emph>, in the same column.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3154661" xml-lang="en-US" level="3" l10n="U" oldref="153">Syntax</paragraph>
-<paragraph role="code" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="154">HLOOKUP(SearchCriteria; Array; Index; Sorted)</paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="155">See also:<link href="text/scalc/01/04060109.xhp" name="VLOOKUP">VLOOKUP</link> (columns and rows are exchanged)</paragraph>
-<embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
-</section>
-<section id="Section18">
+<paragraph xml-lang="en-US" id="hd_id3151001" role="heading" level="2" l10n="U"
+                    oldref="151">HLOOKUP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148688" role="paragraph" l10n="U" oldref="152"><ahelp hid="HID_FUNC_WVERWEIS">Searches for a value and reference to the cells below the selected area.</ahelp> This function verifies if the first row of an array contains a certain value. The function returns then the value in a row of the array, named in the <emph>Index</emph>, in the same column.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3154661" role="heading" level="3" l10n="U"
+                    oldref="153">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146070" role="code" l10n="U" oldref="154">HLOOKUP(SearchCriteria; Array; Index; Sorted)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="155">See also:<link href="text/scalc/01/04060109.xhp" name="VLOOKUP">VLOOKUP</link> (columns and rows are exchanged)</paragraph>
+         <embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
+      </section>
+      <section id="Section18">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147321"><bookmark_value>ROW function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILE" id="bm_id3147333" localize="false"/>
-<paragraph role="heading" id="hd_id3147321" xml-lang="en-US" level="2" l10n="U" oldref="157">ROW</paragraph>
-<paragraph role="paragraph" id="par_id3154564" xml-lang="en-US" l10n="U" oldref="203"><ahelp hid="HID_FUNC_ZEILE">Returns the row number of a cell reference.</ahelp> If the reference is a cell, it returns the row number of the cell. If the reference is a cell range, it returns the corresponding row numbers in a one-column <link href="text/scalc/01/04060107.xhp#wasmatrix" name="Array">Array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the ROW function with a range reference is not used in an array formula, only the row number of the first range cell will be returned.</paragraph>
-<paragraph role="heading" id="hd_id3158439" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
-<paragraph role="code" id="par_id3154916" xml-lang="en-US" l10n="U" oldref="160">ROW(Reference)</paragraph>
-<paragraph role="paragraph" id="par_id3156336" xml-lang="en-US" l10n="U" oldref="161">
-<emph>Reference</emph> is a cell, an area, or the name of an area.</paragraph>
-<paragraph role="paragraph" id="par_id3151109" xml-lang="en-US" l10n="U" oldref="204">If you do not indicate a reference, the row number of the cell in which the formula is entered will be found. <item type="productname">%PRODUCTNAME</item> Calc automatically sets the reference to the current cell.</paragraph>
-<paragraph role="heading" id="hd_id3155609" xml-lang="en-US" level="3" l10n="U" oldref="162">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154830" xml-lang="en-US" l10n="U" oldref="205">
-<item type="input">=ROW(B3)</item> returns 3 because the reference refers to the third row in the table.</paragraph>
-<paragraph role="paragraph" id="par_id3147094" xml-lang="en-US" l10n="U" oldref="206">
-<item type="input">{=ROW(D5:D8)}</item> returns the single-column array (5, 6, 7, 8) because the reference specified contains rows 5 through 8.</paragraph>
-<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="207">
-<item type="input">=ROW(D5:D8)</item> returns 5 because the ROW function is not used as array formula and only the number of the first row of the reference is returned.</paragraph>
-<paragraph role="paragraph" id="par_id3150996" xml-lang="en-US" l10n="U" oldref="208">
-<item type="input">{=ROW(A1:E1)}</item> and <item type="input">=ROW(A1:E1)</item> both return 1 because the reference only contains row 1 as the first column in the table. (Because single-row areas only have one row number it does not make any difference whether or not the formula is used as an array formula.)</paragraph>
-<paragraph role="paragraph" id="par_id3153671" xml-lang="en-US" l10n="U" oldref="209">
-<item type="input">=ROW()</item> returns 3 if the formula was entered in row 3.</paragraph>
-<paragraph role="paragraph" id="par_id3153790" xml-lang="en-US" l10n="U" oldref="210">
-<item type="input">{=ROW(Rabbit)}</item> returns the single-column array (1, 2, 3) if "Rabbit" is the named area (C1:D3).</paragraph>
-</section>
-<section id="Section19">
+<paragraph xml-lang="en-US" id="hd_id3147321" role="heading" level="2" l10n="U"
+                    oldref="157">ROW</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154564" role="paragraph" l10n="U" oldref="203"><ahelp hid="HID_FUNC_ZEILE">Returns the row number of a cell reference.</ahelp> If the reference is a cell, it returns the row number of the cell. If the reference is a cell range, it returns the corresponding row numbers in a one-column <link href="text/scalc/01/04060107.xhp#wasmatrix" name="Array">Array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the ROW function with a range reference is not used in an array formula, only the row number of the first range cell will be returned.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3158439" role="heading" level="3" l10n="U"
+                    oldref="159">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154916" role="code" l10n="U" oldref="160">ROW(Reference)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="161">
+            <emph>Reference</emph> is a cell, an area, or the name of an area.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151109" role="paragraph" l10n="U" oldref="204">If you do not indicate a reference, the row number of the cell in which the formula is entered will be found. <item type="productname">%PRODUCTNAME</item> Calc automatically sets the reference to the current cell.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155609" role="heading" level="3" l10n="U"
+                    oldref="162">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154830" role="paragraph" l10n="U" oldref="205">
+            <item type="input">=ROW(B3)</item> returns 3 because the reference refers to the third row in the table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147094" role="paragraph" l10n="U" oldref="206">
+            <item type="input">{=ROW(D5:D8)}</item> returns the single-column array (5, 6, 7, 8) because the reference specified contains rows 5 through 8.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153701" role="paragraph" l10n="U" oldref="207">
+            <item type="input">=ROW(D5:D8)</item> returns 5 because the ROW function is not used as array formula and only the number of the first row of the reference is returned.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150996" role="paragraph" l10n="U" oldref="208">
+            <item type="input">{=ROW(A1:E1)}</item> and <item type="input">=ROW(A1:E1)</item> both return 1 because the reference only contains row 1 as the first row in the table. (Because single-row areas only have one row number it does not make any difference whether or not the formula is used as an array formula.)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153671" role="paragraph" l10n="U" oldref="209">
+            <item type="input">=ROW()</item> returns 3 if the formula was entered in row 3.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153790" role="paragraph" l10n="U" oldref="210">
+            <item type="input">{=ROW(Rabbit)}</item> returns the single-column array (1, 2, 3) if "Rabbit" is the named area (C1:D3).</paragraph>
+      </section>
+      <section id="Section19">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145772"><bookmark_value>ROWS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILEN" id="bm_id3150667" localize="false"/>
-<paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="166">ROWS</paragraph>
-<paragraph role="paragraph" id="par_id3148971" xml-lang="en-US" l10n="U" oldref="167"><ahelp hid="HID_FUNC_ZEILEN">Returns the number of rows in a reference or array.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156051" xml-lang="en-US" level="3" l10n="U" oldref="168">Syntax</paragraph>
-<paragraph role="code" id="par_id3154357" xml-lang="en-US" l10n="U" oldref="169">ROWS(Array)</paragraph>
-<paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="170">
-<emph>Array</emph> is the reference or named area whose total number of rows is to be determined.</paragraph>
-<paragraph role="heading" id="hd_id3155869" xml-lang="en-US" level="3" l10n="U" oldref="171">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154725" xml-lang="en-US" l10n="U" oldref="212">
-<item type="input">=Rows(B5)</item> returns 1 because a cell only contains one row.</paragraph>
-<paragraph role="paragraph" id="par_id3150102" xml-lang="en-US" l10n="U" oldref="172">
-<item type="input">=ROWS(A10:B12)</item> returns 3.</paragraph>
-<paragraph role="paragraph" id="par_id3155143" xml-lang="en-US" l10n="U" oldref="213">
-<item type="input">=ROWS(Rabbit)</item> returns 3 if "Rabbit" is the named area (C1:D3).</paragraph>
-</section>
-<section id="Section20">
+<paragraph xml-lang="en-US" id="hd_id3145772" role="heading" level="2" l10n="U"
+                    oldref="166">ROWS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148971" role="paragraph" l10n="U" oldref="167"><ahelp hid="HID_FUNC_ZEILEN">Returns the number of rows in a reference or array.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156051" role="heading" level="3" l10n="U"
+                    oldref="168">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154357" role="code" l10n="U" oldref="169">ROWS(Array)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155942" role="paragraph" l10n="U" oldref="170">
+            <emph>Array</emph> is the reference or named area whose total number of rows is to be determined.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155869" role="heading" level="3" l10n="U"
+                    oldref="171">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154725" role="paragraph" l10n="U" oldref="212">
+            <item type="input">=Rows(B5)</item> returns 1 because a cell only contains one row.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150102" role="paragraph" l10n="U" oldref="172">
+            <item type="input">=ROWS(A10:B12)</item> returns 3.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155143" role="paragraph" l10n="U" oldref="213">
+            <item type="input">=ROWS(Rabbit)</item> returns 3 if "Rabbit" is the named area (C1:D3).</paragraph>
+      </section>
+      <section id="Section20">
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_HYPERLINK" id="bm_id8036439" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id9959410"><bookmark_value>HYPERLINK function</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="par_idN11798" xml-lang="en-US" level="2" l10n="NEW">HYPERLINK</paragraph>
-<paragraph role="paragraph" id="par_idN117F1" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_FUNC_HYPERLINK">When you click a cell that contains the HYPERLINK function, the hyperlink opens.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN11800" xml-lang="en-US" l10n="NEW">If you use the optional <emph>cell text</emph> parameter, the formula locates the URL, and then displays the text.</paragraph>
-<paragraph role="tip" id="par_idN11803" xml-lang="en-US" l10n="NEW">To open a hyperlinked cell with the keyboard, select the cell, press F2 to enter the Edit mode, move the cursor in front of the hyperlink, press Shift+F10, and then choose <emph>Open Hyperlink</emph>.</paragraph>
-<paragraph role="heading" id="par_idN1180A" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="code" id="par_idN1180E" xml-lang="en-US" l10n="NEW">HYPERLINK("URL") or HYPERLINK("URL"; "CellText")</paragraph>
-<paragraph role="paragraph" id="par_idN11811" xml-lang="en-US" l10n="NEW">
-<emph>URL</emph> specifies the link target. The optional <emph>CellText</emph> parameter is the text that is displayed in the cell and the result of the function. If the <emph>CellText</emph> parameter is not specified, the <emph>URL</emph> is displayed in the cell text and in the result of the function.</paragraph>
-<paragraph role="heading" id="par_idN11823" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_idN11827" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK("http://www.example.org")</item> displays the text "http://www.example.org" in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
-<paragraph role="paragraph" id="par_idN1182A" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK("http://www.example.org";"Click here")</item> displays the text "Click here" in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
-<paragraph role="paragraph" id="par_idN1182D" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK($B4)</item> where cell B4 contains <item type="input">http://www.example.org</item>. The function adds http://www.example.org to the URL of the hyperlink cell and returns the same text which is used as formula result.</paragraph>
-<paragraph role="paragraph" id="par_idN11830" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK("http://www.";"Click ") &amp; "example.org"</item> displays the text Click example.org in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
-<paragraph role="paragraph" id="par_id8859523" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK("#Sheet1.A1";"Go to top")</item> displays the text Go to top and jumps to cell Sheet1.A1 in this document.</paragraph>
-<paragraph role="paragraph" id="par_id2958769" xml-lang="en-US" l10n="NEW">
-<item type="input">=HYPERLINK("file:///C:/writer.odt#Specification";"Go to Writer bookmark")</item> displays the text Go to Writer bookmark, loads the specified text document and jumps to bookmark "Specification".</paragraph>
-</section>
-<section id="getpivotdata">
+<paragraph xml-lang="en-US" id="par_idN11798" role="heading" level="2" l10n="NEW">HYPERLINK</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN117F1" role="paragraph" l10n="NEW"><ahelp hid="HID_FUNC_HYPERLINK">When you click a cell that contains the HYPERLINK function, the hyperlink opens.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11800" role="paragraph" l10n="NEW">If you use the optional <emph>CellText</emph> parameter, the formula locates the URL, and then displays the text or number.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11803" role="tip" l10n="NEW">To open a hyperlinked cell with the keyboard, select the cell, press F2 to enter the Edit mode, move the cursor in front of the hyperlink, press Shift+F10, and then choose <emph>Open Hyperlink</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1180A" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1180E" role="code" l10n="NEW">HYPERLINK("URL") or HYPERLINK("URL"; "CellText")</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11811" role="paragraph" l10n="CHG">
+            <emph>URL</emph> specifies the link target. The optional <emph>CellText</emph> parameter is the text or a number that is displayed in the cell and will be returned as the result. If the <emph>CellText</emph> parameter is not specified, the <emph>URL</emph> is displayed in the cell text and will be returned as the result.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200912224576" role="paragraph" l10n="NEW">The number 0 is returned for empty cells and matrix elements.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11823" role="heading" level="3" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11827" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK("http://www.example.org")</item> displays the text "http://www.example.org" in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1182A" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK("http://www.example.org";"Click here")</item> displays the text "Click here" in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200912224534" role="paragraph" l10n="NEW">=HYPERLINK("http://www.example.org";12345) displays the number 12345 and executes the hyperlink http://www.example.org when clicked.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1182D" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK($B4)</item> where cell B4 contains <item type="input">http://www.example.org</item>. The function adds http://www.example.org to the URL of the hyperlink cell and returns the same text which is used as formula result.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11830" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK("http://www.";"Click ") &amp; "example.org"</item> displays the text Click example.org in the cell and executes the hyperlink http://www.example.org when clicked.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8859523" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK("#Sheet1.A1";"Go to top")</item> displays the text Go to top and jumps to cell Sheet1.A1 in this document.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2958769" role="paragraph" l10n="NEW">
+            <item type="input">=HYPERLINK("file:///C:/writer.odt#Specification";"Go to Writer bookmark")</item>displays the text Go to Writer bookmark, loads the specified text document and jumps to bookmark "Specification".</paragraph>
+      </section>
+      <section id="getpivotdata">
 <bookmark xml-lang="en-US" branch="index" id="bm_id7682424"><bookmark_value>GETPIVOTDATA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GETPIVOTDATA" id="bm_id897854" localize="false"/>
-<paragraph role="heading" id="hd_id3747062" xml-lang="en-US" level="2" l10n="NEW">GETPIVOTDATA</paragraph>
-<paragraph role="paragraph" id="par_id3593859" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The GETPIVOTDATA function returns a result value from a DataPilot table. The value is addressed using field and item names, so it remains valid if the layout of the DataPilot table changes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9741508" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id909451" xml-lang="en-US" l10n="NEW">Two different syntax definitions can be used:</paragraph>
-<paragraph role="code" id="par_id1665089" xml-lang="en-US" l10n="NEW">GETPIVOTDATA(TargetField; DataPilot; [ Field 1; Item 1; ... ])</paragraph>
-<paragraph role="code" id="par_id4997100" xml-lang="en-US" l10n="NEW">GETPIVOTDATA(DataPilot; Constraints)</paragraph>
-<paragraph role="paragraph" id="par_id1672109" xml-lang="en-US" l10n="NEW">The second syntax is assumed if exactly two parameters are given, of which the first parameter is a cell or cell range reference. The first syntax is assumed in all other cases. The Function Wizard shows the first syntax.</paragraph>
-<paragraph role="heading" id="hd_id9464094" xml-lang="en-US" level="3" l10n="NEW">First Syntax</paragraph>
-<paragraph role="paragraph" id="par_id9302346" xml-lang="en-US" l10n="NEW">
-<emph>TargetField</emph> is a string that selects one of the DataPilot table's data fields. The string can be the name of the source column, or the data field name as shown in the table (like "Sum - Sales").</paragraph>
-<paragraph role="paragraph" id="par_id8296151" xml-lang="en-US" l10n="NEW">
-<emph>DataPilot</emph> is a reference to a cell or cell range that is positioned within a DataPilot table or contains a DataPilot table. If the cell range contains several DataPilot tables, the table that was created last is used.</paragraph>
-<paragraph role="paragraph" id="par_id4809411" xml-lang="en-US" l10n="NEW">If no <emph>Field n / Item n</emph> pairs are given, the grand total is returned. Otherwise, each pair adds a constraint that the result must satisfy. <emph>Field n</emph> is the name of a field from the DataPilot table. <emph>Item n</emph> is the name of an item from that field.</paragraph>
-<paragraph role="paragraph" id="par_id6454969" xml-lang="en-US" l10n="NEW">If the DataPilot table contains only a single result value that fulfills all of the constraints, or a subtotal result that summarizes all matching values, that result is returned. If there is no matching result, or several ones without a subtotal for them, an error is returned. These conditions apply to results that are included in the DataPilot table.</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW">If the source data contains entries that are hidden by settings of the DataPilot table, they are ignored. The order of the Field/Item pairs is not significant. Field and item names are not case-sensitive.</paragraph>
-<paragraph role="paragraph" id="par_id7928708" xml-lang="en-US" l10n="CHG">If no constraint for a page field is given, the field's selected value is implicitly used. If a constraint for a page field is given, it must match the field's selected value, or an error is returned. Page fields are the fields at the top left of a DataPilot table, populated using the "Page Fields" area of the DataPilot Layout dialog. From each page field, an item (value) can be selected, which means only that item is included in the calculation.</paragraph>
-<paragraph role="paragraph" id="par_id3864253" xml-lang="en-US" l10n="NEW">Subtotal values from the DataPilot table are only used if they use the function "auto" (except when specified in the constraint, see <item type="literal">Second Syntax</item> below).</paragraph>
-<paragraph role="heading" id="hd_id3144016" xml-lang="en-US" level="3" l10n="NEW">Second Syntax</paragraph>
-<paragraph role="paragraph" id="par_id9937131" xml-lang="en-US" l10n="NEW">
-<emph>DataPilot</emph> has the same meaning as in the first syntax.</paragraph>
-<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="CHG">
-<emph>Constraints</emph> is a space-separated list. Entries can be quoted (single quotes). The whole string must be enclosed in quotes (double quotes), unless you reference the string from another cell.</paragraph>
-<paragraph role="paragraph" id="par_id4076357" xml-lang="en-US" l10n="NEW">One of the entries can be the data field name. The data field name can be left out if the DataPilot table contains only one data field, otherwise it must be present. </paragraph>
-<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="CHG">Each of the other entries specifies a constraint in the form <item type="literal">Field[Item]</item> (with literal characters [ and ]), or only <item type="literal">Item</item> if the item name is unique within all fields that are used in the DataPilot table.<comment>i82342</comment></paragraph>
-<paragraph role="paragraph" id="par_id3168736" xml-lang="en-US" l10n="CHG">A function name can be added in the form <emph>Field[Item;Function]</emph>, which will cause the constraint to match only subtotal values which use that function. The possible function names are Sum, Count, Average, Max, Min, Product, Count (Numbers only), StDev (Sample), StDevP (Population), Var (Sample), and VarP (Population), case-insensitive.</paragraph><comment>UFI: Example from spec doc is quite difficult to localize. Try to find other one</comment>
+<paragraph xml-lang="en-US" id="hd_id3747062" role="heading" level="2" l10n="NEW">GETPIVOTDATA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3593859" role="paragraph" l10n="NEW"><ahelp hid=".">The GETPIVOTDATA function returns a result value from a DataPilot table. The value is addressed using field and item names, so it remains valid if the layout of the DataPilot table changes.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id9741508" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id909451" role="paragraph" l10n="NEW">Two different syntax definitions can be used:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1665089" role="code" l10n="NEW">GETPIVOTDATA(TargetField; DataPilot; [ Field 1; Item 1; ... ])</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4997100" role="code" l10n="NEW">GETPIVOTDATA(DataPilot; Constraints)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1672109" role="paragraph" l10n="NEW">The second syntax is assumed if exactly two parameters are given, of which the first parameter is a cell or cell range reference. The first syntax is assumed in all other cases. The Function Wizard shows the first syntax.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id9464094" role="heading" level="3" l10n="NEW">First Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9302346" role="paragraph" l10n="NEW">
+            <emph>TargetField</emph> is a string that selects one of the DataPilot table's data fields. The string can be the name of the source column, or the data field name as shown in the table (like "Sum - Sales").</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8296151" role="paragraph" l10n="NEW">
+            <emph>DataPilot</emph> is a reference to a cell or cell range that is positioned within a DataPilot table or contains a DataPilot table. If the cell range contains several DataPilot tables, the table that was created last is used.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4809411" role="paragraph" l10n="NEW">If no <emph>Field n / Item n</emph> pairs are given, the grand total is returned. Otherwise, each pair adds a constraint that the result must satisfy. <emph>Field n</emph> is the name of a field from the DataPilot table. <emph>Item n</emph> is the name of an item from that field.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6454969" role="paragraph" l10n="NEW">If the DataPilot table contains only a single result value that fulfills all of the constraints, or a subtotal result that summarizes all matching values, that result is returned. If there is no matching result, or several ones without a subtotal for them, an error is returned. These conditions apply to results that are included in the DataPilot table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id79042" role="paragraph" l10n="NEW">If the source data contains entries that are hidden by settings of the DataPilot table, they are ignored. The order of the Field/Item pairs is not significant. Field and item names are not case-sensitive.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id7928708" role="paragraph" l10n="CHG">If no constraint for a page field is given, the field's selected value is implicitly used. If a constraint for a page field is given, it must match the field's selected value, or an error is returned. Page fields are the fields at the top left of a DataPilot table, populated using the "Page Fields" area of the DataPilot Layout dialog. From each page field, an item (value) can be selected, which means only that item is included in the calculation.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3864253" role="paragraph" l10n="NEW">Subtotal values from the DataPilot table are only used if they use the function "auto" (except when specified in the constraint, see <item type="literal">Second Syntax</item> below).</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3144016" role="heading" level="3" l10n="NEW">Second Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9937131" role="paragraph" l10n="NEW">
+            <emph>DataPilot</emph> has the same meaning as in the first syntax.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id5616626" role="paragraph" l10n="CHG">
+            <emph>Constraints</emph> is a space-separated list. Entries can be quoted (single quotes). The whole string must be enclosed in quotes (double quotes), unless you reference the string from another cell.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4076357" role="paragraph" l10n="NEW">One of the entries can be the data field name. The data field name can be left out if the DataPilot table contains only one data field, otherwise it must be present. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id8231757" role="paragraph" l10n="CHG">Each of the other entries specifies a constraint in the form <item type="literal">Field[Item]</item> (with literal characters [ and ]), or only <item type="literal">Item</item> if the item name is unique within all fields that are used in the DataPilot table.<comment>i82342</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3168736" role="paragraph" l10n="CHG">A function name can be added in the form <emph>Field[Item;Function]</emph>, which will cause the constraint to match only subtotal values which use that function. The possible function names are Sum, Count, Average, Max, Min, Product, Count (Numbers only), StDev (Sample), StDevP (Population), Var (Sample), and VarP (Population), case-insensitive.</paragraph><comment>UFI: Example from spec doc is quite difficult to localize. Try to find other one</comment>
 </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060110.xhp b/helpcontent2/source/text/scalc/01/04060110.xhp
index 4cebc8fbbb..09aaa74e49 100644
--- a/helpcontent2/source/text/scalc/01/04060110.xhp
+++ b/helpcontent2/source/text/scalc/01/04060110.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04060110.xhp,v $
- * $Revision: 1.17.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,537 +29,636 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textscalc0104060110xml" indexer="include">
-<title id="tit" xml-lang="en-US">Text Functions</title>
-<filename>/text/scalc/01/04060110.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060110xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Text Functions</title>
+         <filename>/text/scalc/01/04060110.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145389"><bookmark_value>text in cells; functions</bookmark_value>
-<bookmark_value>functions; text functions</bookmark_value>
-<bookmark_value>Function Wizard;text</bookmark_value>
+      <bookmark_value>functions; text functions</bookmark_value>
+      <bookmark_value>Function Wizard;text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145389" xml-lang="en-US" level="1" l10n="U" oldref="1">Text Functions</paragraph>
-<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="texttext">This section contains descriptions of the <emph>Text</emph> functions. 
+<paragraph xml-lang="en-US" id="hd_id3145389" role="heading" level="1" l10n="U" oldref="1">Text Functions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="CHG" oldref="2"><variable id="texttext">This section contains descriptions of the <emph>Text</emph> functions.
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000404.xhp#eikatext"/>
-</section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000404.xhp#eikatext"/>
+      </section>
 <sort order="asc">
 <section id="arabic">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149384"><bookmark_value>ARABIC function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARABISCH" id="bm_id3145359" localize="false"/>
-<paragraph role="heading" id="hd_id3149384" xml-lang="en-US" level="2" l10n="U" oldref="239">ARABIC</paragraph>
-<paragraph role="paragraph" id="par_id3153558" xml-lang="en-US" l10n="U" oldref="240"><ahelp hid="HID_FUNC_ARABISCH">Calculates the value of a Roman number. The value range must be between 0 and 3999.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153011" xml-lang="en-US" level="3" l10n="U" oldref="241">Syntax</paragraph>
-<paragraph role="code" id="par_id3155523" xml-lang="en-US" l10n="U" oldref="242">ARABIC("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3151193" xml-lang="en-US" l10n="U" oldref="243">
-<emph>Text</emph> is the text that represents a Roman number.</paragraph>
-<paragraph role="heading" id="hd_id3155758" xml-lang="en-US" level="3" l10n="U" oldref="244">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154621" xml-lang="en-US" l10n="U" oldref="245">
-<item type="input">=ARABIC("MXIV")</item> returns 1014</paragraph>
-<paragraph role="paragraph" id="par_id3147553" xml-lang="en-US" l10n="U" oldref="246">
-<item type="input">=ARABIC("MMII")</item> returns 2002</paragraph>
-</section>
-<section id="asc">
+<paragraph xml-lang="en-US" id="hd_id3149384" role="heading" level="2" l10n="U"
+                    oldref="239">ARABIC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153558" role="paragraph" l10n="U" oldref="240"><ahelp hid="HID_FUNC_ARABISCH">Calculates the value of a Roman number. The value range must be between 0 and 3999.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153011" role="heading" level="3" l10n="U"
+                    oldref="241">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155523" role="code" l10n="U" oldref="242">ARABIC("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151193" role="paragraph" l10n="U" oldref="243">
+            <emph>Text</emph> is the text that represents a Roman number.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155758" role="heading" level="3" l10n="U"
+                    oldref="244">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154621" role="paragraph" l10n="U" oldref="245">
+            <item type="input">=ARABIC("MXIV")</item> returns 1014</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147553" role="paragraph" l10n="U" oldref="246">
+            <item type="input">=ARABIC("MMII")</item> returns 2002</paragraph>
+      </section>
+      <section id="asc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id8796349"><bookmark_value>ASC function</bookmark_value>
 </bookmark><comment>i79585</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ASC" id="bm_id3187353" localize="false"/>
-<paragraph role="heading" id="hd_id7723929" xml-lang="en-US" level="2" l10n="NEW">ASC</paragraph>
-<paragraph role="paragraph" id="par_id8455153" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The ASC function converts full-width to half-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id9912411" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
-<paragraph role="heading" id="hd_id9204992" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="code" id="par_id1993774" xml-lang="en-US" l10n="NEW">ASC("Text")</paragraph>
-<paragraph role="paragraph" id="par_id2949919" xml-lang="en-US" l10n="NEW">
-<emph>Text</emph> is the text that contains characters to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id2355113" xml-lang="en-US" l10n="NEW">See also JIS function.</paragraph>
-</section>
-<section id="bahttext">
+<paragraph xml-lang="en-US" id="hd_id7723929" role="heading" level="2" l10n="NEW">ASC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8455153" role="paragraph" l10n="NEW"><ahelp hid=".">The ASC function converts full-width to half-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1993774" role="code" l10n="NEW">ASC("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2949919" role="paragraph" l10n="NEW">
+            <emph>Text</emph> is the text that contains characters to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2355113" role="paragraph" l10n="NEW">See also JIS function.</paragraph>
+      </section>
+      <section id="bahttext">
 <bookmark xml-lang="en-US" branch="index" id="bm_id9323709"><bookmark_value>BAHTTEXT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BAHTTEXT" id="bm_id744346" localize="false"/><comment>i66350</comment>
-<paragraph role="heading" id="hd_id6695455" xml-lang="en-US" level="2" l10n="NEW">BAHTTEXT</paragraph>
-<paragraph role="paragraph" id="par_id354014" xml-lang="en-US" l10n="NEW">Converts a number to Thai text, including the Thai currency names.</paragraph>
-<paragraph role="heading" id="hd_id9942014" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="code" id="par_id8780785" xml-lang="en-US" l10n="NEW">BAHTTEXT(Number)</paragraph>
-<paragraph role="paragraph" id="par_id1539353" xml-lang="en-US" l10n="NEW">
-<emph>Number</emph> is any number. "Baht" is appended to the integral part of the number, and "Satang" is appended to the decimal part of the number.</paragraph>
-<paragraph role="heading" id="hd_id9694814" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id3289284" xml-lang="en-US" l10n="NEW">
-<item type="input">=BAHTTEXT(12.65)</item> returns a string in Thai characters with the meaning of "Twelve Baht and sixty five Satang".</paragraph>
-</section>
-<section id="base">
+<paragraph xml-lang="en-US" id="hd_id6695455" role="heading" level="2" l10n="NEW">BAHTTEXT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id354014" role="paragraph" l10n="NEW">Converts a number to Thai text, including the Thai currency names.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id9942014" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id8780785" role="code" l10n="NEW">BAHTTEXT(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1539353" role="paragraph" l10n="NEW">
+            <emph>Number</emph> is any number. "Baht" is appended to the integral part of the number, and "Satang" is appended to the decimal part of the number.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id9694814" role="heading" level="3" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3289284" role="paragraph" l10n="NEW">
+            <item type="input">=BAHTTEXT(12.65)</item> returns a string in Thai characters with the meaning of "Twelve Baht and sixty five Satang".</paragraph>
+      </section>
+      <section id="base">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153072"><bookmark_value>BASE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BASIS" id="bm_id3150957" localize="false"/>
-<paragraph role="heading" id="hd_id3153072" xml-lang="en-US" level="2" l10n="U" oldref="213">BASE</paragraph>
-<paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U" oldref="214"><ahelp hid="HID_FUNC_BASIS">Converts a positive integer to a specified base into a text from the <link href="text/shared/00/00000005.xhp#zahlensystem" name="numbering system">numbering system</link>.</ahelp> The digits 0-9 and the letters A-Z are used.</paragraph>
-<paragraph role="heading" id="hd_id3146097" xml-lang="en-US" level="3" l10n="U" oldref="215">Syntax</paragraph>
-<paragraph role="code" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="216">BASE(Number; Radix; [MinimumLength])</paragraph>
-<paragraph role="paragraph" id="par_id3151339" xml-lang="en-US" l10n="U" oldref="217">
-<emph>Number</emph> is the positive integer to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id3159262" xml-lang="en-US" l10n="U" oldref="218">
-<emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph>
-<paragraph role="paragraph" id="par_id3148746" xml-lang="en-US" l10n="U" oldref="219">
-<emph>MinimumLength</emph> (optional) determines the minimum length of the character sequence that has been created. If the text is shorter than the indicated minimum length, zeros are added to the left of the string.</paragraph>
-<paragraph role="heading" id="hd_id3146323" xml-lang="en-US" level="3" l10n="U" oldref="220">Example</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153072" role="heading" level="2" l10n="U"
+                    oldref="213">BASE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153289" role="paragraph" l10n="U" oldref="214"><ahelp hid="HID_FUNC_BASIS">Converts a positive integer to a specified base into a text from the <link href="text/shared/00/00000005.xhp#zahlensystem" name="numbering system">numbering system</link>.</ahelp> The digits 0-9 and the letters A-Z are used.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146097" role="heading" level="3" l10n="U"
+                    oldref="215">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155743" role="code" l10n="U" oldref="216">BASE(Number; Radix; [MinimumLength])</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151339" role="paragraph" l10n="U" oldref="217">
+            <emph>Number</emph> is the positive integer to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159262" role="paragraph" l10n="U" oldref="218">
+            <emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148746" role="paragraph" l10n="U" oldref="219">
+            <emph>MinimumLength</emph> (optional) determines the minimum length of the character sequence that has been created. If the text is shorter than the indicated minimum length, zeros are added to the left of the string.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146323" role="heading" level="3" l10n="U"
+                    oldref="220">Example</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156399"><bookmark_value>decimal system; converting to</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3156399" xml-lang="en-US" l10n="U" oldref="221">
-<item type="input">=BASE(17;10;4)</item> returns 0017 in the decimal system.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156399" role="paragraph" l10n="U" oldref="221">
+            <item type="input">=BASE(17;10;4)</item> returns 0017 in the decimal system.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3157871"><bookmark_value>binary system; converting to</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3157871" xml-lang="en-US" l10n="U" oldref="222">
-<item type="input">=BASE(17;2)</item> returns 10001 in the binary system.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157871" role="paragraph" l10n="U" oldref="222">
+            <item type="input">=BASE(17;2)</item> returns 10001 in the binary system.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145226"><bookmark_value>hexadecimal system; converting to</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3145226" xml-lang="en-US" l10n="U" oldref="223">
-<item type="input">=BASE(255;16;4)</item> returns 00FF in the hexadecimal system.</paragraph>
-</section>
-<section id="char">
+<paragraph xml-lang="en-US" id="par_id3145226" role="paragraph" l10n="U" oldref="223">
+            <item type="input">=BASE(255;16;4)</item> returns 00FF in the hexadecimal system.</paragraph>
+      </section>
+      <section id="char">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149321"><bookmark_value>CHAR function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEICHEN" id="bm_id3159128" localize="false"/>
-<paragraph role="heading" id="hd_id3149321" xml-lang="en-US" level="2" l10n="U" oldref="201">CHAR</paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="202"><ahelp hid="HID_FUNC_ZEICHEN">Converts a number into a character according to the current code table.</ahelp> The number can be a two-digit or three-digit integer number.</paragraph>
-<embed href="text/scalc/00/00000004.xhp#codes"/>
-<paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3" l10n="U" oldref="203">Syntax</paragraph>
-<paragraph role="code" id="par_id3145634" xml-lang="en-US" l10n="U" oldref="204">CHAR(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3155906" xml-lang="en-US" l10n="U" oldref="205">
-<emph>Number</emph> is a number between 1 and 255 representing the code value for the character.</paragraph>
-<paragraph role="heading" id="hd_id3152982" xml-lang="en-US" level="3" l10n="U" oldref="207">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149890" xml-lang="en-US" l10n="CHG" oldref="208">
-<item type="input">=CHAR(100)</item> returns the character d.</paragraph>
-</section>
-<section id="clean">
+<paragraph xml-lang="en-US" id="hd_id3149321" role="heading" level="2" l10n="U"
+                    oldref="201">CHAR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149150" role="paragraph" l10n="U" oldref="202"><ahelp hid="HID_FUNC_ZEICHEN">Converts a number into a character according to the current code table.</ahelp> The number can be a two-digit or three-digit integer number.</paragraph>
+         <embed href="text/scalc/00/00000004.xhp#codes"/>
+         <paragraph xml-lang="en-US" id="hd_id3149945" role="heading" level="3" l10n="U"
+                    oldref="203">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145634" role="code" l10n="U" oldref="204">CHAR(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155906" role="paragraph" l10n="U" oldref="205">
+            <emph>Number</emph> is a number between 1 and 255 representing the code value for the character.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152982" role="heading" level="3" l10n="U"
+                    oldref="207">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149890" role="paragraph" l10n="CHG" oldref="208">
+            <item type="input">=CHAR(100)</item> returns the character d.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200910283297" role="paragraph" l10n="NEW">="abc" &amp; CHAR(10) &amp; "def" inserts a newline character into the string.</paragraph>
+      </section>
+      <section id="clean">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149009"><bookmark_value>CLEAN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SAEUBERN" id="bm_id3148729" localize="false"/>
-<paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="2" l10n="U" oldref="132">CLEAN</paragraph>
-<paragraph role="paragraph" id="par_id3150482" xml-lang="en-US" l10n="U" oldref="133"><ahelp hid="HID_FUNC_SAEUBERN">All non-printing characters are removed from the string.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146880" xml-lang="en-US" level="3" l10n="U" oldref="134">Syntax</paragraph>
-<paragraph role="code" id="par_id3147472" xml-lang="en-US" l10n="U" oldref="135">CLEAN("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3150695" xml-lang="en-US" l10n="U" oldref="136">
-<emph>Text</emph> refers to the text from which to remove all non-printable characters.</paragraph>
-</section>
-<section id="code">
+<paragraph xml-lang="en-US" id="hd_id3149009" role="heading" level="2" l10n="U"
+                    oldref="132">CLEAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150482" role="paragraph" l10n="U" oldref="133"><ahelp hid="HID_FUNC_SAEUBERN">All non-printing characters are removed from the string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146880" role="heading" level="3" l10n="U"
+                    oldref="134">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147472" role="code" l10n="U" oldref="135">CLEAN("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150695" role="paragraph" l10n="U" oldref="136">
+            <emph>Text</emph> refers to the text from which to remove all non-printable characters.</paragraph>
+      </section>
+      <section id="code">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155498"><bookmark_value>CODE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_CODE" id="bm_id3159084" localize="false"/>
-<paragraph role="heading" id="hd_id3155498" xml-lang="en-US" level="2" l10n="U" oldref="3">CODE</paragraph>
-<paragraph role="paragraph" id="par_id3152770" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_CODE">Returns a numeric code for the first character in a text string.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155830" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
-<paragraph role="code" id="par_id3149188" xml-lang="en-US" l10n="U" oldref="6">CODE("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="7">
-<emph>Text</emph> is the text for which the code of the first character is to be found.</paragraph>
-<embed href="text/scalc/00/00000004.xhp#codes"/>
-<paragraph role="heading" id="hd_id3154394" xml-lang="en-US" level="3" l10n="U" oldref="8">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159209" xml-lang="en-US" l10n="U" oldref="9">
-<item type="input">=CODE("Hieronymus")</item> returns 72, <item type="input">=CODE("hieroglyphic")</item> returns 104.</paragraph>
-<paragraph role="note" id="par_id3150280" xml-lang="en-US" l10n="U" oldref="211">The code used here does not refer to ASCII, but to the code table currently loaded.</paragraph>
-</section>
-<section id="concatenate">
+<paragraph xml-lang="en-US" id="hd_id3155498" role="heading" level="2" l10n="U" oldref="3">CODE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152770" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_FUNC_CODE">Returns a numeric code for the first character in a text string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155830" role="heading" level="3" l10n="U" oldref="5">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149188" role="code" l10n="U" oldref="6">CODE("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154383" role="paragraph" l10n="U" oldref="7">
+            <emph>Text</emph> is the text for which the code of the first character is to be found.</paragraph>
+         <embed href="text/scalc/00/00000004.xhp#codes"/>
+         <paragraph xml-lang="en-US" id="hd_id3154394" role="heading" level="3" l10n="U" oldref="8">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159209" role="paragraph" l10n="U" oldref="9">
+            <item type="input">=CODE("Hieronymus")</item> returns 72, <item type="input">=CODE("hieroglyphic")</item> returns 104.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150280" role="note" l10n="U" oldref="211">The code used here does not refer to ASCII, but to the code table currently loaded.</paragraph>
+      </section>
+      <section id="concatenate">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149688"><bookmark_value>CONCATENATE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERKETTEN" id="bm_id3153084" localize="false"/>
-<paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="2" l10n="U" oldref="167">CONCATENATE</paragraph>
-<paragraph role="paragraph" id="par_id3154524" xml-lang="en-US" l10n="U" oldref="168"><ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149542" xml-lang="en-US" level="3" l10n="U" oldref="169">Syntax</paragraph>
-<paragraph role="code" id="par_id3155954" xml-lang="en-US" l10n="U" oldref="170">CONCATENATE("Text1"; ...; "Text30")</paragraph>
-<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="171">
-<emph>Text 1; Text 2; ...</emph> represent up to 30 text passages which are to be combined into one string.</paragraph>
-<paragraph role="heading" id="hd_id3153110" xml-lang="en-US" level="3" l10n="U" oldref="172">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="U" oldref="173">
-<item type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns: Good Morning Mrs. Doe.</paragraph>
-</section>
-<section id="decimal">
+<paragraph xml-lang="en-US" id="hd_id3149688" role="heading" level="2" l10n="U"
+                    oldref="167">CONCATENATE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154524" role="paragraph" l10n="U" oldref="168"><ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149542" role="heading" level="3" l10n="U"
+                    oldref="169">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155954" role="code" l10n="U" oldref="170">CONCATENATE("Text1"; ...; "Text30")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146847" role="paragraph" l10n="U" oldref="171">
+            <emph>Text 1; Text 2; ...</emph> represent up to 30 text passages which are to be combined into one string.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153110" role="heading" level="3" l10n="U"
+                    oldref="172">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150008" role="paragraph" l10n="U" oldref="173">
+            <item type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns: Good Morning Mrs. Doe.</paragraph>
+      </section>
+      <section id="decimal">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145166"><bookmark_value>DECIMAL function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3145166" xml-lang="en-US" level="2" l10n="U" oldref="225">DECIMAL</paragraph>
-<paragraph role="paragraph" id="par_id3156361" xml-lang="en-US" l10n="U" oldref="226"><ahelp hid="HID_FUNC_DEZIMAL">Converts text with characters from a <link href="text/shared/00/00000005.xhp#zahlensystem" name="number system">number system</link> to a positive integer in the base radix given.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph>
-<paragraph role="paragraph" id="par_id3157994" xml-lang="en-US" l10n="U" oldref="227">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, is disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the number system generate an error.</paragraph>
-<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="3" l10n="U" oldref="228">Syntax</paragraph>
-<paragraph role="code" id="par_id3154328" xml-lang="en-US" l10n="U" oldref="229">DECIMAL("Text"; Radix)</paragraph>
-<paragraph role="paragraph" id="par_id3150128" xml-lang="en-US" l10n="U" oldref="230">
-<emph>Text</emph> is the text to be converted. To differentiate between a hexadecimal number, such as A1 and the reference to cell A1, you must place the number in quotation marks, for example, "A1" or "FACE".</paragraph>
-<paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="231">
-<emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph>
-<paragraph role="heading" id="hd_id3156062" xml-lang="en-US" level="3" l10n="U" oldref="232">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145355" xml-lang="en-US" l10n="U" oldref="233">
-<item type="input">=DECIMAL("17";10)</item> returns 17.</paragraph>
-<paragraph role="paragraph" id="par_id3155622" xml-lang="en-US" l10n="U" oldref="234">
-<item type="input">=DECIMAL("FACE";16)</item> returns 64206.</paragraph>
-<paragraph role="paragraph" id="par_id3151015" xml-lang="en-US" l10n="U" oldref="235">
-<item type="input">=DECIMAL("0101";2)</item> returns 5.</paragraph>
-</section>
-<section id="dollar">
+<paragraph xml-lang="en-US" id="hd_id3145166" role="heading" level="2" l10n="U"
+                    oldref="225">DECIMAL</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156361" role="paragraph" l10n="U" oldref="226"><ahelp hid="HID_FUNC_DEZIMAL">Converts text with characters from a <link href="text/shared/00/00000005.xhp#zahlensystem" name="number system">number system</link> to a positive integer in the base radix given.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157994" role="paragraph" l10n="U" oldref="227">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, is disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the number system generate an error.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150014" role="heading" level="3" l10n="U"
+                    oldref="228">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154328" role="code" l10n="U" oldref="229">DECIMAL("Text"; Radix)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150128" role="paragraph" l10n="U" oldref="230">
+            <emph>Text</emph> is the text to be converted. To differentiate between a hexadecimal number, such as A1 and the reference to cell A1, you must place the number in quotation marks, for example, "A1" or "FACE".</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145241" role="paragraph" l10n="U" oldref="231">
+            <emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156062" role="heading" level="3" l10n="U"
+                    oldref="232">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145355" role="paragraph" l10n="U" oldref="233">
+            <item type="input">=DECIMAL("17";10)</item> returns 17.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155622" role="paragraph" l10n="U" oldref="234">
+            <item type="input">=DECIMAL("FACE";16)</item> returns 64206.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151015" role="paragraph" l10n="U" oldref="235">
+            <item type="input">=DECIMAL("0101";2)</item> returns 5.</paragraph>
+      </section>
+      <section id="dollar">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148402"><bookmark_value>DOLLAR function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_DM" id="bm_id3149532" localize="false"/>
-<paragraph role="heading" id="hd_id3148402" xml-lang="en-US" level="2" l10n="U" oldref="11">DOLLAR</paragraph>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_FUNC_DM">Converts a number to an amount in the currency format, rounded to a specified decimal place.</ahelp> In the <item type="literal">Value</item> field enter the number to be converted to currency. Optionally, you may enter the number of decimal places in the <item type="literal">Decimals</item> field. If no value is specified, all numbers in currency format will be displayed with two decimal places. </paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="263">You set the currency format in your system settings.</paragraph>
-<paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">Syntax</paragraph>
-<paragraph role="code" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="14">DOLLAR(Value; Decimals)</paragraph>
-<paragraph role="paragraph" id="par_id3145299" xml-lang="en-US" l10n="U" oldref="15">
-<emph>Value</emph> is a number, a reference to a cell containing a number, or a formula which returns a number.</paragraph>
-<paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="CHG" oldref="16">
-<emph>Decimals</emph> is the optional number of decimal places.</paragraph>
-<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="3" l10n="U" oldref="17">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153546" xml-lang="en-US" l10n="U" oldref="18">
-<item type="input">=DOLLAR(255)</item> returns $255.00.</paragraph>
-<paragraph role="paragraph" id="par_id3154635" xml-lang="en-US" l10n="U" oldref="19">
-<item type="input">=DOLLAR(367.456;2)</item> returns $367.46. Use the decimal separator that corresponds to the <link href="text/shared/optionen/01140000.xhp" name="current locale setting">current locale setting</link>.</paragraph>
-</section>
-<section id="exact">
+<paragraph xml-lang="en-US" id="hd_id3148402" role="heading" level="2" l10n="U"
+                    oldref="11">DOLLAR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153049" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_FUNC_DM">Converts a number to an amount in the currency format, rounded to a specified decimal place.</ahelp> In the <item type="literal">Value</item> field enter the number to be converted to currency. Optionally, you may enter the number of decimal places in the <item type="literal">Decimals</item> field. If no value is specified, all numbers in currency format will be displayed with two decimal places. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="263">You set the currency format in your system settings.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150569" role="heading" level="3" l10n="U"
+                    oldref="13">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154188" role="code" l10n="U" oldref="14">DOLLAR(Value; Decimals)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145299" role="paragraph" l10n="U" oldref="15">
+            <emph>Value</emph> is a number, a reference to a cell containing a number, or a formula which returns a number.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145629" role="paragraph" l10n="CHG" oldref="16">
+            <emph>Decimals</emph> is the optional number of decimal places.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149030" role="heading" level="3" l10n="U"
+                    oldref="17">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153546" role="paragraph" l10n="U" oldref="18">
+            <item type="input">=DOLLAR(255)</item> returns $255.00.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154635" role="paragraph" l10n="U" oldref="19">
+            <item type="input">=DOLLAR(367.456;2)</item> returns $367.46. Use the decimal separator that corresponds to the <link href="text/shared/optionen/01140000.xhp" name="current locale setting">current locale setting</link>.</paragraph>
+      </section>
+      <section id="exact">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150685"><bookmark_value>EXACT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_IDENTISCH" id="bm_id3155081" localize="false"/>
-<paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="2" l10n="U" oldref="78">EXACT</paragraph>
-<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="HID_FUNC_IDENTISCH">Compares two text strings and returns TRUE if they are identical.</ahelp> This function is case-sensitive.</paragraph>
-<paragraph role="heading" id="hd_id3152817" xml-lang="en-US" level="3" l10n="U" oldref="80">Syntax</paragraph>
-<paragraph role="code" id="par_id3148594" xml-lang="en-US" l10n="U" oldref="81">EXACT("Text1"; "Text2")</paragraph>
-<paragraph role="paragraph" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="82">
-<emph>Text1</emph> refers to the first text to compare.</paragraph>
-<paragraph role="paragraph" id="par_id3148637" xml-lang="en-US" l10n="U" oldref="83">
-<emph>Text2</emph> is the second text to compare.</paragraph>
-<paragraph role="heading" id="hd_id3149777" xml-lang="en-US" level="3" l10n="U" oldref="84">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156263" xml-lang="en-US" l10n="U" oldref="85">
-<item type="input">=EXACT("Sun microsystems";"Sun Microsystems")</item> returns FALSE.</paragraph>
-</section>
-<section id="find">
+<paragraph xml-lang="en-US" id="hd_id3150685" role="heading" level="2" l10n="U"
+                    oldref="78">EXACT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158413" role="paragraph" l10n="U" oldref="79"><ahelp hid="HID_FUNC_IDENTISCH">Compares two text strings and returns TRUE if they are identical.</ahelp> This function is case-sensitive.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152817" role="heading" level="3" l10n="U"
+                    oldref="80">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148594" role="code" l10n="U" oldref="81">EXACT("Text1"; "Text2")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153224" role="paragraph" l10n="U" oldref="82">
+            <emph>Text1</emph> refers to the first text to compare.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148637" role="paragraph" l10n="U" oldref="83">
+            <emph>Text2</emph> is the second text to compare.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149777" role="heading" level="3" l10n="U"
+                    oldref="84">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="85">
+            <item type="input">=EXACT("microsystems";"Microsystems")</item> returns FALSE.</paragraph>
+      </section>
+      <section id="find">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152589"><bookmark_value>FIND function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINDEN" id="bm_id3147482" localize="false"/>
-<paragraph role="heading" id="hd_id3152589" xml-lang="en-US" level="2" l10n="U" oldref="44">FIND</paragraph>
-<paragraph role="paragraph" id="par_id3146149" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_FUNC_FINDEN">Looks for a string of text within another string.</ahelp> You can also define where to begin the search. The search term can be a number or any string of characters. The search is case-sensitive.</paragraph>
-<paragraph role="heading" id="hd_id3083284" xml-lang="en-US" level="3" l10n="U" oldref="46">Syntax</paragraph>
-<paragraph role="code" id="par_id3083452" xml-lang="en-US" l10n="U" oldref="47">FIND("FindText"; "Text"; Position)</paragraph>
-<paragraph role="paragraph" id="par_id3150608" xml-lang="en-US" l10n="U" oldref="48">
-<emph>FindText</emph> refers to the text to be found.</paragraph>
-<paragraph role="paragraph" id="par_id3152374" xml-lang="en-US" l10n="U" oldref="49">
-<emph>Text</emph> is the text where the search takes place.</paragraph>
-<paragraph role="paragraph" id="par_id3152475" xml-lang="en-US" l10n="U" oldref="50">
-<emph>Position</emph> (optional) is the position in the text from which the search starts.</paragraph>
-<paragraph role="heading" id="hd_id3154812" xml-lang="en-US" level="3" l10n="U" oldref="51">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156375" xml-lang="en-US" l10n="U" oldref="52">
-<item type="input">=FIND(76;998877665544)</item> returns 6.</paragraph>
-</section>
-<section id="fixed">
+<paragraph xml-lang="en-US" id="hd_id3152589" role="heading" level="2" l10n="U"
+                    oldref="44">FIND</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146149" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_FUNC_FINDEN">Looks for a string of text within another string.</ahelp> You can also define where to begin the search. The search term can be a number or any string of characters. The search is case-sensitive.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3083284" role="heading" level="3" l10n="U"
+                    oldref="46">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083452" role="code" l10n="U" oldref="47">FIND("FindText"; "Text"; Position)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150608" role="paragraph" l10n="U" oldref="48">
+            <emph>FindText</emph> refers to the text to be found.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152374" role="paragraph" l10n="U" oldref="49">
+            <emph>Text</emph> is the text where the search takes place.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152475" role="paragraph" l10n="U" oldref="50">
+            <emph>Position</emph> (optional) is the position in the text from which the search starts.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154812" role="heading" level="3" l10n="U"
+                    oldref="51">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156375" role="paragraph" l10n="U" oldref="52">
+            <item type="input">=FIND(76;998877665544)</item> returns 6.</paragraph>
+      </section>
+      <section id="fixed">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149268"><bookmark_value>FIXED function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEST" id="bm_id3149450" localize="false"/>
-<paragraph role="heading" id="hd_id3149268" xml-lang="en-US" level="2" l10n="U" oldref="34">FIXED</paragraph>
-<paragraph role="paragraph" id="par_id3155833" xml-lang="en-US" l10n="CHG" oldref="35"><ahelp hid="HID_FUNC_FEST">Returns a number as text with a specified number of decimal places and optional thousands separators.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152470" xml-lang="en-US" level="3" l10n="U" oldref="36">Syntax</paragraph>
-<paragraph role="code" id="par_id3147567" xml-lang="en-US" l10n="U" oldref="37">FIXED(Number; Decimals; NoThousandsSeparators)</paragraph>
-<paragraph role="paragraph" id="par_id3151272" xml-lang="en-US" l10n="U" oldref="38">
-<emph>Number</emph> refers to the number to be formatted.</paragraph>
-<paragraph role="paragraph" id="par_id3156322" xml-lang="en-US" l10n="U" oldref="39">
-<emph>Decimals</emph> refers to the number of decimal places to be displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3150877" xml-lang="en-US" l10n="U" oldref="40">
-<emph>NoThousandsSeparators</emph> (optional) determines whether the thousands separator is used. If the parameter is a number not equal to 0, the thousands separator is suppressed. If the parameter is equal to 0 or if it is missing altogether, the thousands separators of your <link href="text/shared/optionen/01140000.xhp" name="current locale setting">current locale setting</link> are displayed.</paragraph>
-<paragraph role="heading" id="hd_id3149040" xml-lang="en-US" level="3" l10n="U" oldref="41">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145208" xml-lang="en-US" l10n="CHG" oldref="42">
-<item type="input">=FIXED(1234567.89;3)</item> returns 1,234,567.890 as a text string. </paragraph>
-<paragraph role="paragraph" id="par_id5282143" xml-lang="en-US" l10n="NEW">
-<item type="input">=FIXED(1234567.89;3;1)</item> returns 1234567.890 as a text string.</paragraph>
-</section>
-<section id="jis">
+<paragraph xml-lang="en-US" id="hd_id3149268" role="heading" level="2" l10n="U"
+                    oldref="34">FIXED</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155833" role="paragraph" l10n="CHG" oldref="35"><ahelp hid="HID_FUNC_FEST">Returns a number as text with a specified number of decimal places and optional thousands separators.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152470" role="heading" level="3" l10n="U"
+                    oldref="36">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147567" role="code" l10n="U" oldref="37">FIXED(Number; Decimals; NoThousandsSeparators)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151272" role="paragraph" l10n="U" oldref="38">
+            <emph>Number</emph> refers to the number to be formatted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156322" role="paragraph" l10n="U" oldref="39">
+            <emph>Decimals</emph> refers to the number of decimal places to be displayed.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150877" role="paragraph" l10n="U" oldref="40">
+            <emph>NoThousandsSeparators</emph> (optional) determines whether the thousands separator is used. If the parameter is a number not equal to 0, the thousands separator is suppressed. If the parameter is equal to 0 or if it is missing altogether, the thousands separators of your <link href="text/shared/optionen/01140000.xhp" name="current locale setting">current locale setting</link> are displayed.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149040" role="heading" level="3" l10n="U"
+                    oldref="41">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145208" role="paragraph" l10n="CHG" oldref="42">
+            <item type="input">=FIXED(1234567.89;3)</item> returns 1,234,567.890 as a text string. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id5282143" role="paragraph" l10n="NEW">
+            <item type="input">=FIXED(1234567.89;3;1)</item> returns 1234567.890 as a text string.</paragraph>
+      </section>
+      <section id="jis">
 <bookmark xml-lang="en-US" branch="index" id="bm_id7319864"><bookmark_value>JIS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_JIS" id="bm_id3818475" localize="false"/>
-<paragraph role="heading" id="hd_id3666188" xml-lang="en-US" level="2" l10n="NEW">JIS</paragraph>
-<paragraph role="paragraph" id="par_id964384" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The JIS function converts half-width to full-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1551561" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
-<paragraph role="heading" id="hd_id2212897" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="code" id="par_id2504654" xml-lang="en-US" l10n="NEW">JIS("Text")</paragraph>
-<paragraph role="paragraph" id="par_id5292519" xml-lang="en-US" l10n="NEW">
-<emph>Text</emph> is the text that contains characters to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id3984496" xml-lang="en-US" l10n="NEW">See also ASC function.</paragraph>
-</section>
-<section id="left">
+<paragraph xml-lang="en-US" id="hd_id3666188" role="heading" level="2" l10n="NEW">JIS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id964384" role="paragraph" l10n="NEW"><ahelp hid=".">The JIS function converts half-width to full-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id1551561" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id2212897" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2504654" role="code" l10n="NEW">JIS("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id5292519" role="paragraph" l10n="NEW">
+            <emph>Text</emph> is the text that contains characters to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3984496" role="paragraph" l10n="NEW">See also ASC function.</paragraph>
+      </section>
+      <section id="left">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147083"><bookmark_value>LEFT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_LINKS" id="bm_id3154645" localize="false"/>
-<paragraph role="heading" id="hd_id3147083" xml-lang="en-US" level="2" l10n="U" oldref="95">LEFT</paragraph>
-<paragraph role="paragraph" id="par_id3153622" xml-lang="en-US" l10n="CHG" oldref="96"><ahelp hid="HID_FUNC_LINKS">Returns the first character or characters of a text.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156116" xml-lang="en-US" level="3" l10n="U" oldref="97">Syntax</paragraph>
-<paragraph role="code" id="par_id3146786" xml-lang="en-US" l10n="U" oldref="98">LEFT("Text"; Number)</paragraph>
-<paragraph role="paragraph" id="par_id3147274" xml-lang="en-US" l10n="U" oldref="99">
-<emph>Text</emph> is the text where the initial partial words are to be determined.</paragraph>
-<paragraph role="paragraph" id="par_id3153152" xml-lang="en-US" l10n="U" oldref="100">
-<emph>Number</emph> (optional) specifies the number of characters for the start text. If this parameter is not defined, one character is returned.</paragraph>
-<paragraph role="heading" id="hd_id3150260" xml-lang="en-US" level="3" l10n="U" oldref="101">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149141" xml-lang="en-US" l10n="U" oldref="102">
-<item type="input">=LEFT("output";3)</item> returns “out”.</paragraph>
-</section>
-<section id="len">
+<paragraph xml-lang="en-US" id="hd_id3147083" role="heading" level="2" l10n="U"
+                    oldref="95">LEFT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153622" role="paragraph" l10n="CHG" oldref="96"><ahelp hid="HID_FUNC_LINKS">Returns the first character or characters of a text.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156116" role="heading" level="3" l10n="U"
+                    oldref="97">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146786" role="code" l10n="U" oldref="98">LEFT("Text"; Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147274" role="paragraph" l10n="U" oldref="99">
+            <emph>Text</emph> is the text where the initial partial words are to be determined.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153152" role="paragraph" l10n="U" oldref="100">
+            <emph>Number</emph> (optional) specifies the number of characters for the start text. If this parameter is not defined, one character is returned.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150260" role="heading" level="3" l10n="U"
+                    oldref="101">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149141" role="paragraph" l10n="U" oldref="102">
+            <item type="input">=LEFT("output";3)</item> returns “out”.</paragraph>
+      </section>
+      <section id="len">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156110"><bookmark_value>LEN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_LAENGE" id="bm_id3154050" localize="false"/>
-<paragraph role="heading" id="hd_id3156110" xml-lang="en-US" level="2" l10n="U" oldref="104">LEN</paragraph>
-<paragraph role="paragraph" id="par_id3150147" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="HID_FUNC_LAENGE">Returns the length of a string including spaces.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155108" xml-lang="en-US" level="3" l10n="U" oldref="106">Syntax</paragraph>
-<paragraph role="code" id="par_id3154063" xml-lang="en-US" l10n="U" oldref="107">LEN("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="108">
-<emph>Text</emph> is the text whose length is to be determined.</paragraph>
-<paragraph role="heading" id="hd_id3153884" xml-lang="en-US" level="3" l10n="U" oldref="109">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156008" xml-lang="en-US" l10n="U" oldref="110">
-<item type="input">=LEN("Good Afternoon")</item> returns 14.</paragraph>
-<paragraph role="paragraph" id="par_id3154300" xml-lang="en-US" l10n="U" oldref="111">
-<item type="input">=LEN(12345.67)</item> returns 8.</paragraph>
-</section>
-<section id="lower">
+<paragraph xml-lang="en-US" id="hd_id3156110" role="heading" level="2" l10n="U"
+                    oldref="104">LEN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150147" role="paragraph" l10n="U" oldref="105"><ahelp hid="HID_FUNC_LAENGE">Returns the length of a string including spaces.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155108" role="heading" level="3" l10n="U"
+                    oldref="106">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154063" role="code" l10n="U" oldref="107">LEN("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146894" role="paragraph" l10n="U" oldref="108">
+            <emph>Text</emph> is the text whose length is to be determined.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="3" l10n="U"
+                    oldref="109">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156008" role="paragraph" l10n="U" oldref="110">
+            <item type="input">=LEN("Good Afternoon")</item> returns 14.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154300" role="paragraph" l10n="U" oldref="111">
+            <item type="input">=LEN(12345.67)</item> returns 8.</paragraph>
+      </section>
+      <section id="lower">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153983"><bookmark_value>LOWER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KLEIN" id="bm_id3151173" localize="false"/>
-<paragraph role="heading" id="hd_id3153983" xml-lang="en-US" level="2" l10n="U" oldref="87">LOWER</paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_FUNC_KLEIN">Converts all uppercase letters in a text string to lowercase.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155902" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
-<paragraph role="code" id="par_id3150121" xml-lang="en-US" l10n="U" oldref="90">LOWER("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="91">
-<emph>Text</emph> refers to the text to be converted.</paragraph>
-<paragraph role="heading" id="hd_id3159343" xml-lang="en-US" level="3" l10n="U" oldref="92">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155329" xml-lang="en-US" l10n="U" oldref="93">
-<item type="input">=LOWER("Sun")</item> returns sun.</paragraph>
-</section>
-<section id="mid">
+<paragraph xml-lang="en-US" id="hd_id3153983" role="heading" level="2" l10n="U"
+                    oldref="87">LOWER</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="U" oldref="88"><ahelp hid="HID_FUNC_KLEIN">Converts all uppercase letters in a text string to lowercase.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155902" role="heading" level="3" l10n="U"
+                    oldref="89">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150121" role="code" l10n="U" oldref="90">LOWER("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153910" role="paragraph" l10n="U" oldref="91">
+            <emph>Text</emph> refers to the text to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159343" role="heading" level="3" l10n="U"
+                    oldref="92">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155329" role="paragraph" l10n="U" oldref="93">
+            <item type="input">=LOWER("Sun")</item> returns sun.</paragraph>
+      </section>
+      <section id="mid">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154589"><bookmark_value>MID function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEIL" id="bm_id3155392" localize="false"/>
-<paragraph role="heading" id="hd_id3154589" xml-lang="en-US" level="2" l10n="U" oldref="148">MID</paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="149"><ahelp hid="HID_FUNC_TEIL">Returns a text string of a text. The parameters specify the starting position and the number of characters.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148829" xml-lang="en-US" level="3" l10n="U" oldref="150">Syntax</paragraph>
-<paragraph role="code" id="par_id3150526" xml-lang="en-US" l10n="U" oldref="151">MID("Text"; Start; Number)</paragraph>
-<paragraph role="paragraph" id="par_id3148820" xml-lang="en-US" l10n="U" oldref="152">
-<emph>Text</emph> is the text containing the characters to extract.</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="153">
-<emph>Start</emph> is the position of the first character in the text to extract.</paragraph>
-<paragraph role="paragraph" id="par_id3153063" xml-lang="en-US" l10n="U" oldref="154">
-<emph>Number</emph> specifies the number of characters in the part of the text.</paragraph>
-<paragraph role="heading" id="hd_id3150509" xml-lang="en-US" level="3" l10n="U" oldref="155">Example</paragraph>
-<paragraph role="paragraph" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="156">
-<item type="input">=MID("Sun Microsystems";5;5)</item> returns Micro.</paragraph>
-</section>
-<section id="proper">
+<paragraph xml-lang="en-US" id="hd_id3154589" role="heading" level="2" l10n="U"
+                    oldref="148">MID</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="CHG" oldref="149"><ahelp hid="HID_FUNC_TEIL">Returns a text string of a text. The parameters specify the starting position and the number of characters.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148829" role="heading" level="3" l10n="U"
+                    oldref="150">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150526" role="code" l10n="U" oldref="151">MID("Text"; Start; Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148820" role="paragraph" l10n="U" oldref="152">
+            <emph>Text</emph> is the text containing the characters to extract.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="153">
+            <emph>Start</emph> is the position of the first character in the text to extract.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153063" role="paragraph" l10n="U" oldref="154">
+            <emph>Number</emph> specifies the number of characters in the part of the text.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150509" role="heading" level="3" l10n="U"
+                    oldref="155">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158407" role="paragraph" l10n="U" oldref="156">
+            <item type="input">=MID("office";2;2)</item> returns ff.</paragraph>
+      </section>
+      <section id="proper">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159143"><bookmark_value>PROPER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS2" id="bm_id3154897" localize="false"/>
-<paragraph role="heading" id="hd_id3159143" xml-lang="en-US" level="2" l10n="U" oldref="70">PROPER</paragraph>
-<paragraph role="paragraph" id="par_id3149768" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid="HID_FUNC_GROSS2">Capitalizes the first letter in all words of a text string.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3" l10n="U" oldref="72">Syntax</paragraph>
-<paragraph role="code" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="73">PROPER("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3147509" xml-lang="en-US" l10n="U" oldref="74">
-<emph>Text</emph> refers to the text to be converted.</paragraph>
-<paragraph role="heading" id="hd_id3147529" xml-lang="en-US" level="3" l10n="U" oldref="75">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="76">
-<item type="input">=PROPER("sun microsystems")</item> returns Sun Microsystems.</paragraph>
-</section>
-<section id="replace">
+<paragraph xml-lang="en-US" id="hd_id3159143" role="heading" level="2" l10n="U"
+                    oldref="70">PROPER</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149768" role="paragraph" l10n="U" oldref="71"><ahelp hid="HID_FUNC_GROSS2">Capitalizes the first letter in all words of a text string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3" l10n="U"
+                    oldref="72">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154260" role="code" l10n="U" oldref="73">PROPER("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147509" role="paragraph" l10n="U" oldref="74">
+            <emph>Text</emph> refers to the text to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147529" role="heading" level="3" l10n="U"
+                    oldref="75">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="76">
+            <item type="input">=PROPER("open office")</item> returns Open Office.</paragraph>
+      </section>
+      <section id="replace">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149171"><bookmark_value>REPLACE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ERSETZEN" id="bm_id3149990" localize="false"/>
-<paragraph role="heading" id="hd_id3149171" xml-lang="en-US" level="2" l10n="U" oldref="22">REPLACE</paragraph>
-<paragraph role="paragraph" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_FUNC_ERSETZEN">Replaces part of a text string with a different text string.</ahelp> This function can be used to replace both characters and numbers (which are automatically converted to text). The result of the function is always displayed as text. If you intend to perform further calculations with a number which has been replaced by text, you will need to convert it back to a number using the <link href="text/scalc/01/04060110.xhp" name="VALUE">VALUE</link> function.</paragraph>
-<paragraph role="paragraph" id="par_id3158426" xml-lang="en-US" l10n="U" oldref="24">Any text containing numbers must be enclosed in quotation marks if you do not want it to be interpreted as a number and automatically converted to text.</paragraph>
-<paragraph role="heading" id="hd_id3149159" xml-lang="en-US" level="3" l10n="U" oldref="25">Syntax</paragraph>
-<paragraph role="code" id="par_id3147286" xml-lang="en-US" l10n="U" oldref="26">REPLACE("Text"; Position; Length; "NewText")</paragraph>
-<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="U" oldref="27">
-<emph>Text</emph> refers to text of which a part will be replaced.</paragraph>
-<paragraph role="paragraph" id="par_id3166451" xml-lang="en-US" l10n="U" oldref="28">
-<emph>Position</emph> refers to the position within the text where the replacement will begin.</paragraph>
-<paragraph role="paragraph" id="par_id3156040" xml-lang="en-US" l10n="U" oldref="29">
-<emph>Length</emph> is the number of characters in <emph>Text</emph> to be replaced.</paragraph>
-<paragraph role="paragraph" id="par_id3159188" xml-lang="en-US" l10n="U" oldref="30">
-<emph>NewText</emph> refers to the text which replaces <emph>Text</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3146958" xml-lang="en-US" level="3" l10n="U" oldref="31">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="32">
-<item type="input">=REPLACE("1234567";1;1;"444")</item> returns "444234567". One character at position 1 is replaced by the complete <item type="literal">NewText</item>.</paragraph>
-</section>
-<section id="rept">
+<paragraph xml-lang="en-US" id="hd_id3149171" role="heading" level="2" l10n="U"
+                    oldref="22">REPLACE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148925" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_FUNC_ERSETZEN">Replaces part of a text string with a different text string.</ahelp> This function can be used to replace both characters and numbers (which are automatically converted to text). The result of the function is always displayed as text. If you intend to perform further calculations with a number which has been replaced by text, you will need to convert it back to a number using the <link href="text/scalc/01/04060110.xhp" name="VALUE">VALUE</link> function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158426" role="paragraph" l10n="U" oldref="24">Any text containing numbers must be enclosed in quotation marks if you do not want it to be interpreted as a number and automatically converted to text.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149159" role="heading" level="3" l10n="U"
+                    oldref="25">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147286" role="code" l10n="U" oldref="26">REPLACE("Text"; Position; Length; "NewText")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149797" role="paragraph" l10n="U" oldref="27">
+            <emph>Text</emph> refers to text of which a part will be replaced.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166451" role="paragraph" l10n="U" oldref="28">
+            <emph>Position</emph> refers to the position within the text where the replacement will begin.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156040" role="paragraph" l10n="U" oldref="29">
+            <emph>Length</emph> is the number of characters in <emph>Text</emph> to be replaced.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159188" role="paragraph" l10n="U" oldref="30">
+            <emph>NewText</emph> refers to the text which replaces <emph>Text</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146958" role="heading" level="3" l10n="U"
+                    oldref="31">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154096" role="paragraph" l10n="U" oldref="32">
+            <item type="input">=REPLACE("1234567";1;1;"444")</item> returns "444234567". One character at position 1 is replaced by the complete <item type="literal">NewText</item>.</paragraph>
+      </section>
+      <section id="rept">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149741"><bookmark_value>REPT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WIEDERHOLEN" id="bm_id3155582" localize="false"/>
-<paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="2" l10n="U" oldref="193">REPT</paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="194"><ahelp hid="HID_FUNC_WIEDERHOLEN">Repeats a character string by the given <emph>number</emph> of copies.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152884" xml-lang="en-US" level="3" l10n="U" oldref="195">Syntax</paragraph>
-<paragraph role="code" id="par_id3150494" xml-lang="en-US" l10n="U" oldref="196">REPT("Text"; Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154859" xml-lang="en-US" l10n="U" oldref="197">
-<emph>Text</emph> is the text to be repeated.</paragraph>
-<paragraph role="paragraph" id="par_id3150638" xml-lang="en-US" l10n="U" oldref="198">
-<emph>Number</emph> is the number of repetitions.</paragraph>
-<paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="U" oldref="212">The result can be a maximum of 255 characters.</paragraph>
-<paragraph role="heading" id="hd_id3156213" xml-lang="en-US" level="3" l10n="U" oldref="199">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148626" xml-lang="en-US" l10n="U" oldref="200">
-<item type="input">=REPT("Good morning";2)</item> returns Good morningGood morning.</paragraph>
-</section>
-<section id="right">
+<paragraph xml-lang="en-US" id="hd_id3149741" role="heading" level="2" l10n="U"
+                    oldref="193">REPT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="194"><ahelp hid="HID_FUNC_WIEDERHOLEN">Repeats a character string by the given <emph>number</emph> of copies.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152884" role="heading" level="3" l10n="U"
+                    oldref="195">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150494" role="code" l10n="U" oldref="196">REPT("Text"; Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154859" role="paragraph" l10n="U" oldref="197">
+            <emph>Text</emph> is the text to be repeated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150638" role="paragraph" l10n="U" oldref="198">
+            <emph>Number</emph> is the number of repetitions.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149922" role="paragraph" l10n="U" oldref="212">The result can be a maximum of 255 characters.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156213" role="heading" level="3" l10n="U"
+                    oldref="199">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148626" role="paragraph" l10n="U" oldref="200">
+            <item type="input">=REPT("Good morning";2)</item> returns Good morningGood morning.</paragraph>
+      </section>
+      <section id="right">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149805"><bookmark_value>RIGHT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_RECHTS" id="bm_id3154602" localize="false"/>
-<paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="113">RIGHT</paragraph>
-<paragraph role="paragraph" id="par_id3145375" xml-lang="en-US" l10n="CHG" oldref="114"><ahelp hid="HID_FUNC_RECHTS">Returns the last character or characters of a text.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150837" xml-lang="en-US" level="3" l10n="U" oldref="115">Syntax</paragraph>
-<paragraph role="code" id="par_id3154344" xml-lang="en-US" l10n="U" oldref="116">RIGHT("Text"; Number)</paragraph>
-<paragraph role="paragraph" id="par_id3149426" xml-lang="en-US" l10n="U" oldref="117">
-<emph>Text</emph> is the text of which the right part is to be determined.</paragraph>
-<paragraph role="paragraph" id="par_id3153350" xml-lang="en-US" l10n="U" oldref="118">
-<emph>Number</emph> (optional) is the number of characters from the right part of the text.</paragraph>
-<paragraph role="heading" id="hd_id3148661" xml-lang="en-US" level="3" l10n="U" oldref="119">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151132" xml-lang="en-US" l10n="U" oldref="120">
-<item type="input">=RIGHT("Sun";2)</item> returns un.</paragraph>
-</section>
-<section id="roman">
+<paragraph xml-lang="en-US" id="hd_id3149805" role="heading" level="2" l10n="U"
+                    oldref="113">RIGHT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145375" role="paragraph" l10n="CHG" oldref="114"><ahelp hid="HID_FUNC_RECHTS">Returns the last character or characters of a text.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150837" role="heading" level="3" l10n="U"
+                    oldref="115">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154344" role="code" l10n="U" oldref="116">RIGHT("Text"; Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149426" role="paragraph" l10n="U" oldref="117">
+            <emph>Text</emph> is the text of which the right part is to be determined.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153350" role="paragraph" l10n="U" oldref="118">
+            <emph>Number</emph> (optional) is the number of characters from the right part of the text.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148661" role="heading" level="3" l10n="U"
+                    oldref="119">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151132" role="paragraph" l10n="U" oldref="120">
+            <item type="input">=RIGHT("Sun";2)</item> returns un.</paragraph>
+      </section>
+      <section id="roman">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153534"><bookmark_value>ROMAN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ROEMISCH" id="bm_id3144755" localize="false"/>
-<paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="248">ROMAN</paragraph>
-<paragraph role="paragraph" id="par_id3151256" xml-lang="en-US" l10n="U" oldref="249"><ahelp hid="HID_FUNC_ROEMISCH">Converts a number into a Roman numeral. The value range must be between 0 and 3999, the modes can be integers from 0 to 4.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="250">Syntax</paragraph>
-<paragraph role="code" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="251">ROMAN(Number; Mode)</paragraph>
-<paragraph role="paragraph" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="252">
-<emph>Number</emph> is the number that is to be converted into a Roman numeral.</paragraph>
-<paragraph role="paragraph" id="par_id3153318" xml-lang="en-US" l10n="U" oldref="253">
-<emph>Mode</emph> (optional) indicates the degree of simplification. The higher the value, the greater is the simplification of the Roman number.</paragraph>
-<paragraph role="heading" id="hd_id3145306" xml-lang="en-US" level="3" l10n="U" oldref="254">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151371" xml-lang="en-US" l10n="U" oldref="255">
-<item type="input">=ROMAN(999)</item> returns CMXCIX</paragraph>
-<paragraph role="paragraph" id="par_id3153938" xml-lang="en-US" l10n="U" oldref="256">
-<item type="input">=ROMAN(999;0)</item> returns CMXCIX</paragraph>
-<paragraph role="paragraph" id="par_id3148412" xml-lang="en-US" l10n="U" oldref="257">
-<item type="input">=ROMAN (999;1)</item> returns LMVLIV</paragraph>
-<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="258">
-<item type="input">=ROMAN(999;2)</item> returns XMIX</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="259">
-<item type="input">=ROMAN(999;3)</item> returns VMIV</paragraph>
-<paragraph role="paragraph" id="par_id3150624" xml-lang="en-US" l10n="U" oldref="260">
-<item type="input">=ROMAN(999;4)</item> returns IM</paragraph>
-</section>
-<section id="search">
+<paragraph xml-lang="en-US" id="hd_id3153534" role="heading" level="2" l10n="U"
+                    oldref="248">ROMAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151256" role="paragraph" l10n="U" oldref="249"><ahelp hid="HID_FUNC_ROEMISCH">Converts a number into a Roman numeral. The value range must be between 0 and 3999, the modes can be integers from 0 to 4.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
+                    oldref="250">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150593" role="code" l10n="U" oldref="251">ROMAN(Number; Mode)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156139" role="paragraph" l10n="U" oldref="252">
+            <emph>Number</emph> is the number that is to be converted into a Roman numeral.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153318" role="paragraph" l10n="U" oldref="253">
+            <emph>Mode</emph> (optional) indicates the degree of simplification. The higher the value, the greater is the simplification of the Roman number.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145306" role="heading" level="3" l10n="U"
+                    oldref="254">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151371" role="paragraph" l10n="U" oldref="255">
+            <item type="input">=ROMAN(999)</item> returns CMXCIX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153938" role="paragraph" l10n="U" oldref="256">
+            <item type="input">=ROMAN(999;0)</item> returns CMXCIX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148412" role="paragraph" l10n="U" oldref="257">
+            <item type="input">=ROMAN (999;1)</item> returns LMVLIV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155421" role="paragraph" l10n="U" oldref="258">
+            <item type="input">=ROMAN(999;2)</item> returns XMIX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="259">
+            <item type="input">=ROMAN(999;3)</item> returns VMIV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150624" role="paragraph" l10n="U" oldref="260">
+            <item type="input">=ROMAN(999;4)</item> returns IM</paragraph>
+      </section>
+      <section id="search">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151005"><bookmark_value>SEARCH function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUCHEN" id="bm_id3149484" localize="false"/>
-<paragraph role="heading" id="hd_id3151005" xml-lang="en-US" level="2" l10n="U" oldref="122">SEARCH</paragraph>
-<paragraph role="paragraph" id="par_id3148692" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_FUNC_SUCHEN">Returns the position of a text segment within a character string.</ahelp> You can set the start of the search as an option. The search text can be a number or any sequence of characters. The search is not case-sensitive.</paragraph>
-<embed href="text/shared/00/00000001.xhp#regulaer"/>
-<paragraph role="heading" id="hd_id3152964" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
-<paragraph role="code" id="par_id3154671" xml-lang="en-US" l10n="U" oldref="125">SEARCH("FindText"; "Text"; Position)</paragraph>
-<paragraph role="paragraph" id="par_id3146080" xml-lang="en-US" l10n="U" oldref="126">
-<emph>FindText</emph> is the text to be searched for.</paragraph>
-<paragraph role="paragraph" id="par_id3154111" xml-lang="en-US" l10n="U" oldref="127">
-<emph>Text</emph> is the text where the search will take place.</paragraph>
-<paragraph role="paragraph" id="par_id3149559" xml-lang="en-US" l10n="U" oldref="128">
-<emph>Position</emph> (optional) is the position in the text where the search is to start.</paragraph>
-<paragraph role="heading" id="hd_id3147322" xml-lang="en-US" level="3" l10n="U" oldref="129">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154564" xml-lang="en-US" l10n="U" oldref="130">
-<item type="input">=SEARCH(54;998877665544)</item> returns 10.</paragraph>
-</section>
-<section id="substitute">
+<paragraph xml-lang="en-US" id="hd_id3151005" role="heading" level="2" l10n="U"
+                    oldref="122">SEARCH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148692" role="paragraph" l10n="U" oldref="123"><ahelp hid="HID_FUNC_SUCHEN">Returns the position of a text segment within a character string.</ahelp> You can set the start of the search as an option. The search text can be a number or any sequence of characters. The search is not case-sensitive.</paragraph>
+         <embed href="text/shared/00/00000001.xhp#regulaer"/>
+         <paragraph xml-lang="en-US" id="hd_id3152964" role="heading" level="3" l10n="U"
+                    oldref="124">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154671" role="code" l10n="U" oldref="125">SEARCH("FindText"; "Text"; Position)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146080" role="paragraph" l10n="U" oldref="126">
+            <emph>FindText</emph> is the text to be searched for.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154111" role="paragraph" l10n="U" oldref="127">
+            <emph>Text</emph> is the text where the search will take place.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149559" role="paragraph" l10n="U" oldref="128">
+            <emph>Position</emph> (optional) is the position in the text where the search is to start.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147322" role="heading" level="3" l10n="U"
+                    oldref="129">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154564" role="paragraph" l10n="U" oldref="130">
+            <item type="input">=SEARCH(54;998877665544)</item> returns 10.</paragraph>
+      </section>
+      <section id="substitute">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154830"><bookmark_value>SUBSTITUTE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WECHSELN" id="bm_id3147090" localize="false"/>
-<paragraph role="heading" id="hd_id3154830" xml-lang="en-US" level="2" l10n="U" oldref="174">SUBSTITUTE</paragraph>
-<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="175"><ahelp hid="HID_FUNC_WECHSELN">Substitutes new text for old text in a string.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150994" xml-lang="en-US" level="3" l10n="U" oldref="176">Syntax</paragraph>
-<paragraph role="code" id="par_id3147582" xml-lang="en-US" l10n="U" oldref="177">SUBSTITUTE("Text"; "SearchText"; "NewText"; Occurrence)</paragraph>
-<paragraph role="paragraph" id="par_id3153675" xml-lang="en-US" l10n="U" oldref="178">
-<emph>Text</emph> is the text in which text segments are to be exchanged.</paragraph>
-<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="179">
-<emph>SearchText </emph>is the text segment that is to be replaced (a number of times).</paragraph>
-<paragraph role="paragraph" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="180">
-<emph>NewText</emph> is the text that is to replace the text segment.</paragraph>
-<paragraph role="paragraph" id="par_id3150348" xml-lang="en-US" l10n="CHG" oldref="181">
-<emph>Occurrence</emph> (optional) indicates which occurrence of the search text is to be replaced. If this parameter is missing the search text is replaced throughout.</paragraph>
-<paragraph role="heading" id="hd_id3150946" xml-lang="en-US" level="3" l10n="U" oldref="182">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150412" xml-lang="en-US" l10n="U" oldref="183">
-<item type="input">=SUBSTITUTE("123123123";"3";"abc")</item> returns 12abc12abc12abc.</paragraph>
-<paragraph role="paragraph" id="par_id3154915" xml-lang="en-US" l10n="U" oldref="238">
-<item type="input">=SUBSTITUTE("123123123";"3";"abc";2)</item> returns 12312abc123.</paragraph>
-</section>
-<section id="t">
+<paragraph xml-lang="en-US" id="hd_id3154830" role="heading" level="2" l10n="U"
+                    oldref="174">SUBSTITUTE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="175"><ahelp hid="HID_FUNC_WECHSELN">Substitutes new text for old text in a string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150994" role="heading" level="3" l10n="U"
+                    oldref="176">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147582" role="code" l10n="U" oldref="177">SUBSTITUTE("Text"; "SearchText"; "NewText"; Occurrence)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153675" role="paragraph" l10n="U" oldref="178">
+            <emph>Text</emph> is the text in which text segments are to be exchanged.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156155" role="paragraph" l10n="U" oldref="179">
+            <emph>SearchText </emph>is the text segment that is to be replaced (a number of times).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145779" role="paragraph" l10n="U" oldref="180">
+            <emph>NewText</emph> is the text that is to replace the text segment.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150348" role="paragraph" l10n="CHG" oldref="181">
+            <emph>Occurrence</emph> (optional) indicates which occurrence of the search text is to be replaced. If this parameter is missing the search text is replaced throughout.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150946" role="heading" level="3" l10n="U"
+                    oldref="182">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150412" role="paragraph" l10n="U" oldref="183">
+            <item type="input">=SUBSTITUTE("123123123";"3";"abc")</item> returns 12abc12abc12abc.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154915" role="paragraph" l10n="U" oldref="238">
+            <item type="input">=SUBSTITUTE("123123123";"3";"abc";2)</item> returns 12312abc123.</paragraph>
+      </section>
+      <section id="t">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148977"><bookmark_value>T function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_T" id="bm_id3156051" localize="false"/>
-<paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="2" l10n="U" oldref="140">T</paragraph>
-<paragraph role="paragraph" id="par_id3154359" xml-lang="en-US" l10n="CHG" oldref="141"><ahelp hid="HID_FUNC_T">This function returns the target text, or a blank text string if the target is not text.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155858" xml-lang="en-US" level="3" l10n="U" oldref="142">Syntax</paragraph>
-<paragraph role="code" id="par_id3155871" xml-lang="en-US" l10n="U" oldref="143">T(Value)</paragraph>
-<paragraph role="paragraph" id="par_id3154726" xml-lang="en-US" l10n="CHG" oldref="144">If <emph>Value</emph> is a text string or refers to a text string, T returns that text string; otherwise it returns a blank text string.</paragraph>
-<paragraph role="heading" id="hd_id3155544" xml-lang="en-US" level="3" l10n="U" oldref="145">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151062" xml-lang="en-US" l10n="CHG" oldref="146">
-<item type="input">=T(12345)</item> returns an empty string. </paragraph>
-<paragraph role="paragraph" id="par_id4650105" xml-lang="en-US" l10n="NEW">
-<item type="input">=T("12345")</item> returns the string 12345.</paragraph>
-</section>
-<section id="text">
+<paragraph xml-lang="en-US" id="hd_id3148977" role="heading" level="2" l10n="U"
+                    oldref="140">T</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154359" role="paragraph" l10n="CHG" oldref="141"><ahelp hid="HID_FUNC_T">This function returns the target text, or a blank text string if the target is not text.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155858" role="heading" level="3" l10n="U"
+                    oldref="142">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155871" role="code" l10n="U" oldref="143">T(Value)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154726" role="paragraph" l10n="CHG" oldref="144">If <emph>Value</emph> is a text string or refers to a text string, T returns that text string; otherwise it returns a blank text string.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155544" role="heading" level="3" l10n="U"
+                    oldref="145">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151062" role="paragraph" l10n="CHG" oldref="146">
+            <item type="input">=T(12345)</item> returns an empty string. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id4650105" role="paragraph" l10n="NEW">
+            <item type="input">=T("12345")</item> returns the string 12345.</paragraph>
+      </section>
+      <section id="text">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147132"><bookmark_value>TEXT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEXT" id="bm_id3156426" localize="false"/>
-<paragraph role="heading" id="hd_id3147132" xml-lang="en-US" level="2" l10n="U" oldref="158">TEXT</paragraph>
-<paragraph role="paragraph" id="par_id3147213" xml-lang="en-US" l10n="U" oldref="159"><ahelp hid="HID_FUNC_TEXT">Converts a number into text according to a given format.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153129" xml-lang="en-US" level="3" l10n="U" oldref="160">Syntax</paragraph>
-<paragraph role="code" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="161">TEXT(Number; Format)</paragraph>
-<paragraph role="paragraph" id="par_id3147389" xml-lang="en-US" l10n="U" oldref="162">
-<emph>Number</emph> is the numerical value to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id3156167" xml-lang="en-US" l10n="U" oldref="163">
-<emph>Format</emph> is the text which defines the format. Use decimal and thousands separators according to the language set in the cell format.</paragraph>
-<paragraph role="heading" id="hd_id1243629" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id9044770" xml-lang="en-US" l10n="NEW">
-<item type="input">=TEXT(12.34567;"###.##")</item> returns the text 12.35</paragraph>
-<paragraph role="paragraph" id="par_id3674123" xml-lang="en-US" l10n="NEW">
-<item type="input">=TEXT(12.34567;"000.00")</item> returns the text 012.35</paragraph>
-</section>
-<section id="trim">
+<paragraph xml-lang="en-US" id="hd_id3147132" role="heading" level="2" l10n="U"
+                    oldref="158">TEXT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147213" role="paragraph" l10n="U" oldref="159"><ahelp hid="HID_FUNC_TEXT">Converts a number into text according to a given format.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153129" role="heading" level="3" l10n="U"
+                    oldref="160">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147377" role="code" l10n="U" oldref="161">TEXT(Number; Format)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147389" role="paragraph" l10n="U" oldref="162">
+            <emph>Number</emph> is the numerical value to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156167" role="paragraph" l10n="U" oldref="163">
+            <emph>Format</emph> is the text which defines the format. Use decimal and thousands separators according to the language set in the cell format.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id1243629" role="heading" level="3" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9044770" role="paragraph" l10n="NEW">
+            <item type="input">=TEXT(12.34567;"###.##")</item> returns the text 12.35</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3674123" role="paragraph" l10n="NEW">
+            <item type="input">=TEXT(12.34567;"000.00")</item> returns the text 012.35</paragraph>
+      </section>
+      <section id="trim">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151039"><bookmark_value>TRIM function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GLAETTEN" id="bm_id3150584" localize="false"/>
-<paragraph role="heading" id="hd_id3151039" xml-lang="en-US" level="2" l10n="U" oldref="54">TRIM</paragraph>
-<paragraph role="paragraph" id="par_id3157888" xml-lang="en-US" l10n="CHG" oldref="55"><ahelp hid="HID_FUNC_GLAETTEN">Removes spaces from a string, leaving only a single space character between words.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152913" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph>
-<paragraph role="code" id="par_id3151349" xml-lang="en-US" l10n="U" oldref="57">TRIM("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3151362" xml-lang="en-US" l10n="CHG" oldref="58">
-<emph>Text</emph> refers to text in which spaces are removed.</paragraph>
-<paragraph role="heading" id="hd_id3146838" xml-lang="en-US" level="3" l10n="U" oldref="59">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156074" xml-lang="en-US" l10n="U" oldref="60">
-<item type="input">=TRIM("hello")</item> returns hello.</paragraph>
-</section>
-<section id="upper">
+<paragraph xml-lang="en-US" id="hd_id3151039" role="heading" level="2" l10n="U"
+                    oldref="54">TRIM</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157888" role="paragraph" l10n="CHG" oldref="55"><ahelp hid="HID_FUNC_GLAETTEN">Removes spaces from a string, leaving only a single space character between words.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152913" role="heading" level="3" l10n="U"
+                    oldref="56">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151349" role="code" l10n="U" oldref="57">TRIM("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151362" role="paragraph" l10n="CHG" oldref="58">
+            <emph>Text</emph> refers to text in which spaces are removed.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146838" role="heading" level="3" l10n="U"
+                    oldref="59">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156074" role="paragraph" l10n="U" oldref="60">
+            <item type="input">=TRIM("hello")</item> returns hello.</paragraph>
+      </section>
+      <section id="unichar">
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_UNICHAR" id="bm_id0907200904004674" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0907200904030935"><bookmark_value>UNICHAR function</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0907200904022525" role="heading" level="2" l10n="NEW">UNICHAR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200904022538" role="paragraph" l10n="NEW"><ahelp hid=".">Converts a code number into a Unicode character or letter.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0907200904123753" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200904123753" role="paragraph" l10n="NEW">UNICHAR(number)</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0907200904123720" role="heading" level="3" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id090720090412378" role="paragraph" l10n="NEW">=UNICHAR(169) returns the Copyright character <emph>©</emph>.</paragraph>
+      </section>
+      <section id="unicode">
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_UNICODE" id="bm_id0907200904011330" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0907200904033543"><bookmark_value>UNICODE function</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0907200904022588" role="heading" level="2" l10n="NEW">UNICODE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200904022594" role="paragraph" l10n="NEW"><ahelp hid=".">Returns the numeric code for the first Unicode character in a text string.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0907200904123874" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200904123846" role="paragraph" l10n="NEW">UNICODE("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0907200904123899" role="heading" level="3" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0907200904123919" role="paragraph" l10n="NEW">=UNICODE("©") returns the Unicode number 169 for the Copyright character.</paragraph>
+      </section>
+      <section id="upper">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145178"><bookmark_value>UPPER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS" id="bm_id3145189" localize="false"/>
-<paragraph role="heading" id="hd_id3145178" xml-lang="en-US" level="2" l10n="U" oldref="62">UPPER</paragraph>
-<paragraph role="paragraph" id="par_id3162905" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="HID_FUNC_GROSS">Converts the string specified in the <emph>text</emph> field to uppercase.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148526" xml-lang="en-US" level="3" l10n="U" oldref="64">Syntax</paragraph>
-<paragraph role="code" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="65">UPPER("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3148496" xml-lang="en-US" l10n="U" oldref="66">
-<emph>Text</emph> refers to the lower case letters you want to convert to upper case.</paragraph>
-<paragraph role="heading" id="hd_id3148516" xml-lang="en-US" level="3" l10n="U" oldref="67">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146757" xml-lang="en-US" l10n="U" oldref="68">
-<item type="input">=UPPER("Good Morning")</item> returns GOOD MORNING.</paragraph>
-</section>
-<section id="value">
+<paragraph xml-lang="en-US" id="hd_id3145178" role="heading" level="2" l10n="U"
+                    oldref="62">UPPER</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3162905" role="paragraph" l10n="U" oldref="63"><ahelp hid="HID_FUNC_GROSS">Converts the string specified in the <emph>text</emph> field to uppercase.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148526" role="heading" level="3" l10n="U"
+                    oldref="64">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148539" role="code" l10n="U" oldref="65">UPPER("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148496" role="paragraph" l10n="U" oldref="66">
+            <emph>Text</emph> refers to the lower case letters you want to convert to upper case.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148516" role="heading" level="3" l10n="U"
+                    oldref="67">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146757" role="paragraph" l10n="U" oldref="68">
+            <item type="input">=UPPER("Good Morning")</item> returns GOOD MORNING.</paragraph>
+      </section>
+      <section id="value">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150802"><bookmark_value>VALUE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WERT" id="bm_id3150814" localize="false"/>
-<paragraph role="heading" id="hd_id3150802" xml-lang="en-US" level="2" l10n="U" oldref="185">VALUE</paragraph>
-<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="186"><ahelp hid="HID_FUNC_WERT">Converts a text string into a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152568" xml-lang="en-US" level="3" l10n="U" oldref="187">Syntax</paragraph>
-<paragraph role="code" id="par_id3153638" xml-lang="en-US" l10n="U" oldref="188">VALUE("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3153651" xml-lang="en-US" l10n="U" oldref="189">
-<emph>Text</emph> is the text to be converted to a number.</paragraph>
-<paragraph role="heading" id="hd_id3144719" xml-lang="en-US" level="3" l10n="U" oldref="190">Example</paragraph>
-<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="U" oldref="191">
-<item type="input">=VALUE("4321")</item> returns 4321.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150802" role="heading" level="2" l10n="U"
+                    oldref="185">VALUE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152551" role="paragraph" l10n="U" oldref="186"><ahelp hid="HID_FUNC_WERT">Converts a text string into a number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152568" role="heading" level="3" l10n="U"
+                    oldref="187">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153638" role="code" l10n="U" oldref="188">VALUE("Text")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153651" role="paragraph" l10n="U" oldref="189">
+            <emph>Text</emph> is the text to be converted to a number.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3144719" role="heading" level="3" l10n="U"
+                    oldref="190">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144733" role="paragraph" l10n="U" oldref="191">
+            <item type="input">=VALUE("4321")</item> returns 4321.</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060111.xhp b/helpcontent2/source/text/scalc/01/04060111.xhp
index b679a48ed0..104b3bec90 100644
--- a/helpcontent2/source/text/scalc/01/04060111.xhp
+++ b/helpcontent2/source/text/scalc/01/04060111.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060111.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060112.xhp b/helpcontent2/source/text/scalc/01/04060112.xhp
index 52bafae7b8..6e0b3d0c90 100644
--- a/helpcontent2/source/text/scalc/01/04060112.xhp
+++ b/helpcontent2/source/text/scalc/01/04060112.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060112.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060115.xhp b/helpcontent2/source/text/scalc/01/04060115.xhp
index 1bedc03363..8bee9cafd7 100755
--- a/helpcontent2/source/text/scalc/01/04060115.xhp
+++ b/helpcontent2/source/text/scalc/01/04060115.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060115.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060116.xhp b/helpcontent2/source/text/scalc/01/04060116.xhp
index 680b85d3ce..d306c1b40b 100755
--- a/helpcontent2/source/text/scalc/01/04060116.xhp
+++ b/helpcontent2/source/text/scalc/01/04060116.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04060116.xhp,v $
- * $Revision: 1.11.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,502 +29,567 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textscalc0104060116xml" indexer="include">
-<title id="tit" xml-lang="en-US">Add-in Functions, List of Analysis Functions Part Two</title>
-<filename>/text/scalc/01/04060116.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0104060116xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Add-in Functions, List of Analysis Functions Part Two</title>
+         <filename>/text/scalc/01/04060116.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145074"><bookmark_value>imaginary numbers in analysis functions</bookmark_value>
-<bookmark_value>complex numbers in analysis functions</bookmark_value>
+      <bookmark_value>complex numbers in analysis functions</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154659" xml-lang="en-US" level="1" l10n="U" oldref="1">Add-in Functions, List of Analysis Functions Part Two</paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000404.xhp#addinana"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="174"><link href="text/scalc/01/04060108.xhp" name="Category Statistics">Category Statistics</link></paragraph>
-<paragraph role="paragraph" id="par_id3148869" xml-lang="en-US" l10n="U" oldref="5"><link href="text/scalc/01/04060115.xhp" name="Analysis Functions Part One">Analysis Functions Part One</link></paragraph>
-<paragraph role="paragraph" id="par_id3147072" xml-lang="en-US" l10n="U" oldref="240"><link href="text/scalc/01/04060111.xhp" name="Back to the Overview">Back to the Overview</link></paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3154659" role="heading" level="1" l10n="U" oldref="1">Add-in Functions, List of Analysis Functions Part Two</paragraph>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000404.xhp#addinana"/>
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="174"><link href="text/scalc/01/04060108.xhp" name="Category Statistics">Category Statistics</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148869" role="paragraph" l10n="U" oldref="5"><link href="text/scalc/01/04060115.xhp" name="Analysis Functions Part One">Analysis Functions Part One</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147072" role="paragraph" l10n="U" oldref="240"><link href="text/scalc/01/04060111.xhp" name="Back to the Overview">Back to the Overview</link></paragraph>
+      </section>
 <sort>
 <section id="imabs">
-<paragraph role="paragraph" id="par_id3145074" xml-lang="en-US" l10n="E" oldref="166" localize="false"/>
+         <paragraph xml-lang="en-US" id="par_id3145074" role="paragraph" l10n="E" oldref="166"
+                    localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154959"><bookmark_value>IMABS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMABS" id="bm_id3154541" localize="false"/>
-<paragraph role="heading" id="hd_id3154959" xml-lang="en-US" level="2" oldref="44">IMABS</paragraph>
-<paragraph role="paragraph" id="par_id3149895" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_AAI_FUNC_IMABS">The result is the absolute value of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155382" xml-lang="en-US" level="3" l10n="U" oldref="46">Syntax</paragraph>
-<paragraph role="code" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="47">IMABS("ComplexNumber")</paragraph>
-<paragraph role="paragraph" id="par_id3153974" xml-lang="en-US" l10n="CHG" oldref="48"><variable id="complex"><emph>ComplexNumber</emph> is a complex number that is entered in the form "x+yi" or "x+yj". 
+<paragraph xml-lang="en-US" id="hd_id3154959" role="heading" level="2" oldref="44">IMABS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149895" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_AAI_FUNC_IMABS">The result is the absolute value of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155382" role="heading" level="3" l10n="U"
+                    oldref="46">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151302" role="code" l10n="U" oldref="47">IMABS("ComplexNumber")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153974" role="paragraph" l10n="CHG" oldref="48"><variable id="complex"><emph>ComplexNumber</emph> is a complex number that is entered in the form "x+yi" or "x+yj".
 </variable><comment>no blanks allowed, see i82522</comment></paragraph>
-<paragraph role="heading" id="hd_id3149697" xml-lang="en-US" level="3" l10n="U" oldref="49">Example</paragraph>
-<paragraph role="paragraph" id="par_id3143222" xml-lang="en-US" l10n="U" oldref="50">
-<item type="input">=IMABS("5+12j")</item> returns 13.</paragraph>
-</section>
-<section id="imaginary">
+         <paragraph xml-lang="en-US" id="hd_id3149697" role="heading" level="3" l10n="U"
+                    oldref="49">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143222" role="paragraph" l10n="U" oldref="50">
+            <item type="input">=IMABS("5+12j")</item> returns 13.</paragraph>
+      </section>
+      <section id="imaginary">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145357"><bookmark_value>IMAGINARY function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMAGINARY" id="bm_id3154651" localize="false"/>
-<paragraph role="heading" id="hd_id3145357" xml-lang="en-US" level="2" oldref="51">IMAGINARY</paragraph>
-<paragraph role="paragraph" id="par_id3146965" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_AAI_FUNC_IMAGINARY">The result is the imaginary coefficient of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153555" xml-lang="en-US" level="3" l10n="U" oldref="53">Syntax</paragraph>
-<paragraph role="code" id="par_id3155522" xml-lang="en-US" l10n="U" oldref="54">IMAGINARY("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3151193" xml-lang="en-US" level="3" l10n="U" oldref="56">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155592" xml-lang="en-US" l10n="U" oldref="57">
-<item type="input">=IMAGINARY("4+3j")</item> returns 3.</paragraph>
-</section>
-<section id="impower">
+<paragraph xml-lang="en-US" id="hd_id3145357" role="heading" level="2" oldref="51">IMAGINARY</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146965" role="paragraph" l10n="U" oldref="52"><ahelp hid="HID_AAI_FUNC_IMAGINARY">The result is the imaginary coefficient of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153555" role="heading" level="3" l10n="U"
+                    oldref="53">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155522" role="code" l10n="U" oldref="54">IMAGINARY("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3151193" role="heading" level="3" l10n="U"
+                    oldref="56">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155592" role="paragraph" l10n="U" oldref="57">
+            <item type="input">=IMAGINARY("4+3j")</item> returns 3.</paragraph>
+      </section>
+      <section id="impower">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146106"><bookmark_value>IMPOWER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPOWER" id="bm_id3155755" localize="false"/>
-<paragraph role="heading" id="hd_id3146106" xml-lang="en-US" level="2" oldref="58">IMPOWER</paragraph>
-<paragraph role="paragraph" id="par_id3147245" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_AAI_FUNC_IMPOWER">The result is the integer power of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150954" xml-lang="en-US" level="3" l10n="U" oldref="60">Syntax</paragraph>
-<paragraph role="code" id="par_id3147501" xml-lang="en-US" l10n="U" oldref="61">IMPOWER("ComplexNumber"; Number)</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="paragraph" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="63">
-<emph>Number</emph> is the exponent.</paragraph>
-<paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="3" l10n="U" oldref="64">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151393" xml-lang="en-US" l10n="U" oldref="65">
-<item type="input">=IMPOWER("2+3i";2)</item> returns -5+12i.</paragraph>
-</section>
-<section id="imargument">
+<paragraph xml-lang="en-US" id="hd_id3146106" role="heading" level="2" oldref="58">IMPOWER</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147245" role="paragraph" l10n="U" oldref="59"><ahelp hid="HID_AAI_FUNC_IMPOWER">The result is the integer power of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150954" role="heading" level="3" l10n="U"
+                    oldref="60">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147501" role="code" l10n="U" oldref="61">IMPOWER("ComplexNumber"; Number)</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="par_id3155743" role="paragraph" l10n="U" oldref="63">
+            <emph>Number</emph> is the exponent.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149048" role="heading" level="3" l10n="U"
+                    oldref="64">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151393" role="paragraph" l10n="U" oldref="65">
+            <item type="input">=IMPOWER("2+3i";2)</item> returns -5+12i.</paragraph>
+      </section>
+      <section id="imargument">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148748"><bookmark_value>IMARGUMENT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMARGUMENT" id="bm_id3147297" localize="false"/>
-<paragraph role="heading" id="hd_id3148748" xml-lang="en-US" level="2" oldref="66">IMARGUMENT</paragraph>
-<paragraph role="paragraph" id="par_id3151341" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_AAI_FUNC_IMARGUMENT">The result is the argument (the phi angle) of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150533" xml-lang="en-US" level="3" l10n="U" oldref="68">Syntax</paragraph>
-<paragraph role="code" id="par_id3156402" xml-lang="en-US" l10n="U" oldref="69">IMARGUMENT("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3153019" xml-lang="en-US" level="3" l10n="U" oldref="71">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US" l10n="U" oldref="72">
-<item type="input">=IMARGUMENT("3+4j")</item> returns 0.927295.</paragraph>
-</section>
-<section id="imcos">
+<paragraph xml-lang="en-US" id="hd_id3148748" role="heading" level="2" oldref="66">IMARGUMENT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151341" role="paragraph" l10n="U" oldref="67"><ahelp hid="HID_AAI_FUNC_IMARGUMENT">The result is the argument (the phi angle) of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150533" role="heading" level="3" l10n="U"
+                    oldref="68">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156402" role="code" l10n="U" oldref="69">IMARGUMENT("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3153019" role="heading" level="3" l10n="U"
+                    oldref="71">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="U" oldref="72">
+            <item type="input">=IMARGUMENT("3+4j")</item> returns 0.927295.</paragraph>
+      </section>
+      <section id="imcos">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149146"><bookmark_value>IMCOS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCOS" id="bm_id3150378" localize="false"/>
-<paragraph role="heading" id="hd_id3149146" xml-lang="en-US" level="2" oldref="73">IMCOS</paragraph>
-<paragraph role="paragraph" id="par_id3149725" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="HID_AAI_FUNC_IMCOS">The result is the cosine of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159116" xml-lang="en-US" level="3" l10n="U" oldref="75">Syntax</paragraph>
-<paragraph role="code" id="par_id3147415" xml-lang="en-US" l10n="U" oldref="76">IMCOS("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3152980" xml-lang="en-US" level="3" l10n="U" oldref="78">Example</paragraph>
-<paragraph role="paragraph" id="par_id3157901" xml-lang="en-US" l10n="U" oldref="79">
-<item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85i (rounded).</paragraph>
-</section>
-<section id="imdiv">
+<paragraph xml-lang="en-US" id="hd_id3149146" role="heading" level="2" oldref="73">IMCOS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149725" role="paragraph" l10n="U" oldref="74"><ahelp hid="HID_AAI_FUNC_IMCOS">The result is the cosine of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159116" role="heading" level="3" l10n="U"
+                    oldref="75">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147415" role="code" l10n="U" oldref="76">IMCOS("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152980" role="heading" level="3" l10n="U"
+                    oldref="78">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157901" role="paragraph" l10n="U" oldref="79">
+            <item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85i (rounded).</paragraph>
+      </section>
+      <section id="imdiv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150024"><bookmark_value>IMDIV function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMDIV" id="bm_id3154679" localize="false"/>
-<paragraph role="heading" id="hd_id3150024" xml-lang="en-US" level="2" oldref="80">IMDIV</paragraph>
-<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="HID_AAI_FUNC_IMDIV">The result is the division of two complex numbers.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150465" xml-lang="en-US" level="3" l10n="U" oldref="82">Syntax</paragraph>
-<paragraph role="code" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="83">IMDIV("Numerator"; "Denominator")</paragraph>
-<paragraph role="paragraph" id="par_id3150741" xml-lang="en-US" l10n="CHG" oldref="84">
-<emph>Numerator</emph>, <emph>Denominator</emph> are complex numbers that are entered in the form "x+yi" or "x+yj".</paragraph>
-<paragraph role="heading" id="hd_id3151229" xml-lang="en-US" level="3" l10n="U" oldref="85">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="86">
-<item type="input">=IMDIV("-238+240i";"10+24i")</item> returns 5+12i.</paragraph>
-</section>
-<section id="imexp">
+<paragraph xml-lang="en-US" id="hd_id3150024" role="heading" level="2" oldref="80">IMDIV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145825" role="paragraph" l10n="U" oldref="81"><ahelp hid="HID_AAI_FUNC_IMDIV">The result is the division of two complex numbers.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150465" role="heading" level="3" l10n="U"
+                    oldref="82">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146942" role="code" l10n="U" oldref="83">IMDIV("Numerator"; "Denominator")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150741" role="paragraph" l10n="CHG" oldref="84">
+            <emph>Numerator</emph>, <emph>Denominator</emph> are complex numbers that are entered in the form "x+yi" or "x+yj".</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151229" role="heading" level="3" l10n="U"
+                    oldref="85">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="U" oldref="86">
+            <item type="input">=IMDIV("-238+240i";"10+24i")</item> returns 5+12i.</paragraph>
+      </section>
+      <section id="imexp">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153039"><bookmark_value>IMEXP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMEXP" id="bm_id3147468" localize="false"/>
-<paragraph role="heading" id="hd_id3153039" xml-lang="en-US" level="2" oldref="87">IMEXP</paragraph>
-<paragraph role="paragraph" id="par_id3144741" xml-lang="en-US" l10n="CHG" oldref="88"><ahelp hid="HID_AAI_FUNC_IMEXP">The result is the power of e and the complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
-<paragraph role="heading" id="hd_id3145591" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
-<paragraph role="code" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="90">IMEXP("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3148581" xml-lang="en-US" level="3" l10n="U" oldref="92">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149253" xml-lang="en-US" l10n="U" oldref="93">
-<item type="input">=IMEXP("1+j") </item>returns 1.47+2.29j (rounded).</paragraph>
-</section>
-<section id="imconjugate">
+<paragraph xml-lang="en-US" id="hd_id3153039" role="heading" level="2" oldref="87">IMEXP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144741" role="paragraph" l10n="CHG" oldref="88"><ahelp hid="HID_AAI_FUNC_IMEXP">The result is the power of e and the complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145591" role="heading" level="3" l10n="U"
+                    oldref="89">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154810" role="code" l10n="U" oldref="90">IMEXP("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3148581" role="heading" level="3" l10n="U"
+                    oldref="92">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149253" role="paragraph" l10n="U" oldref="93">
+            <item type="input">=IMEXP("1+j") </item>returns 1.47+2.29j (rounded).</paragraph>
+      </section>
+      <section id="imconjugate">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149955"><bookmark_value>IMCONJUGATE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCONJUGATE" id="bm_id3152782" localize="false"/>
-<paragraph role="heading" id="hd_id3149955" xml-lang="en-US" level="2" oldref="94">IMCONJUGATE</paragraph>
-<paragraph role="paragraph" id="par_id3155263" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="HID_AAI_FUNC_IMCONJUGATE">The result is the conjugated complex complement to a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148750" xml-lang="en-US" level="3" l10n="U" oldref="96">Syntax</paragraph>
-<paragraph role="code" id="par_id3153082" xml-lang="en-US" l10n="U" oldref="97">IMCONJUGATE("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3153326" xml-lang="en-US" level="3" l10n="U" oldref="99">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="100">
-<item type="input">=IMCONJUGATE("1+j")</item> returns 1-j.</paragraph>
-</section>
-<section id="imln">
+<paragraph xml-lang="en-US" id="hd_id3149955" role="heading" level="2" oldref="94">IMCONJUGATE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155263" role="paragraph" l10n="U" oldref="95"><ahelp hid="HID_AAI_FUNC_IMCONJUGATE">The result is the conjugated complex complement to a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148750" role="heading" level="3" l10n="U"
+                    oldref="96">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153082" role="code" l10n="U" oldref="97">IMCONJUGATE("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3153326" role="heading" level="3" l10n="U"
+                    oldref="99">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="100">
+            <item type="input">=IMCONJUGATE("1+j")</item> returns 1-j.</paragraph>
+      </section>
+      <section id="imln">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150898"><bookmark_value>IMLN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLN" id="bm_id3149190" localize="false"/>
-<paragraph role="heading" id="hd_id3150898" xml-lang="en-US" level="2" oldref="101">IMLN</paragraph>
-<paragraph role="paragraph" id="par_id3146853" xml-lang="en-US" l10n="CHG" oldref="102"><ahelp hid="HID_AAI_FUNC_IMLN">The result is the natural logarithm (to the base e) of a complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
-<paragraph role="heading" id="hd_id3150008" xml-lang="en-US" level="3" l10n="U" oldref="103">Syntax</paragraph>
-<paragraph role="code" id="par_id3155954" xml-lang="en-US" l10n="U" oldref="104">IMLN("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3153565" xml-lang="en-US" level="3" l10n="U" oldref="106">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153736" xml-lang="en-US" l10n="U" oldref="107">
-<item type="input">=IMLN("1+j")</item> returns 0.35+0.79j (rounded).</paragraph>
-</section>
-<section id="imlog10">
+<paragraph xml-lang="en-US" id="hd_id3150898" role="heading" level="2" oldref="101">IMLN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146853" role="paragraph" l10n="CHG" oldref="102"><ahelp hid="HID_AAI_FUNC_IMLN">The result is the natural logarithm (to the base e) of a complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150008" role="heading" level="3" l10n="U"
+                    oldref="103">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155954" role="code" l10n="U" oldref="104">IMLN("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3153565" role="heading" level="3" l10n="U"
+                    oldref="106">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153736" role="paragraph" l10n="U" oldref="107">
+            <item type="input">=IMLN("1+j")</item> returns 0.35+0.79j (rounded).</paragraph>
+      </section>
+      <section id="imlog10">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155929"><bookmark_value>IMLOG10 function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG10" id="bm_id3148765" localize="false"/>
-<paragraph role="heading" id="hd_id3155929" xml-lang="en-US" level="2" oldref="108">IMLOG10</paragraph>
-<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="CHG" oldref="109"><ahelp hid="HID_AAI_FUNC_IMLOG10">The result is the common logarithm (to the base 10) of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154327" xml-lang="en-US" level="3" l10n="U" oldref="110">Syntax</paragraph>
-<paragraph role="code" id="par_id3150128" xml-lang="en-US" l10n="U" oldref="111">IMLOG10("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3149003" xml-lang="en-US" level="3" l10n="U" oldref="113">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151021" xml-lang="en-US" l10n="U" oldref="114">
-<item type="input">=IMLOG10("1+j")</item> returns 0.15+0.34j (rounded).</paragraph>
-</section>
-<section id="imlog2">
+<paragraph xml-lang="en-US" id="hd_id3155929" role="heading" level="2" oldref="108">IMLOG10</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149882" role="paragraph" l10n="CHG" oldref="109"><ahelp hid="HID_AAI_FUNC_IMLOG10">The result is the common logarithm (to the base 10) of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154327" role="heading" level="3" l10n="U"
+                    oldref="110">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150128" role="code" l10n="U" oldref="111">IMLOG10("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3149003" role="heading" level="3" l10n="U"
+                    oldref="113">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151021" role="paragraph" l10n="U" oldref="114">
+            <item type="input">=IMLOG10("1+j")</item> returns 0.15+0.34j (rounded).</paragraph>
+      </section>
+      <section id="imlog2">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155623"><bookmark_value>IMLOG2 function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG2" id="bm_id3157975" localize="false"/>
-<paragraph role="heading" id="hd_id3155623" xml-lang="en-US" level="2" oldref="115">IMLOG2</paragraph>
-<paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_AAI_FUNC_IMLOG2">The result is the binary logarithm of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153046" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
-<paragraph role="code" id="par_id3145355" xml-lang="en-US" l10n="U" oldref="118">IMLOG2("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3148768" xml-lang="en-US" level="3" l10n="U" oldref="120">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149536" xml-lang="en-US" l10n="U" oldref="121">
-<item type="input">=IMLOG2("1+j")</item> returns 0.50+1.13j (rounded).</paragraph>
-</section>
-<section id="improduct">
+<paragraph xml-lang="en-US" id="hd_id3155623" role="heading" level="2" oldref="115">IMLOG2</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150932" role="paragraph" l10n="U" oldref="116"><ahelp hid="HID_AAI_FUNC_IMLOG2">The result is the binary logarithm of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153046" role="heading" level="3" l10n="U"
+                    oldref="117">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145355" role="code" l10n="U" oldref="118">IMLOG2("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3148768" role="heading" level="3" l10n="U"
+                    oldref="120">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149536" role="paragraph" l10n="U" oldref="121">
+            <item type="input">=IMLOG2("1+j")</item> returns 0.50+1.13j (rounded).</paragraph>
+      </section>
+      <section id="improduct">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145626"><bookmark_value>IMPRODUCT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPRODUCT" id="bm_id3150661" localize="false"/>
-<paragraph role="heading" id="hd_id3145626" xml-lang="en-US" level="2" oldref="122">IMPRODUCT</paragraph>
-<paragraph role="paragraph" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_AAI_FUNC_IMPRODUCT">The result is the product of up to 29 complex numbers.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
-<paragraph role="code" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="125">IMPRODUCT("ComplexNumber"; "ComplexNumber1"; ...)</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3153228" xml-lang="en-US" level="3" l10n="U" oldref="127">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155815" xml-lang="en-US" l10n="U" oldref="128">
-<item type="input">=IMPRODUCT("3+4j";"5-3j")</item> returns 27+11j.</paragraph>
-</section>
-<section id="imreal">
+<paragraph xml-lang="en-US" id="hd_id3145626" role="heading" level="2" oldref="122">IMPRODUCT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153545" role="paragraph" l10n="U" oldref="123"><ahelp hid="HID_AAI_FUNC_IMPRODUCT">The result is the product of up to 29 complex numbers.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149388" role="heading" level="3" l10n="U"
+                    oldref="124">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149027" role="code" l10n="U" oldref="125">IMPRODUCT("ComplexNumber"; "ComplexNumber1"; ...)</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3153228" role="heading" level="3" l10n="U"
+                    oldref="127">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155815" role="paragraph" l10n="U" oldref="128">
+            <item type="input">=IMPRODUCT("3+4j";"5-3j")</item> returns 27+11j.</paragraph>
+      </section>
+      <section id="imreal">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147539"><bookmark_value>IMREAL function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMREAL" id="bm_id3148596" localize="false"/>
-<paragraph role="heading" id="hd_id3147539" xml-lang="en-US" level="2" oldref="129">IMREAL</paragraph>
-<paragraph role="paragraph" id="par_id3155372" xml-lang="en-US" l10n="U" oldref="130"><ahelp hid="HID_AAI_FUNC_IMREAL">The result is the real coefficient of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154951" xml-lang="en-US" level="3" l10n="U" oldref="131">Syntax</paragraph>
-<paragraph role="code" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="132">IMREAL("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3155409" xml-lang="en-US" level="3" l10n="U" oldref="134">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155986" xml-lang="en-US" l10n="U" oldref="135">
-<item type="input">=IMREAL("1+3j")</item> returns 1.</paragraph>
-</section>
-<section id="imsin">
+<paragraph xml-lang="en-US" id="hd_id3147539" role="heading" level="2" oldref="129">IMREAL</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155372" role="paragraph" l10n="U" oldref="130"><ahelp hid="HID_AAI_FUNC_IMREAL">The result is the real coefficient of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154951" role="heading" level="3" l10n="U"
+                    oldref="131">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153927" role="code" l10n="U" oldref="132">IMREAL("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3155409" role="heading" level="3" l10n="U"
+                    oldref="134">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155986" role="paragraph" l10n="U" oldref="135">
+            <item type="input">=IMREAL("1+3j")</item> returns 1.</paragraph>
+      </section>
+      <section id="imsin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148431"><bookmark_value>IMSIN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSIN" id="bm_id3153716" localize="false"/>
-<paragraph role="heading" id="hd_id3148431" xml-lang="en-US" level="2" oldref="136">IMSIN</paragraph>
-<paragraph role="paragraph" id="par_id3152591" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_AAI_FUNC_IMSIN">The result is the sine of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149822" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph>
-<paragraph role="code" id="par_id3150387" xml-lang="en-US" l10n="U" oldref="139">IMSIN("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3150613" xml-lang="en-US" level="3" l10n="U" oldref="141">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154310" xml-lang="en-US" l10n="U" oldref="142">
-<item type="input">=IMSIN("3+4j")</item> returns 3.85+27.02j (rounded).</paragraph>
-</section>
-<section id="imsub">
+<paragraph xml-lang="en-US" id="hd_id3148431" role="heading" level="2" oldref="136">IMSIN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152591" role="paragraph" l10n="U" oldref="137"><ahelp hid="HID_AAI_FUNC_IMSIN">The result is the sine of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149822" role="heading" level="3" l10n="U"
+                    oldref="138">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150387" role="code" l10n="U" oldref="139">IMSIN("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3150613" role="heading" level="3" l10n="U"
+                    oldref="141">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154310" role="paragraph" l10n="U" oldref="142">
+            <item type="input">=IMSIN("3+4j")</item> returns 3.85+27.02j (rounded).</paragraph>
+      </section>
+      <section id="imsub">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163826"><bookmark_value>IMSUB function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUB" id="bm_id3152481" localize="false"/>
-<paragraph role="heading" id="hd_id3163826" xml-lang="en-US" level="2" oldref="143">IMSUB</paragraph>
-<paragraph role="paragraph" id="par_id3149277" xml-lang="en-US" l10n="U" oldref="144"><ahelp hid="HID_AAI_FUNC_IMSUB">The result is the subtraction of two complex numbers.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149264" xml-lang="en-US" level="3" l10n="U" oldref="145">Syntax</paragraph>
-<paragraph role="code" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="146">IMSUB("ComplexNumber1"; "ComplexNumber2")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3155833" xml-lang="en-US" level="3" l10n="U" oldref="148">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150963" xml-lang="en-US" l10n="U" oldref="149">
-<item type="input">=IMSUB("13+4j";"5+3j")</item> returns 8+j.</paragraph>
-</section>
-<section id="imsum">
+<paragraph xml-lang="en-US" id="hd_id3163826" role="heading" level="2" oldref="143">IMSUB</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149277" role="paragraph" l10n="U" oldref="144"><ahelp hid="HID_AAI_FUNC_IMSUB">The result is the subtraction of two complex numbers.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149264" role="heading" level="3" l10n="U"
+                    oldref="145">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149710" role="code" l10n="U" oldref="146">IMSUB("ComplexNumber1"; "ComplexNumber2")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3155833" role="heading" level="3" l10n="U"
+                    oldref="148">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150963" role="paragraph" l10n="U" oldref="149">
+            <item type="input">=IMSUB("13+4j";"5+3j")</item> returns 8+j.</paragraph>
+      </section>
+      <section id="imsum">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156312"><bookmark_value>IMSUM function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUM" id="bm_id3149454" localize="false"/>
-<paragraph role="heading" id="hd_id3156312" xml-lang="en-US" level="2" oldref="150">IMSUM</paragraph>
-<paragraph role="paragraph" id="par_id3153215" xml-lang="en-US" l10n="U" oldref="151"><ahelp hid="HID_AAI_FUNC_IMSUM">The result is the sum of up to 29 complex numbers.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156095" xml-lang="en-US" level="3" l10n="U" oldref="152">Syntax</paragraph>
-<paragraph role="code" id="par_id3152930" xml-lang="en-US" l10n="U" oldref="153">IMSUM("ComplexNumber1"; "ComplexNumber2"; ...)</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3154640" xml-lang="en-US" level="3" l10n="U" oldref="155">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147081" xml-lang="en-US" l10n="U" oldref="156">
-<item type="input">=IMSUM("13+4j";"5+3j")</item> returns 18+7j.</paragraph>
-</section>
-<section id="imsqrt">
+<paragraph xml-lang="en-US" id="hd_id3156312" role="heading" level="2" oldref="150">IMSUM</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153215" role="paragraph" l10n="U" oldref="151"><ahelp hid="HID_AAI_FUNC_IMSUM">The result is the sum of up to 29 complex numbers.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156095" role="heading" level="3" l10n="U"
+                    oldref="152">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152930" role="code" l10n="U" oldref="153">IMSUM("ComplexNumber1"; "ComplexNumber2"; ...)</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3154640" role="heading" level="3" l10n="U"
+                    oldref="155">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147081" role="paragraph" l10n="U" oldref="156">
+            <item type="input">=IMSUM("13+4j";"5+3j")</item> returns 18+7j.</paragraph>
+      </section>
+      <section id="imsqrt">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147570"><bookmark_value>IMSQRT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSQRT" id="bm_id3151189" localize="false"/>
-<paragraph role="heading" id="hd_id3147570" xml-lang="en-US" level="2" oldref="167">IMSQRT</paragraph>
-<paragraph role="paragraph" id="par_id3156131" xml-lang="en-US" l10n="U" oldref="168"><ahelp hid="HID_AAI_FUNC_IMSQRT">The result is the square root of a complex number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145202" xml-lang="en-US" level="3" l10n="U" oldref="169">Syntax</paragraph>
-<paragraph role="code" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="170">IMSQRT("ComplexNumber")</paragraph>
-<embed href="text/scalc/01/04060116.xhp#complex"/>
-<paragraph role="heading" id="hd_id3147268" xml-lang="en-US" level="3" l10n="U" oldref="172">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="173">
-<item type="input">=IMSQRT("3+4i")</item> returns 2+1i.</paragraph>
-</section>
-<section id="complexfunc">
+<paragraph xml-lang="en-US" id="hd_id3147570" role="heading" level="2" oldref="167">IMSQRT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156131" role="paragraph" l10n="U" oldref="168"><ahelp hid="HID_AAI_FUNC_IMSQRT">The result is the square root of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145202" role="heading" level="3" l10n="U"
+                    oldref="169">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150760" role="code" l10n="U" oldref="170">IMSQRT("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3147268" role="heading" level="3" l10n="U"
+                    oldref="172">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152807" role="paragraph" l10n="U" oldref="173">
+            <item type="input">=IMSQRT("3+4i")</item> returns 2+1i.</paragraph>
+      </section>
+      <section id="complexfunc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154054"><bookmark_value>COMPLEX function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COMPLEX" id="bm_id3156116" localize="false"/>
-<paragraph role="heading" id="hd_id3154054" xml-lang="en-US" level="2" oldref="157">COMPLEX</paragraph>
-<paragraph role="paragraph" id="par_id3156111" xml-lang="en-US" l10n="U" oldref="158"><ahelp hid="HID_AAI_FUNC_COMPLEX">The result is a complex number which is returned from a real coefficient and an imaginary coefficient.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154744" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
-<paragraph role="code" id="par_id3155999" xml-lang="en-US" l10n="U" oldref="160">COMPLEX(RealNum; INum; Suffix)</paragraph>
-<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="161">
-<emph>RealNum</emph> is the real coefficient of the complex number.</paragraph>
-<paragraph role="paragraph" id="par_id3149135" xml-lang="en-US" l10n="U" oldref="162">
-<emph>INum</emph> is the imaginary coefficient of the complex number.</paragraph>
-<paragraph role="paragraph" id="par_id3155849" xml-lang="en-US" l10n="U" oldref="163">
-<emph>Suffix</emph> is a list of options, "i" or "j".</paragraph>
-<paragraph role="heading" id="hd_id3145659" xml-lang="en-US" level="3" l10n="U" oldref="164">Example</paragraph>
-<paragraph role="paragraph" id="par_id3143229" xml-lang="en-US" l10n="U" oldref="165">
-<item type="input">=COMPLEX(3;4;"j")</item> returns 3+4j.</paragraph>
-</section>
-<section id="oct2bin">
+<paragraph xml-lang="en-US" id="hd_id3154054" role="heading" level="2" oldref="157">COMPLEX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156111" role="paragraph" l10n="U" oldref="158"><ahelp hid="HID_AAI_FUNC_COMPLEX">The result is a complex number which is returned from a real coefficient and an imaginary coefficient.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154744" role="heading" level="3" l10n="U"
+                    oldref="159">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155999" role="code" l10n="U" oldref="160">COMPLEX(RealNum; INum; Suffix)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153626" role="paragraph" l10n="U" oldref="161">
+            <emph>RealNum</emph> is the real coefficient of the complex number.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149135" role="paragraph" l10n="U" oldref="162">
+            <emph>INum</emph> is the imaginary coefficient of the complex number.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155849" role="paragraph" l10n="U" oldref="163">
+            <emph>Suffix</emph> is a list of options, "i" or "j".</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145659" role="heading" level="3" l10n="U"
+                    oldref="164">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143229" role="paragraph" l10n="U" oldref="165">
+            <item type="input">=COMPLEX(3;4;"j")</item> returns 3+4j.</paragraph>
+      </section>
+      <section id="oct2bin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155103"><bookmark_value>OCT2BIN function</bookmark_value>
-<bookmark_value>converting;octal numbers, into binary numbers</bookmark_value>
+         <bookmark_value>converting;octal numbers, into binary numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2BIN" id="bm_id3149290" localize="false"/>
-<paragraph role="heading" id="hd_id3155103" xml-lang="en-US" level="2" l10n="E" oldref="217">OCT2BIN</paragraph>
-<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="218"><ahelp hid="HID_AAI_FUNC_OCT2BIN">The result is the binary number for the octal number entered.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146088" xml-lang="en-US" level="3" l10n="U" oldref="219">Syntax</paragraph>
-<paragraph role="code" id="par_id3154303" xml-lang="en-US" l10n="U" oldref="220">OCT2BIN(Number; Places)</paragraph>
-<paragraph role="paragraph" id="par_id3156013" xml-lang="en-US" l10n="U" oldref="221">
-<emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
-<paragraph role="paragraph" id="par_id3153984" xml-lang="en-US" l10n="U" oldref="222">
-<emph>Places</emph> is the number of places to be output.</paragraph>
-<paragraph role="heading" id="hd_id3147493" xml-lang="en-US" level="3" l10n="U" oldref="223">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147260" xml-lang="en-US" l10n="U" oldref="224">
-<item type="input">=OCT2BIN(3;3)</item> returns 011.</paragraph>
-</section>
-<section id="oct2dec">
+<paragraph xml-lang="en-US" id="hd_id3155103" role="heading" level="2" l10n="E"
+                    oldref="217">OCT2BIN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146898" role="paragraph" l10n="U" oldref="218"><ahelp hid="HID_AAI_FUNC_OCT2BIN">The result is the binary number for the octal number entered.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146088" role="heading" level="3" l10n="U"
+                    oldref="219">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154303" role="code" l10n="U" oldref="220">OCT2BIN(Number; Places)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156013" role="paragraph" l10n="U" oldref="221">
+            <emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153984" role="paragraph" l10n="U" oldref="222">
+            <emph>Places</emph> is the number of places to be output.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147493" role="heading" level="3" l10n="U"
+                    oldref="223">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147260" role="paragraph" l10n="U" oldref="224">
+            <item type="input">=OCT2BIN(3;3)</item> returns 011.</paragraph>
+      </section>
+      <section id="oct2dec">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152791"><bookmark_value>OCT2DEC function</bookmark_value>
-<bookmark_value>converting;octal numbers, into decimal numbers</bookmark_value>
+         <bookmark_value>converting;octal numbers, into decimal numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2DEZ" id="bm_id3151168" localize="false"/>
-<paragraph role="heading" id="hd_id3152791" xml-lang="en-US" level="2" oldref="225">OCT2DEC</paragraph>
-<paragraph role="paragraph" id="par_id3149199" xml-lang="en-US" l10n="U" oldref="226"><ahelp hid="HID_AAI_FUNC_OCT2DEZ">The result is the decimal number for the octal number entered.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159337" xml-lang="en-US" level="3" l10n="U" oldref="227">Syntax</paragraph>
-<paragraph role="code" id="par_id3153902" xml-lang="en-US" l10n="U" oldref="228">OCT2DEC(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3155326" xml-lang="en-US" l10n="U" oldref="229">
-<emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
-<paragraph role="heading" id="hd_id3154698" xml-lang="en-US" level="3" l10n="U" oldref="230">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154930" xml-lang="en-US" l10n="U" oldref="231">
-<item type="input">=OCT2DEC(144)</item> returns 100.</paragraph>
-</section>
-<section id="oct2hex">
+<paragraph xml-lang="en-US" id="hd_id3152791" role="heading" level="2" oldref="225">OCT2DEC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149199" role="paragraph" l10n="U" oldref="226"><ahelp hid="HID_AAI_FUNC_OCT2DEZ">The result is the decimal number for the octal number entered.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159337" role="heading" level="3" l10n="U"
+                    oldref="227">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153902" role="code" l10n="U" oldref="228">OCT2DEC(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155326" role="paragraph" l10n="U" oldref="229">
+            <emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154698" role="heading" level="3" l10n="U"
+                    oldref="230">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154930" role="paragraph" l10n="U" oldref="231">
+            <item type="input">=OCT2DEC(144)</item> returns 100.</paragraph>
+      </section>
+      <section id="oct2hex">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155391"><bookmark_value>OCT2HEX function</bookmark_value>
-<bookmark_value>converting;octal numbers, into hexadecimal numbers</bookmark_value>
+         <bookmark_value>converting;octal numbers, into hexadecimal numbers</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2HEX" id="bm_id3149904" localize="false"/>
-<paragraph role="heading" id="hd_id3155391" xml-lang="en-US" level="2" oldref="232">OCT2HEX</paragraph>
-<paragraph role="paragraph" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="233"><ahelp hid="HID_AAI_FUNC_OCT2HEX"> The result is the hexadecimal number for the octal number entered.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="234">Syntax</paragraph>
-<paragraph role="code" id="par_id3150523" xml-lang="en-US" l10n="U" oldref="235">OCT2HEX(Number; Places)</paragraph>
-<paragraph role="paragraph" id="par_id3159162" xml-lang="en-US" l10n="U" oldref="236">
-<emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
-<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="237">
-<emph>Places</emph> is the number of places to be output.</paragraph>
-<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="3" l10n="U" oldref="238">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148802" xml-lang="en-US" l10n="U" oldref="239">
-<item type="input">=OCT2HEX(144;4)</item> returns 0064.</paragraph>
-</section>
-<section id="convertadd">
+<paragraph xml-lang="en-US" id="hd_id3155391" role="heading" level="2" oldref="232">OCT2HEX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148831" role="paragraph" l10n="U" oldref="233"><ahelp hid="HID_AAI_FUNC_OCT2HEX"> The result is the hexadecimal number for the octal number entered.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146988" role="heading" level="3" l10n="U"
+                    oldref="234">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150523" role="code" l10n="U" oldref="235">OCT2HEX(Number; Places)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159162" role="paragraph" l10n="U" oldref="236">
+            <emph>Number</emph> is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145420" role="paragraph" l10n="U" oldref="237">
+            <emph>Places</emph> is the number of places to be output.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150504" role="heading" level="3" l10n="U"
+                    oldref="238">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148802" role="paragraph" l10n="U" oldref="239">
+            <item type="input">=OCT2HEX(144;4)</item> returns 0064.</paragraph>
+      </section>
+      <section id="convertadd">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148446"><bookmark_value>CONVERT_ADD function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CONVERT" id="bm_id3150773" localize="false"/>
-<paragraph role="heading" id="hd_id3148446" xml-lang="en-US" level="2" oldref="175">CONVERT_ADD</paragraph>
-<paragraph role="paragraph" id="par_id3154902" xml-lang="en-US" l10n="U" oldref="176"><ahelp hid="HID_AAI_FUNC_CONVERT">Converts a value from one unit of measure to the corresponding value in another unit of measure.</ahelp> Enter the units of measures directly as text in quotation marks or as a reference. If you enter the units of measure in cells, they must correspond exactly with the following list which is case sensitive: For example, in order to enter a lower case l (for liter) in a cell, enter the apostrophe ' immediately followed by l.</paragraph>
-<table id="tbl_id3149771">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153055" xml-lang="en-US" l10n="U" oldref="177">Property</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3147234" xml-lang="en-US" l10n="U" oldref="178">Units</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="179">Weight</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148476" xml-lang="en-US" l10n="U" oldref="180">g, sg, lbm, u, ozm, stone, ton, grain, pweight, hweight, shweight</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155361" xml-lang="en-US" l10n="U" oldref="181">Length</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="182">m, mi, Nmi, in, ft, yd, ang, Pica, ell, parsec</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3158429" xml-lang="en-US" l10n="U" oldref="183">Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150707" xml-lang="en-US" l10n="U" oldref="184">yr, day, hr, mn, sec</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="185">Pressure</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3166437" xml-lang="en-US" l10n="U" oldref="186">Pa, atm, mmHg, Torr, psi</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="187">Force</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="188">N, dyn, pond</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153686" xml-lang="en-US" l10n="U" oldref="189">Energy</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="190">J, e, c, cal, eV, HPh, Wh, BTU</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154100" xml-lang="en-US" l10n="U" oldref="191">Power</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149915" xml-lang="en-US" l10n="U" oldref="192">W, HP, PS</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="193">Field strength</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="194">T, ga</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="195">Temperature</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148659" xml-lang="en-US" l10n="U" oldref="196">C, F, K, Reau, Rank</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="197">Volume</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149423" xml-lang="en-US" l10n="U" oldref="198">l, tsp, tbs, oz, cup, pt, qt, gal, m3, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149244" xml-lang="en-US" l10n="U" oldref="199">Area</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150425" xml-lang="en-US" l10n="U" oldref="200">m2, mi2, Nmi2, in2, ft2, yd2, ang2, Pica2, Morgen, ar, acre, ha</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150629" xml-lang="en-US" l10n="U" oldref="201">Speed</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159246" xml-lang="en-US" l10n="U" oldref="202">m/s, m/h, mph, kn, admkn</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3148446" role="heading" level="2" l10n="CHG"
+                    oldref="175">CONVERT_ADD</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154902" role="paragraph" l10n="U" oldref="176"><ahelp hid="HID_AAI_FUNC_CONVERT">Converts a value from one unit of measure to the corresponding value in another unit of measure.</ahelp> Enter the units of measures directly as text in quotation marks or as a reference. If you enter the units of measure in cells, they must correspond exactly with the following list which is case sensitive: For example, in order to enter a lower case l (for liter) in a cell, enter the apostrophe ' immediately followed by l.</paragraph>
+         <table id="tbl_id3149771">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153055" role="tablehead" l10n="U" oldref="177">Property</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147234" role="tablehead" l10n="U" oldref="178">Units</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147512" role="tablecontent" l10n="U" oldref="179">Weight</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148476" role="tablecontent" l10n="U" oldref="180">g, sg, lbm, u, ozm, stone, ton, grain, pweight, hweight, shweight</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="181">Length</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148925" role="tablecontent" l10n="U" oldref="182">m, mi, Nmi, in, ft, yd, ang, Pica, ell, parsec</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3158429" role="tablecontent" l10n="U" oldref="183">Time</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150707" role="tablecontent" l10n="U" oldref="184">yr, day, hr, mn, sec</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153238" role="tablecontent" l10n="U" oldref="185">Pressure</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3166437" role="tablecontent" l10n="U" oldref="186">Pa, atm, mmHg, Torr, psi</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152944" role="tablecontent" l10n="U" oldref="187">Force</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155582" role="tablecontent" l10n="U" oldref="188">N, dyn, pond</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153686" role="tablecontent" l10n="U" oldref="189">Energy</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153386" role="tablecontent" l10n="U" oldref="190">J, e, c, cal, eV, HPh, Wh, BTU</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154100" role="tablecontent" l10n="U" oldref="191">Power</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149915" role="tablecontent" l10n="U" oldref="192">W, HP, PS</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148988" role="tablecontent" l10n="U" oldref="193">Field strength</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148616" role="tablecontent" l10n="U" oldref="194">T, ga</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151120" role="tablecontent" l10n="U" oldref="195">Temperature</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148659" role="tablecontent" l10n="U" oldref="196">C, F, K, Reau, Rank</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154610" role="tablecontent" l10n="U" oldref="197">Volume</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149423" role="tablecontent" l10n="U" oldref="198">l, tsp, tbs, oz, cup, pt, qt, gal, m3, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149244" role="tablecontent" l10n="U" oldref="199">Area</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150425" role="tablecontent" l10n="U" oldref="200">m2, mi2, Nmi2, in2, ft2, yd2, ang2, Pica2, Morgen, ar, acre, ha</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150629" role="tablecontent" l10n="U" oldref="201">Speed</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159246" role="tablecontent" l10n="U" oldref="202">m/s, m/h, mph, kn, admkn</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-<paragraph role="paragraph" id="par_id3143277" xml-lang="en-US" l10n="U" oldref="203">Each unit of measure must be preceded by a prefix character from the following list:</paragraph>
-<table id="tbl_id3144759">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="204">Permitted prefix characters</paragraph>
-</tablecell>
-<tablecell>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="205">10^(&lt;0)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149931" xml-lang="en-US" l10n="U" oldref="206">d, c, m, u, n, p, f, a, z, y</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149589" xml-lang="en-US" l10n="U" oldref="207">10^(&gt;0)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="208">e, h, k, M, G, T, P, E, Z, Y</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-<paragraph role="heading" id="hd_id3146125" xml-lang="en-US" level="3" l10n="U" oldref="209">Syntax</paragraph>
-<paragraph role="code" id="par_id3153695" xml-lang="en-US" l10n="U" oldref="210">CONVERT_ADD(Number; "FromUnit"; "ToUnit")</paragraph>
-<paragraph role="paragraph" id="par_id3147522" xml-lang="en-US" l10n="U" oldref="211">
-<emph>Number</emph> is the number to be converted.</paragraph>
-<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="212">
-<emph>FromUnit</emph> is the unit from which conversion is taking place.</paragraph>
-<paragraph role="paragraph" id="par_id3153790" xml-lang="en-US" l10n="U" oldref="213">
-<emph>ToUnit</emph> is the unit to which conversion is taking place.</paragraph>
-<paragraph role="heading" id="hd_id3156270" xml-lang="en-US" level="3" l10n="U" oldref="214">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3156336" xml-lang="en-US" l10n="U" oldref="215">
-<item type="input">=CONVERT_ADD(10;"HP";"PS") </item>returns, rounded to two decimal places, 10.14. 10 HP equal 10.14 PS.</paragraph>
-<paragraph role="paragraph" id="par_id3154834" xml-lang="en-US" l10n="U" oldref="216">
-<item type="input">=CONVERT_ADD(10;"km";"mi") </item>returns, rounded to two decimal places, 6.21. 10 Kilometers equal 6.21 miles. The k is the permitted prefix character for the factor 10^3.</paragraph>
-</section>
-<section id="factdouble">
+         <paragraph xml-lang="en-US" id="par_id3143277" role="paragraph" l10n="U" oldref="203">Each unit of measure can be preceded by a prefix character from the following list:</paragraph>
+         <table id="tbl_id3144759">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="204">Permitted prefix characters</paragraph>
+               </tablecell>
+               <tablecell>
+</tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149490" role="tablecontent" l10n="U" oldref="205">10^(&lt;0)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149931" role="tablecontent" l10n="U" oldref="206">d, c, m, u, n, p, f, a, z, y</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149589" role="tablecontent" l10n="U" oldref="207">10^(&gt;0)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151248" role="tablecontent" l10n="U" oldref="208">e, h, k, M, G, T, P, E, Z, Y</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id0908200903061174" role="tablecontent" l10n="NEW">Information units "bit" and "byte" may also be prefixed by one of the following IEC 60027-2 / IEEE 1541 prefixes:</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id0908200903090966" role="code" l10n="NEW">ki kibi 1024</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903090958" role="code" l10n="NEW">Mi mebi 1048576</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903090936" role="code" l10n="NEW">Gi gibi 1073741824</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903090975" role="code" l10n="NEW">Ti tebi 1099511627776</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903090930" role="code" l10n="NEW">Pi pebi 1125899906842620</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903091070" role="code" l10n="NEW">Ei exbi 1152921504606850000</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903091097" role="code" l10n="NEW">Zi zebi 1180591620717410000000</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id0908200903091010" role="code" l10n="NEW">Yi yobi 1208925819614630000000000</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+         <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
+         <paragraph xml-lang="en-US" id="hd_id3146125" role="heading" level="3" l10n="U"
+                    oldref="209">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153695" role="code" l10n="U" oldref="210">CONVERT_ADD(Number; "FromUnit"; "ToUnit")</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147522" role="paragraph" l10n="U" oldref="211">
+            <emph>Number</emph> is the number to be converted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154472" role="paragraph" l10n="U" oldref="212">
+            <emph>FromUnit</emph> is the unit from which conversion is taking place.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153790" role="paragraph" l10n="U" oldref="213">
+            <emph>ToUnit</emph> is the unit to which conversion is taking place. Both units must be of the same type.</paragraph>
+<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3" l10n="U"
+                    oldref="214">Examples</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="215">
+            <item type="input">=CONVERT_ADD(10;"HP";"PS") </item>returns, rounded to two decimal places, 10.14. 10 HP equal 10.14 PS.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154834" role="paragraph" l10n="U" oldref="216">
+            <item type="input">=CONVERT_ADD(10;"km";"mi") </item>returns, rounded to two decimal places, 6.21. 10 kilometers equal 6.21 miles. The k is the permitted prefix character for the factor 10^3.</paragraph>
+      </section>
+      <section id="factdouble">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147096"><bookmark_value>FACTDOUBLE function</bookmark_value>
-<bookmark_value>factorials;numbers with increments of two</bookmark_value>
+         <bookmark_value>factorials;numbers with increments of two</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_FACTDOUBLE" id="bm_id3150950" localize="false"/>
-<paragraph role="heading" id="hd_id3147096" xml-lang="en-US" level="2" oldref="36">FACTDOUBLE</paragraph>
-<paragraph role="paragraph" id="par_id3151309" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="HID_AAI_FUNC_FACTDOUBLE">Returns the double factorial of a number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154666" xml-lang="en-US" level="3" l10n="U" oldref="38">Syntax</paragraph>
-<paragraph role="code" id="par_id3155121" xml-lang="en-US" l10n="U" oldref="39">FACTDOUBLE(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3158440" xml-lang="en-US" l10n="CHG" oldref="40">Returns <emph>Number</emph>
-<emph>!!</emph>, the double factorial of <emph>Number</emph>, where <emph>Number</emph> is an integer greater than or equal to zero.</paragraph>
-<paragraph role="paragraph" id="par_id2480849" xml-lang="en-US" l10n="NEW">For even numbers FACTDOUBLE(n) returns:</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="NEW">2*4*6*8* ... *n</paragraph>
-<paragraph role="paragraph" id="par_id2927335" xml-lang="en-US" l10n="NEW">For odd numbers FACTDOUBLE(n) returns:</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW">1*3*5*7* ... *n</paragraph>
-<paragraph role="paragraph" id="par_id4071779" xml-lang="en-US" l10n="NEW">FACTDOUBLE(0) returns 1 by definition.</paragraph>
-<paragraph role="heading" id="hd_id3154622" xml-lang="en-US" level="3" l10n="U" oldref="42">Example</paragraph>
-<paragraph role="paragraph" id="par_id7844477" xml-lang="en-US" l10n="NEW">
-<item type="input">=FACTDOUBLE(5)</item> returns 15.</paragraph>
-<paragraph role="paragraph" id="par_id3154116" xml-lang="en-US" l10n="U" oldref="43">
-<item type="input">=FACTDOUBLE(6)</item> returns 48.</paragraph>
-<paragraph role="paragraph" id="par_id6478469" xml-lang="en-US" l10n="NEW">
-<item type="input">=FACTDOUBLE(0)</item> returns 1.</paragraph><comment>see also FACT, MULTINOMIAL, PRODUCT  </comment>
+<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2" oldref="36">FACTDOUBLE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151309" role="paragraph" l10n="CHG" oldref="37"><ahelp hid="HID_AAI_FUNC_FACTDOUBLE">Returns the double factorial of a number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154666" role="heading" level="3" l10n="U"
+                    oldref="38">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155121" role="code" l10n="U" oldref="39">FACTDOUBLE(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158440" role="paragraph" l10n="CHG" oldref="40">Returns <emph>Number</emph>
+            <emph>!!</emph>, the double factorial of <emph>Number</emph>, where <emph>Number</emph> is an integer greater than or equal to zero.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2480849" role="paragraph" l10n="NEW">For even numbers FACTDOUBLE(n) returns:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW">2*4*6*8* ... *n</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2927335" role="paragraph" l10n="NEW">For odd numbers FACTDOUBLE(n) returns:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW">1*3*5*7* ... *n</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4071779" role="paragraph" l10n="NEW">FACTDOUBLE(0) returns 1 by definition.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154622" role="heading" level="3" l10n="U"
+                    oldref="42">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW">
+            <item type="input">=FACTDOUBLE(5)</item> returns 15.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154116" role="paragraph" l10n="U" oldref="43">
+            <item type="input">=FACTDOUBLE(6)</item> returns 48.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6478469" role="paragraph" l10n="NEW">
+            <item type="input">=FACTDOUBLE(0)</item> returns 1.</paragraph><comment>see also FACT, MULTINOMIAL, PRODUCT  </comment>
 </section>
 </sort>
 <section id="Section1">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060118.xhp b/helpcontent2/source/text/scalc/01/04060118.xhp
index 7225e15b9f..5983f5d76c 100644
--- a/helpcontent2/source/text/scalc/01/04060118.xhp
+++ b/helpcontent2/source/text/scalc/01/04060118.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060118.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <sort>
 <section id="oddfprice">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145112"><bookmark_value>ODDFPRICE function</bookmark_value>
-<bookmark_value>prices;securities with irregular first interest rate</bookmark_value>
+<bookmark_value>prices;securities with irregular first interest date</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDFPRICE" id="bm_id3146107" localize="false"/>
 <paragraph role="heading" id="hd_id3145112" xml-lang="en-US" level="2" oldref="71">ODDFPRICE</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060119.xhp b/helpcontent2/source/text/scalc/01/04060119.xhp
index e45bfe6211..50c064d520 100644
--- a/helpcontent2/source/text/scalc/01/04060119.xhp
+++ b/helpcontent2/source/text/scalc/01/04060119.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060119.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04060181.xhp b/helpcontent2/source/text/scalc/01/04060181.xhp
index ccf07edf3a..0aa55460b3 100755
--- a/helpcontent2/source/text/scalc/01/04060181.xhp
+++ b/helpcontent2/source/text/scalc/01/04060181.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060181.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,363 +32,426 @@
  
 	
 <meta>
-<topic id="textscalc0104060181xml" indexer="include">
-<title id="tit" xml-lang="en-US">Statistical Functions Part One</title>
-<filename>/text/scalc/01/04060181.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3146320" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="ae"><link href="text/scalc/01/04060181.xhp">Statistical Functions Part One</link>
+      <topic id="textscalc0104060181xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Statistical Functions Part One</title>
+         <filename>/text/scalc/01/04060181.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3146320" role="heading" level="1" l10n="U" oldref="1"><variable id="ae"><link href="text/scalc/01/04060181.xhp">Statistical Functions Part One</link>
 </variable></paragraph>
 <sort order="asc">
 <section id="intercept">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145632"><bookmark_value>INTERCEPT function</bookmark_value>
-<bookmark_value>points of intersection</bookmark_value>
-<bookmark_value>intersections</bookmark_value>
+         <bookmark_value>points of intersection</bookmark_value>
+         <bookmark_value>intersections</bookmark_value>
 </bookmark><comment>mw added two entries</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ACHSENABSCHNITT" id="bm_id3153018" localize="false"/>
-<paragraph role="heading" id="hd_id3145632" xml-lang="en-US" level="2" l10n="U" oldref="2">INTERCEPT</paragraph>
-<paragraph role="paragraph" id="par_id3146887" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_ACHSENABSCHNITT">Calculates the point at which a line will intersect the y-values by using known x-values and y-values.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150374" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
-<paragraph role="code" id="par_id3149718" xml-lang="en-US" l10n="U" oldref="5">INTERCEPT(DataY; DataX)</paragraph>
-<paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="U" oldref="6">
-<emph>DataY</emph> is the dependent set of observations or data.</paragraph>
-<paragraph role="paragraph" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="7">
-<emph>DataX</emph> is the independent set of observations or data.</paragraph>
-<paragraph role="paragraph" id="par_id3152983" xml-lang="en-US" l10n="U" oldref="8">Names, arrays or references containing numbers must be used here. Numbers can also be entered directly.</paragraph>
-<paragraph role="heading" id="hd_id3157906" xml-lang="en-US" level="3" l10n="U" oldref="9">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148728" xml-lang="en-US" l10n="U" oldref="10">To calculate the intercept, use cells D3:D9 as the y value and C3:C9 as the x value from the example spreadsheet. Input will be as follows:</paragraph>
-<paragraph role="paragraph" id="par_id3149013" xml-lang="en-US" l10n="U" oldref="11">
-<item type="input">=INTERCEPT(D3:D9;C3:C9)</item> = 2.15.</paragraph>
-</section>
-<section id="count">
+<paragraph xml-lang="en-US" id="hd_id3145632" role="heading" level="2" l10n="U" oldref="2">INTERCEPT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146887" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_FUNC_ACHSENABSCHNITT">Calculates the point at which a line will intersect the y-values by using known x-values and y-values.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150374" role="heading" level="3" l10n="U" oldref="4">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149718" role="code" l10n="U" oldref="5">INTERCEPT(DataY; DataX)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149947" role="paragraph" l10n="U" oldref="6">
+            <emph>DataY</emph> is the dependent set of observations or data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147412" role="paragraph" l10n="U" oldref="7">
+            <emph>DataX</emph> is the independent set of observations or data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152983" role="paragraph" l10n="U" oldref="8">Names, arrays or references containing numbers must be used here. Numbers can also be entered directly.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3157906" role="heading" level="3" l10n="U" oldref="9">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148728" role="paragraph" l10n="U" oldref="10">To calculate the intercept, use cells D3:D9 as the y value and C3:C9 as the x value from the example spreadsheet. Input will be as follows:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149013" role="paragraph" l10n="U" oldref="11">
+            <item type="input">=INTERCEPT(D3:D9;C3:C9)</item> = 2.15.</paragraph>
+      </section>
+      <section id="count">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148437"><bookmark_value>COUNT function</bookmark_value>
-<bookmark_value>numbers;counting</bookmark_value>
+         <bookmark_value>numbers;counting</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL" id="bm_id3153040" localize="false"/>
-<paragraph role="heading" id="hd_id3148437" xml-lang="en-US" level="2" l10n="U" oldref="13">COUNT</paragraph>
-<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_FUNC_ANZAHL">Counts how many numbers are in the list of arguments.</ahelp> Text entries are ignored.</paragraph>
-<paragraph role="heading" id="hd_id3153930" xml-lang="en-US" level="3" l10n="U" oldref="15">Syntax</paragraph>
-<paragraph role="code" id="par_id3148585" xml-lang="en-US" l10n="U" oldref="16">COUNT(Value1; Value2; ... Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3155827" xml-lang="en-US" l10n="CHG" oldref="17">
-<emph>Value1; Value2, ...</emph> are 1 to 30 values or ranges representing the values to be counted.</paragraph>
-<paragraph role="heading" id="hd_id3149254" xml-lang="en-US" level="3" l10n="U" oldref="18">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149953" xml-lang="en-US" l10n="U" oldref="19">The entries 2, 4, 6 and eight in the Value 1-4 fields are to be counted.</paragraph>
-<paragraph role="paragraph" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="20">
-<item type="input">=COUNT(2;4;6;"eight")</item> = 3. The count of numbers is therefore 3.</paragraph>
-</section>
-<section id="counta">
+<paragraph xml-lang="en-US" id="hd_id3148437" role="heading" level="2" l10n="U"
+                    oldref="13">COUNT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150700" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_FUNC_ANZAHL">Counts how many numbers are in the list of arguments.</ahelp> Text entries are ignored.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153930" role="heading" level="3" l10n="U"
+                    oldref="15">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148585" role="code" l10n="U" oldref="16">COUNT(Value1; Value2; ... Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155827" role="paragraph" l10n="CHG" oldref="17">
+            <emph>Value1; Value2, ...</emph> are 1 to 30 values or ranges representing the values to be counted.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149254" role="heading" level="3" l10n="U"
+                    oldref="18">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="U" oldref="19">The entries 2, 4, 6 and eight in the Value 1-4 fields are to be counted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154558" role="paragraph" l10n="U" oldref="20">
+            <item type="input">=COUNT(2;4;6;"eight")</item> = 3. The count of numbers is therefore 3.</paragraph>
+      </section>
+      <section id="counta">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149729"><bookmark_value>COUNTA function</bookmark_value>
-<bookmark_value>number of entries</bookmark_value>
+         <bookmark_value>number of entries</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL2" id="bm_id3148738" localize="false"/>
-<paragraph role="heading" id="hd_id3149729" xml-lang="en-US" level="2" l10n="U" oldref="22">COUNTA</paragraph>
-<paragraph role="paragraph" id="par_id3150142" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="HID_FUNC_ANZAHL2">Counts how many values are in the list of arguments.</ahelp> Text entries are also counted, even when they contain an empty string of length 0. If an argument is an array or reference, empty cells within the array or reference are ignored.<comment>UFI: fix to #i35888#</comment></paragraph>
-<paragraph role="heading" id="hd_id3148573" xml-lang="en-US" level="3" l10n="U" oldref="24">Syntax</paragraph>
-<paragraph role="code" id="par_id3153111" xml-lang="en-US" l10n="U" oldref="25">COUNTA(Value1; Value2; ... Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3150001" xml-lang="en-US" l10n="U" oldref="26">
-<emph>Value1; Value2, ...</emph> are 1 to 30 arguments representing the values to be counted.</paragraph>
-<paragraph role="heading" id="hd_id3150334" xml-lang="en-US" level="3" l10n="U" oldref="27">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154508" xml-lang="en-US" l10n="U" oldref="28">The entries 2, 4, 6 and eight in the Value 1-4 fields are to be counted.</paragraph>
-<paragraph role="paragraph" id="par_id3158000" xml-lang="en-US" l10n="U" oldref="29">
-<item type="input">=COUNTA(2;4;6;"eight")</item> = 4. The count of values is therefore 4.</paragraph>
-</section>
-<section id="b">
+<paragraph xml-lang="en-US" id="hd_id3149729" role="heading" level="2" l10n="U"
+                    oldref="22">COUNTA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150142" role="paragraph" l10n="CHG" oldref="23"><ahelp hid="HID_FUNC_ANZAHL2">Counts how many values are in the list of arguments.</ahelp> Text entries are also counted, even when they contain an empty string of length 0. If an argument is an array or reference, empty cells within the array or reference are ignored.<comment>UFI: fix to #i35888#</comment></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148573" role="heading" level="3" l10n="U"
+                    oldref="24">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153111" role="code" l10n="U" oldref="25">COUNTA(Value1; Value2; ... Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150001" role="paragraph" l10n="U" oldref="26">
+            <emph>Value1; Value2, ...</emph> are 1 to 30 arguments representing the values to be counted.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150334" role="heading" level="3" l10n="U"
+                    oldref="27">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154508" role="paragraph" l10n="U" oldref="28">The entries 2, 4, 6 and eight in the Value 1-4 fields are to be counted.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158000" role="paragraph" l10n="U" oldref="29">
+            <item type="input">=COUNTA(2;4;6;"eight")</item> = 4. The count of values is therefore 4.</paragraph>
+      </section>
+      <section id="b">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150267"><bookmark_value>B function</bookmark_value>
-<bookmark_value>probabilities of samples with binomial distribution</bookmark_value>
+         <bookmark_value>probabilities of samples with binomial distribution</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_B" id="bm_id3153044" localize="false"/>
-<paragraph role="heading" id="hd_id3150267" xml-lang="en-US" level="2" l10n="U" oldref="31">B</paragraph>
-<paragraph role="paragraph" id="par_id3156061" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_FUNC_B">Returns the probability of a sample with binomial distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150659" xml-lang="en-US" level="3" l10n="U" oldref="33">Syntax</paragraph>
-<paragraph role="code" id="par_id3148392" xml-lang="en-US" l10n="U" oldref="34">B(Trials; SP; T1; T2)</paragraph>
-<paragraph role="paragraph" id="par_id3149002" xml-lang="en-US" l10n="U" oldref="35">
-<emph>Trials</emph> is the number of independent trials.</paragraph>
-<paragraph role="paragraph" id="par_id3148875" xml-lang="en-US" l10n="U" oldref="36">
-<emph>SP</emph> is the probability of success on each trial.</paragraph>
-<paragraph role="paragraph" id="par_id3145352" xml-lang="en-US" l10n="U" oldref="37">
-<emph>T1</emph> defines the lower limit for the number of trials.</paragraph>
-<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="38">
-<emph>T2</emph> (optional) defines the upper limit for the number of trials.</paragraph>
-<paragraph role="heading" id="hd_id3148768" xml-lang="en-US" level="3" l10n="U" oldref="39">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154633" xml-lang="en-US" l10n="U" oldref="40">What is the probability with ten throws of the dice, that a six will come up exactly twice? The probability of a six (or any other number) is 1/6. The following formula combines these factors:</paragraph>
-<paragraph role="paragraph" id="par_id3149393" xml-lang="en-US" l10n="U" oldref="41">
-<item type="input">=B(10;1/6;2)</item> returns a probability of 29%.</paragraph>
-</section>
-<section id="rsq">
+<paragraph xml-lang="en-US" id="hd_id3150267" role="heading" level="2" l10n="U"
+                    oldref="31">B</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156061" role="paragraph" l10n="U" oldref="32"><ahelp hid="HID_FUNC_B">Returns the probability of a sample with binomial distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150659" role="heading" level="3" l10n="U"
+                    oldref="33">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148392" role="code" l10n="U" oldref="34">B(Trials; SP; T1; T2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149002" role="paragraph" l10n="U" oldref="35">
+            <emph>Trials</emph> is the number of independent trials.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148875" role="paragraph" l10n="U" oldref="36">
+            <emph>SP</emph> is the probability of success on each trial.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145352" role="paragraph" l10n="U" oldref="37">
+            <emph>T1</emph> defines the lower limit for the number of trials.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149538" role="paragraph" l10n="U" oldref="38">
+            <emph>T2</emph> (optional) defines the upper limit for the number of trials.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148768" role="heading" level="3" l10n="U"
+                    oldref="39">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154633" role="paragraph" l10n="U" oldref="40">What is the probability with ten throws of the dice, that a six will come up exactly twice? The probability of a six (or any other number) is 1/6. The following formula combines these factors:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149393" role="paragraph" l10n="U" oldref="41">
+            <item type="input">=B(10;1/6;2)</item> returns a probability of 29%.</paragraph>
+      </section>
+      <section id="rsq">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158416"><bookmark_value>RSQ function</bookmark_value>
-<bookmark_value>determination coefficients</bookmark_value>
-<bookmark_value>regression analysis</bookmark_value>
+         <bookmark_value>determination coefficients</bookmark_value>
+         <bookmark_value>regression analysis</bookmark_value>
 </bookmark><comment>mw added regression analysis</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BESTIMMTHEITSMASS" id="bm_id3153228" localize="false"/>
-<paragraph role="heading" id="hd_id3158416" xml-lang="en-US" level="2" l10n="U" oldref="43">RSQ</paragraph>
-<paragraph role="paragraph" id="par_id3154949" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_FUNC_BESTIMMTHEITSMASS">Returns the square of the Pearson correlation coefficient based on the given values.</ahelp> RSQ (also called determination coefficient) is a measure for the accuracy of an adjustment and can be used to produce a regression analysis.</paragraph>
-<paragraph role="heading" id="hd_id3152820" xml-lang="en-US" level="3" l10n="U" oldref="45">Syntax</paragraph>
-<paragraph role="code" id="par_id3155822" xml-lang="en-US" l10n="U" oldref="46">RSQ(DataY; DataX)</paragraph>
-<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="47">
-<emph>DataY</emph> is an array or range of data points.</paragraph>
-<paragraph role="paragraph" id="par_id3153181" xml-lang="en-US" l10n="U" oldref="48">
-<emph>DataX</emph> is an array or range of data points.</paragraph>
-<paragraph role="heading" id="hd_id3156258" xml-lang="en-US" level="3" l10n="U" oldref="49">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155991" xml-lang="en-US" l10n="U" oldref="50">
-<item type="input">=RSQ(A1:A20;B1:B20)</item> calculates the correlation coefficient for both data sets in columns A and B.</paragraph>
-</section>
-<section id="betainv">
+<paragraph xml-lang="en-US" id="hd_id3158416" role="heading" level="2" l10n="U"
+                    oldref="43">RSQ</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154949" role="paragraph" l10n="U" oldref="44"><ahelp hid="HID_FUNC_BESTIMMTHEITSMASS">Returns the square of the Pearson correlation coefficient based on the given values.</ahelp> RSQ (also called determination coefficient) is a measure for the accuracy of an adjustment and can be used to produce a regression analysis.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152820" role="heading" level="3" l10n="U"
+                    oldref="45">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155822" role="code" l10n="U" oldref="46">RSQ(DataY; DataX)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150470" role="paragraph" l10n="U" oldref="47">
+            <emph>DataY</emph> is an array or range of data points.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153181" role="paragraph" l10n="U" oldref="48">
+            <emph>DataX</emph> is an array or range of data points.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156258" role="heading" level="3" l10n="U"
+                    oldref="49">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155991" role="paragraph" l10n="U" oldref="50">
+            <item type="input">=RSQ(A1:A20;B1:B20)</item> calculates the determination coefficient for both data sets in columns A and B.</paragraph>
+      </section>
+      <section id="betainv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145620"><bookmark_value>BETAINV function</bookmark_value>
-<bookmark_value>cumulative probability density function;inverse of</bookmark_value>
+         <bookmark_value>cumulative probability density function;inverse of</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAINV" id="bm_id3146154" localize="false"/>
-<paragraph role="heading" id="hd_id3145620" xml-lang="en-US" level="2" l10n="U" oldref="52">BETAINV</paragraph>
-<paragraph role="paragraph" id="par_id3149825" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_FUNC_BETAINV">Returns the inverse of the cumulative beta probability density function.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152479" xml-lang="en-US" level="3" l10n="U" oldref="54">Syntax</paragraph>
-<paragraph role="code" id="par_id3156300" xml-lang="en-US" l10n="U" oldref="55">BETAINV(Number; Alpha; Beta; Start; End)</paragraph>
-<paragraph role="paragraph" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="56">
-<emph>Number</emph> is the value between <emph>Start</emph> and <emph>End</emph> at which to evaluate the function.</paragraph>
-<paragraph role="paragraph" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="57">
-<emph>Alpha</emph> is a parameter to the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3156306" xml-lang="en-US" l10n="U" oldref="58">
-<emph>Beta</emph> is a parameter to the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="U" oldref="59">
-<emph>Start</emph> (optional) is the lower bound for <emph>Number</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="60">
-<emph>End</emph> (optional) is the upper bound for <emph>Number</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN109DF" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3147077" xml-lang="en-US" level="3" l10n="U" oldref="61">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146859" xml-lang="en-US" l10n="U" oldref="62">
-<item type="input">=BETAINV(0.5;5;10)</item> returns the value 0.33.</paragraph>
-</section>
-<section id="betadist">
+<paragraph xml-lang="en-US" id="hd_id3145620" role="heading" level="2" l10n="U"
+                    oldref="52">BETAINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_FUNC_BETAINV">Returns the inverse of the cumulative beta probability density function.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152479" role="heading" level="3" l10n="U"
+                    oldref="54">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156300" role="code" l10n="U" oldref="55">BETAINV(Number; Alpha; Beta; Start; End)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149266" role="paragraph" l10n="U" oldref="56">
+            <emph>Number</emph> is the value between <emph>Start</emph> and <emph>End</emph> at which to evaluate the function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149710" role="paragraph" l10n="U" oldref="57">
+            <emph>Alpha</emph> is a parameter to the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156306" role="paragraph" l10n="U" oldref="58">
+            <emph>Beta</emph> is a parameter to the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150960" role="paragraph" l10n="U" oldref="59">
+            <emph>Start</emph> (optional) is the lower bound for <emph>Number</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151268" role="paragraph" l10n="U" oldref="60">
+            <emph>End</emph> (optional) is the upper bound for <emph>Number</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN109DF" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147077" role="heading" level="3" l10n="U"
+                    oldref="61">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146859" role="paragraph" l10n="U" oldref="62">
+            <item type="input">=BETAINV(0.5;5;10)</item> returns the value 0.33.</paragraph>
+      </section>
+      <section id="betadist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156096"><bookmark_value>BETADIST function</bookmark_value>
-<bookmark_value>cumulative probability density function;calculating</bookmark_value>
+         <bookmark_value>cumulative probability density function;calculating</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAVERT" id="bm_id3153213" localize="false"/>
-<paragraph role="heading" id="hd_id3156096" xml-lang="en-US" level="2" l10n="U" oldref="64">BETADIST</paragraph>
-<paragraph role="paragraph" id="par_id3150880" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="HID_FUNC_BETAVERT">Returns the cumulative beta probability density function.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150762" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
-<paragraph role="code" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="67">BETADIST(Number; Alpha; Beta; Start; End)</paragraph>
-<paragraph role="paragraph" id="par_id3156317" xml-lang="en-US" l10n="U" oldref="68">
-<emph>Number</emph> is the value between <emph>Start</emph> and <emph>End</emph> at which to evaluate the function.</paragraph>
-<paragraph role="paragraph" id="par_id3156107" xml-lang="en-US" l10n="U" oldref="69">
-<emph>Alpha</emph> is a parameter to the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3153619" xml-lang="en-US" l10n="U" oldref="70">
-<emph>Beta</emph> is a parameter to the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="71">
-<emph>Start</emph> (optional) is the lower bound for <emph>Number</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149138" xml-lang="en-US" l10n="U" oldref="72">
-<emph>End</emph> (optional) is the upper bound for <emph>Number</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB3" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
-<paragraph role="heading" id="hd_id3145649" xml-lang="en-US" level="3" l10n="U" oldref="73">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156118" xml-lang="en-US" l10n="U" oldref="74">
-<item type="input">=BETADIST(0.75;3;4)</item> returns the value 0.96</paragraph>
-</section>
-<section id="binomdist">
+<paragraph xml-lang="en-US" id="hd_id3156096" role="heading" level="2" l10n="U"
+                    oldref="64">BETADIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150880" role="paragraph" l10n="U" oldref="65"><ahelp hid="HID_FUNC_BETAVERT">Returns the beta function.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150762" role="heading" level="3" l10n="U"
+                    oldref="66">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147571" role="code" l10n="CHG" oldref="67">BETADIST(Number; Alpha; Beta; Start; End; Cumulative)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156317" role="paragraph" l10n="U" oldref="68">
+            <emph>Number</emph> is the value between <emph>Start</emph> and <emph>End</emph> at which to evaluate the function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156107" role="paragraph" l10n="U" oldref="69">
+            <emph>Alpha</emph> is a parameter to the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153619" role="paragraph" l10n="U" oldref="70">
+            <emph>Beta</emph> is a parameter to the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="71">
+            <emph>Start</emph> (optional) is the lower bound for <emph>Number</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149138" role="paragraph" l10n="U" oldref="72">
+            <emph>End</emph> (optional) is the upper bound for <emph>Number</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id012020091254453" role="paragraph" l10n="NEW">
+            <emph>Cumulative</emph> (optional) can be 0 or False to calculate the probability density function. It can be any other value or True or omitted to calculate the cumulative distribution function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10AB3" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145649" role="heading" level="3" l10n="U"
+                    oldref="73">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156118" role="paragraph" l10n="U" oldref="74">
+            <item type="input">=BETADIST(0.75;3;4)</item> returns the value 0.96</paragraph>
+      </section>
+      <section id="binomdist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143228"><bookmark_value>BINOMDIST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_BINOMVERT" id="bm_id3150146" localize="false"/>
-<paragraph role="heading" id="hd_id3143228" xml-lang="en-US" level="2" l10n="U" oldref="76">BINOMDIST</paragraph>
-<paragraph role="paragraph" id="par_id3146897" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_BINOMVERT">Returns the individual term binomial distribution probability.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149289" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
-<paragraph role="code" id="par_id3156009" xml-lang="en-US" l10n="U" oldref="79">BINOMDIST(X; Trials; SP; C)</paragraph>
-<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="80">
-<emph>X</emph> is the number of successes in a set of trials.</paragraph>
-<paragraph role="paragraph" id="par_id3147492" xml-lang="en-US" l10n="U" oldref="81">
-<emph>Trials</emph> is the number of independent trials.</paragraph>
-<paragraph role="paragraph" id="par_id3146085" xml-lang="en-US" l10n="U" oldref="82">
-<emph>SP</emph> is the probability of success on each trial.</paragraph>
-<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="83">
-<emph>C</emph> = 0 calculates the probability of a single event and <emph>C</emph> = 1 calculates the cumulative probability.</paragraph>
-<paragraph role="heading" id="hd_id3151171" xml-lang="en-US" level="3" l10n="U" oldref="84">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="U" oldref="85">
-<item type="input">=BINOMDIST(A1;12;0.5;0)</item> shows (if the values <item type="input">0</item> to <item type="input">12</item> are entered in A1) the probabilities for 12 flips of a coin that <emph>Heads</emph> will come up exactly the number of times entered in A1.</paragraph>
-<paragraph role="paragraph" id="par_id3150120" xml-lang="en-US" l10n="U" oldref="86">
-<item type="input">=BINOMDIST(A1;12;0.5;1)</item> shows the cumulative probabilities for the same series. For example, if A1 = <item type="input">4</item>, the cumulative probability of the series is 0, 1, 2, 3 or 4 times <emph>Heads</emph> (non-exclusive OR).</paragraph>
-</section>
-<section id="chiinv">
+<paragraph xml-lang="en-US" id="hd_id3143228" role="heading" level="2" l10n="U"
+                    oldref="76">BINOMDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146897" role="paragraph" l10n="U" oldref="77"><ahelp hid="HID_FUNC_BINOMVERT">Returns the individual term binomial distribution probability.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149289" role="heading" level="3" l10n="U"
+                    oldref="78">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156009" role="code" l10n="U" oldref="79">BINOMDIST(X; Trials; SP; C)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="80">
+            <emph>X</emph> is the number of successes in a set of trials.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147492" role="paragraph" l10n="U" oldref="81">
+            <emph>Trials</emph> is the number of independent trials.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146085" role="paragraph" l10n="U" oldref="82">
+            <emph>SP</emph> is the probability of success on each trial.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="U" oldref="83">
+            <emph>C</emph> = 0 calculates the probability of a single event and <emph>C</emph> = 1 calculates the cumulative probability.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151171" role="heading" level="3" l10n="U"
+                    oldref="84">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145666" role="paragraph" l10n="U" oldref="85">
+            <item type="input">=BINOMDIST(A1;12;0.5;0)</item> shows (if the values <item type="input">0</item> to <item type="input">12</item> are entered in A1) the probabilities for 12 flips of a coin that <emph>Heads</emph> will come up exactly the number of times entered in A1.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150120" role="paragraph" l10n="U" oldref="86">
+            <item type="input">=BINOMDIST(A1;12;0.5;1)</item> shows the cumulative probabilities for the same series. For example, if A1 = <item type="input">4</item>, the cumulative probability of the series is 0, 1, 2, 3 or 4 times <emph>Heads</emph> (non-exclusive OR).</paragraph>
+      </section>
+      <section id="chisqinv">
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHISQINV" id="bm_id0119200902430717" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0119200902432928"><bookmark_value>CHISQINV function</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0119200902421451" role="heading" level="2" l10n="NEW">CHISQINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902421449" role="paragraph" l10n="NEW"><ahelp hid=".">Returns the inverse of CHISQDIST.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0119200902475241" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902475286" role="paragraph" l10n="NEW">
+            <emph>Probability</emph> is the probability value for which the inverse of the chi-square distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902475282" role="paragraph" l10n="NEW">
+            <emph>Degrees Of Freedom</emph> is the degrees of freedom for the chi-square function.</paragraph>
+      </section>
+      <section id="chiinv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148835"><bookmark_value>CHIINV function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIINV" id="bm_id3148823" localize="false"/>
-<paragraph role="heading" id="hd_id3148835" xml-lang="en-US" level="2" l10n="U" oldref="88">CHIINV</paragraph>
-<paragraph role="paragraph" id="par_id3149906" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_CHIINV">Returns the inverse of the one-tailed probability of the chi-squared distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159157" xml-lang="en-US" level="3" l10n="U" oldref="90">Syntax</paragraph>
-<paragraph role="code" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="91">CHIINV(Number; DegreesFreedom)</paragraph>
-<paragraph role="paragraph" id="par_id3154898" xml-lang="en-US" l10n="U" oldref="92">
-<emph>Number</emph> is the value of the error probability.</paragraph>
-<paragraph role="paragraph" id="par_id3154294" xml-lang="en-US" l10n="U" oldref="93">
-<emph>DegreesFreedom</emph> is the degrees of freedom of the experiment.</paragraph>
-<paragraph role="heading" id="hd_id3154208" xml-lang="en-US" level="3" l10n="U" oldref="94">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150777" xml-lang="en-US" l10n="U" oldref="130">A die is thrown 1020 times. The numbers on the die 1 through 6 come up 195, 151, 148, 189, 183 and 154 times (observation values). The hypothesis that the die is not fixed is to be tested.</paragraph>
-<paragraph role="paragraph" id="par_id3153062" xml-lang="en-US" l10n="U" oldref="131">The Chi square distribution of the random sample is determined by the formula given above. Since the expected value for a given number on the die for n throws is n times 1/6, thus 1020/6 = 170, the formula returns a Chi square value of 13.27.</paragraph>
-<paragraph role="paragraph" id="par_id3148806" xml-lang="en-US" l10n="U" oldref="132">If the (observed) Chi square is greater than or equal to the (theoretical) Chi square CHIINV, the hypothesis will be discarded, since the deviation between theory and experiment is too great. If the observed Chi square is less that CHIINV, the hypothesis is confirmed with the indicated probability of error.</paragraph>
-<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="95">
-<item type="input">=CHIINV(0.05;5)</item> returns 11.07.</paragraph>
-<paragraph role="paragraph" id="par_id3159142" xml-lang="en-US" l10n="U" oldref="133">
-<item type="input">=CHIINV(0.02;5)</item> returns 13.39.</paragraph>
-<paragraph role="paragraph" id="par_id3158401" xml-lang="en-US" l10n="U" oldref="134">If the probability of error is 5%, the die is not true. If the probability of error is 2%, there is no reason to believe it is fixed.</paragraph>
-</section>
-<section id="chitest">
+<paragraph xml-lang="en-US" id="hd_id3148835" role="heading" level="2" l10n="U"
+                    oldref="88">CHIINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149906" role="paragraph" l10n="U" oldref="89"><ahelp hid="HID_FUNC_CHIINV">Returns the inverse of the one-tailed probability of the chi-squared distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159157" role="heading" level="3" l10n="U"
+                    oldref="90">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150504" role="code" l10n="U" oldref="91">CHIINV(Number; DegreesFreedom)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154898" role="paragraph" l10n="U" oldref="92">
+            <emph>Number</emph> is the value of the error probability.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154294" role="paragraph" l10n="U" oldref="93">
+            <emph>DegreesFreedom</emph> is the degrees of freedom of the experiment.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154208" role="heading" level="3" l10n="U"
+                    oldref="94">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150777" role="paragraph" l10n="U" oldref="130">A die is thrown 1020 times. The numbers on the die 1 through 6 come up 195, 151, 148, 189, 183 and 154 times (observation values). The hypothesis that the die is not fixed is to be tested.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153062" role="paragraph" l10n="U" oldref="131">The Chi square distribution of the random sample is determined by the formula given above. Since the expected value for a given number on the die for n throws is n times 1/6, thus 1020/6 = 170, the formula returns a Chi square value of 13.27.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148806" role="paragraph" l10n="U" oldref="132">If the (observed) Chi square is greater than or equal to the (theoretical) Chi square CHIINV, the hypothesis will be discarded, since the deviation between theory and experiment is too great. If the observed Chi square is less that CHIINV, the hypothesis is confirmed with the indicated probability of error.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149763" role="paragraph" l10n="U" oldref="95">
+            <item type="input">=CHIINV(0.05;5)</item> returns 11.07.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159142" role="paragraph" l10n="U" oldref="133">
+            <item type="input">=CHIINV(0.02;5)</item> returns 13.39.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158401" role="paragraph" l10n="U" oldref="134">If the probability of error is 5%, the die is not true. If the probability of error is 2%, there is no reason to believe it is fixed.</paragraph>
+      </section>
+      <section id="chitest">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154260"><bookmark_value>CHITEST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHITEST" id="bm_id3155355" localize="false"/>
-<paragraph role="heading" id="hd_id3154260" xml-lang="en-US" level="2" l10n="U" oldref="97">CHITEST</paragraph>
-<paragraph role="paragraph" id="par_id3151052" xml-lang="en-US" l10n="U" oldref="98"><ahelp hid="HID_FUNC_CHITEST">Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence.</ahelp> CHITEST returns the chi-squared distribution of the data.</paragraph>
-<paragraph role="paragraph" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="135">The probability determined by CHITEST can also be determined with CHIDIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row.</paragraph>
-<paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="3" l10n="U" oldref="99">Syntax</paragraph>
-<paragraph role="code" id="par_id3149162" xml-lang="en-US" l10n="U" oldref="100">CHITEST(DataB; DataE)</paragraph>
-<paragraph role="paragraph" id="par_id3158421" xml-lang="en-US" l10n="U" oldref="101">
-<emph>DataB</emph> is the array of the observations.</paragraph>
-<paragraph role="paragraph" id="par_id3166453" xml-lang="en-US" l10n="U" oldref="102">
-<emph>DataE</emph> is the range of the expected values.</paragraph>
-<paragraph role="heading" id="hd_id3146946" xml-lang="en-US" level="3" l10n="U" oldref="103">Example</paragraph>
-<table id="tbl_id3153233">
-<tablerow>
-<tablecell>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="136">Data_B (observed)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152948" xml-lang="en-US" l10n="U" oldref="137">Data_E (expected)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="U" oldref="138">1</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159279" xml-lang="en-US" l10n="U" oldref="139">
-<item type="input">195</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="140">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="U" oldref="141">2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148621" xml-lang="en-US" l10n="U" oldref="142">
-<item type="input">151</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148987" xml-lang="en-US" l10n="U" oldref="143">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149417" xml-lang="en-US" l10n="U" oldref="144">3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148661" xml-lang="en-US" l10n="U" oldref="145">
-<item type="input">148</item>
-</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154260" role="heading" level="2" l10n="U"
+                    oldref="97">CHITEST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151052" role="paragraph" l10n="U" oldref="98"><ahelp hid="HID_FUNC_CHITEST">Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence.</ahelp> CHITEST returns the chi-squared distribution of the data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148925" role="paragraph" l10n="U" oldref="135">The probability determined by CHITEST can also be determined with CHIDIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154280" role="heading" level="3" l10n="U"
+                    oldref="99">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149162" role="code" l10n="U" oldref="100">CHITEST(DataB; DataE)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158421" role="paragraph" l10n="U" oldref="101">
+            <emph>DataB</emph> is the array of the observations.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166453" role="paragraph" l10n="U" oldref="102">
+            <emph>DataE</emph> is the range of the expected values.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146946" role="heading" level="3" l10n="U"
+                    oldref="103">Example</paragraph>
+         <table id="tbl_id3153233">
+            <tablerow>
+               <tablecell>
 </tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151128" xml-lang="en-US" l10n="U" oldref="146">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148467" xml-lang="en-US" l10n="U" oldref="147">4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="148">
-<item type="input">189</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145304" xml-lang="en-US" l10n="U" oldref="149">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149927" xml-lang="en-US" l10n="U" oldref="150">5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150630" xml-lang="en-US" l10n="U" oldref="151">
-<item type="input">183</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150423" xml-lang="en-US" l10n="U" oldref="152">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="153">6</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="154">
-<item type="input">154</item>
-</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="155">
-<item type="input">170</item>
-</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154096" role="paragraph" l10n="U" oldref="136">Data_B (observed)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152948" role="paragraph" l10n="U" oldref="137">Data_E (expected)</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152876" role="paragraph" l10n="U" oldref="138">1</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159279" role="paragraph" l10n="U" oldref="139">
+                     <item type="input">195</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U" oldref="140">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149922" role="paragraph" l10n="U" oldref="141">2</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148621" role="paragraph" l10n="U" oldref="142">
+                     <item type="input">151</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148987" role="paragraph" l10n="U" oldref="143">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149417" role="paragraph" l10n="U" oldref="144">3</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148661" role="paragraph" l10n="U" oldref="145">
+                     <item type="input">148</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151128" role="paragraph" l10n="U" oldref="146">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148467" role="paragraph" l10n="U" oldref="147">4</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149237" role="paragraph" l10n="U" oldref="148">
+                     <item type="input">189</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145304" role="paragraph" l10n="U" oldref="149">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149927" role="paragraph" l10n="U" oldref="150">5</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="151">
+                     <item type="input">183</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150423" role="paragraph" l10n="U" oldref="152">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3143275" role="paragraph" l10n="U" oldref="153">6</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3144750" role="paragraph" l10n="U" oldref="154">
+                     <item type="input">154</item>
+                  </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="155">
+                     <item type="input">170</item>
+                  </paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="104">
-<item type="input">=CHITEST(A1:A6;B1:B6)</item> equals 0.02. This is the probability which suffices the observed data of the theoretical Chi-square distribution.</paragraph>
-</section>
-<section id="chidist">
+         <paragraph xml-lang="en-US" id="par_id3149481" role="paragraph" l10n="U" oldref="104">
+            <item type="input">=CHITEST(A1:A6;B1:B6)</item> equals 0.02. This is the probability which suffices the observed data of the theoretical Chi-square distribution.</paragraph>
+      </section>
+      <section id="chidist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148690"><bookmark_value>CHIDIST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIVERT" id="bm_id3147521" localize="false"/>
-<paragraph role="heading" id="hd_id3148690" xml-lang="en-US" level="2" l10n="U" oldref="106">CHIDIST</paragraph>
-<paragraph role="paragraph" id="par_id3156338" xml-lang="en-US" l10n="U" oldref="156"><ahelp hid="HID_FUNC_CHIVERT">Returns the probability value from the indicated Chi square that a hypothesis is confirmed.</ahelp> CHIDIST compares the Chi square value to be given for a random sample that is calculated from the sum of (observed value-expected value)^2/expected value for all values with the theoretical Chi square distribution and determines from this the probability of error for the hypothesis to be tested.</paragraph>
-<paragraph role="paragraph" id="par_id3151316" xml-lang="en-US" l10n="U" oldref="157">The probability determined by CHIDIST can also be determined by CHITEST.</paragraph>
-<paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="3" l10n="U" oldref="108">Syntax</paragraph>
-<paragraph role="code" id="par_id3158439" xml-lang="en-US" l10n="U" oldref="109">CHIDIST(Number; DegreesFreedom)</paragraph>
-<paragraph role="paragraph" id="par_id3148675" xml-lang="en-US" l10n="U" oldref="110">
-<emph>Number</emph> is the chi-square value of the random sample used to determine the error probability.</paragraph>
-<paragraph role="paragraph" id="par_id3155615" xml-lang="en-US" l10n="U" oldref="111">
-<emph>DegreesFreedom</emph> are the degrees of freedom of the experiment.</paragraph>
-<paragraph role="heading" id="hd_id3146787" xml-lang="en-US" level="3" l10n="U" oldref="112">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145774" xml-lang="en-US" l10n="U" oldref="113">
-<item type="input">=CHIDIST(13.27; 5)</item> equals 0.02.</paragraph>
-<paragraph role="paragraph" id="par_id3156141" xml-lang="en-US" l10n="U" oldref="158">If the Chi square value of the random sample is 13.27 and if the experiment has 5 degrees of freedom, then the hypothesis is assured with a probability of error of 2%.</paragraph>
-</section>
-<section id="expondist">
+<paragraph xml-lang="en-US" id="hd_id3148690" role="heading" level="2" l10n="U"
+                    oldref="106">CHIDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156338" role="paragraph" l10n="U" oldref="156"><ahelp hid="HID_FUNC_CHIVERT">Returns the probability value from the indicated Chi square that a hypothesis is confirmed.</ahelp> CHIDIST compares the Chi square value to be given for a random sample that is calculated from the sum of (observed value-expected value)^2/expected value for all values with the theoretical Chi square distribution and determines from this the probability of error for the hypothesis to be tested.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151316" role="paragraph" l10n="U" oldref="157">The probability determined by CHIDIST can also be determined by CHITEST.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155123" role="heading" level="3" l10n="U"
+                    oldref="108">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158439" role="code" l10n="U" oldref="109">CHIDIST(Number; DegreesFreedom)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148675" role="paragraph" l10n="U" oldref="110">
+            <emph>Number</emph> is the chi-square value of the random sample used to determine the error probability.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155615" role="paragraph" l10n="U" oldref="111">
+            <emph>DegreesFreedom</emph> are the degrees of freedom of the experiment.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146787" role="heading" level="3" l10n="U"
+                    oldref="112">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145774" role="paragraph" l10n="U" oldref="113">
+            <item type="input">=CHIDIST(13.27; 5)</item> equals 0.02.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156141" role="paragraph" l10n="U" oldref="158">If the Chi square value of the random sample is 13.27 and if the experiment has 5 degrees of freedom, then the hypothesis is assured with a probability of error of 2%.</paragraph>
+      </section>
+      <section id="chisqdist">
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHISQDIST" id="bm_id0119200902213671" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0119200902231887"><bookmark_value>CHISQDIST function</bookmark_value>
+<bookmark_value>chi-square distribution</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0119200901583452" role="heading" level="2" l10n="NEW">CHISQDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200901583471" role="paragraph" l10n="NEW"><ahelp hid=".">Returns the value of the probability density function or the cumulative distribution function for the chi-square distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0119200902395520" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902395679" role="code" l10n="NEW">CHISQDIST(Number; Degrees Of Freedom; Cumulative)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id011920090239564" role="paragraph" l10n="NEW">
+            <emph>Number</emph> is the number for which the function is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902395660" role="paragraph" l10n="NEW">
+            <emph>Degrees Of Freedom</emph> is the degrees of freedom for the chi-square function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200902395623" role="paragraph" l10n="NEW">
+            <emph>Cumulative</emph> (optional): 0 or False calculates the probability density function. Other values or True or omitted calculates the cumulative distribution function.</paragraph>
+      </section>
+      <section id="expondist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150603"><bookmark_value>EXPONDIST function</bookmark_value>
-<bookmark_value>exponential distributions</bookmark_value>
+         <bookmark_value>exponential distributions</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_EXPONVERT" id="bm_id3152962" localize="false"/>
-<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="2" l10n="U" oldref="115">EXPONDIST</paragraph>
-<paragraph role="paragraph" id="par_id3149563" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_FUNC_EXPONVERT">Returns the exponential distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153789" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
-<paragraph role="code" id="par_id3150987" xml-lang="en-US" l10n="U" oldref="118">EXPONDIST(Number; Lambda; C)</paragraph>
-<paragraph role="paragraph" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="119">
-<emph>Number</emph> is the value of the function.</paragraph>
-<paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="U" oldref="120">
-<emph>Lambda</emph> is the parameter value.</paragraph><comment>UFI removed a double bookmark</comment>
-<paragraph role="paragraph" id="par_id3147332" xml-lang="en-US" l10n="U" oldref="121">
-<emph>C</emph> is a logical value that determines the form of the function. <emph>C = 0</emph> calculates the density function, and <emph>C = 1</emph> calculates the distribution.</paragraph>
-<paragraph role="heading" id="hd_id3146133" xml-lang="en-US" level="3" l10n="U" oldref="122">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150357" xml-lang="en-US" l10n="U" oldref="123">
-<item type="input">=EXPONDIST(3;0.5;1)</item> returns 0.78.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150603" role="heading" level="2" l10n="U"
+                    oldref="115">EXPONDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149563" role="paragraph" l10n="U" oldref="116"><ahelp hid="HID_FUNC_EXPONVERT">Returns the exponential distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153789" role="heading" level="3" l10n="U"
+                    oldref="117">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150987" role="code" l10n="U" oldref="118">EXPONDIST(Number; Lambda; C)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154663" role="paragraph" l10n="U" oldref="119">
+            <emph>Number</emph> is the value of the function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154569" role="paragraph" l10n="U" oldref="120">
+            <emph>Lambda</emph> is the parameter value.</paragraph><comment>UFI removed a double bookmark</comment>
+<paragraph xml-lang="en-US" id="par_id3147332" role="paragraph" l10n="U" oldref="121">
+            <emph>C</emph> is a logical value that determines the form of the function. <emph>C = 0</emph> calculates the density function, and <emph>C = 1</emph> calculates the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146133" role="heading" level="3" l10n="U"
+                    oldref="122">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150357" role="paragraph" l10n="U" oldref="123">
+            <item type="input">=EXPONDIST(3;0.5;1)</item> returns 0.78.</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060182.xhp b/helpcontent2/source/text/scalc/01/04060182.xhp
index 57aa859d47..c895f6e288 100755
--- a/helpcontent2/source/text/scalc/01/04060182.xhp
+++ b/helpcontent2/source/text/scalc/01/04060182.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060182.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,257 +32,304 @@
  
 	
 <meta>
-<topic id="textscalc0104060182xml" indexer="include">
-<title id="tit" xml-lang="en-US">Statistical Functions Part Two</title>
-<filename>/text/scalc/01/04060182.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3154372" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="fh"><link href="text/scalc/01/04060182.xhp" name="Statistical Functions Part Two">Statistical Functions Part Two</link>
+      <topic id="textscalc0104060182xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Statistical Functions Part Two</title>
+         <filename>/text/scalc/01/04060182.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3154372" role="heading" level="1" l10n="U" oldref="1"><variable id="fh"><link href="text/scalc/01/04060182.xhp" name="Statistical Functions Part Two">Statistical Functions Part Two</link>
 </variable></paragraph>
 <sort order="asc">
 <section id="finv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145388"><bookmark_value>FINV function</bookmark_value>
-<bookmark_value>inverse F probability distribution</bookmark_value>
+         <bookmark_value>inverse F probability distribution</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINV" id="bm_id3146113" localize="false"/>
-<paragraph role="heading" id="hd_id3145388" xml-lang="en-US" level="2" l10n="U" oldref="2">FINV</paragraph>
-<paragraph role="paragraph" id="par_id3155089" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_FINV">Returns the inverse of the F probability distribution.</ahelp> The F distribution is used for F tests in order to set the relation between two differing data sets.</paragraph>
-<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
-<paragraph role="code" id="par_id3153068" xml-lang="en-US" l10n="U" oldref="5">FINV(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
-<paragraph role="paragraph" id="par_id3146866" xml-lang="en-US" l10n="U" oldref="6">
-<emph>Number</emph> is probability value for which the inverse F distribution is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="7">
-<emph>DegreesFreedom1</emph> is the number of degrees of freedom in the numerator of the F distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3148607" xml-lang="en-US" l10n="U" oldref="8">
-<emph>DegreesFreedom2</emph> is the number of degrees of freedom in the denominator of the F distribution.</paragraph>
-<paragraph role="heading" id="hd_id3156021" xml-lang="en-US" level="3" l10n="U" oldref="9">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145073" xml-lang="en-US" l10n="U" oldref="10">
-<item type="input">=FINV(0.5;5;10)</item> yields 0.93.</paragraph>
-</section>
-<section id="fisher">
+<paragraph xml-lang="en-US" id="hd_id3145388" role="heading" level="2" l10n="U" oldref="2">FINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155089" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_FUNC_FINV">Returns the inverse of the F probability distribution.</ahelp> The F distribution is used for F tests in order to set the relation between two differing data sets.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153816" role="heading" level="3" l10n="U" oldref="4">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153068" role="code" l10n="U" oldref="5">FINV(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146866" role="paragraph" l10n="U" oldref="6">
+            <emph>Number</emph> is probability value for which the inverse F distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153914" role="paragraph" l10n="U" oldref="7">
+            <emph>DegreesFreedom1</emph> is the number of degrees of freedom in the numerator of the F distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148607" role="paragraph" l10n="U" oldref="8">
+            <emph>DegreesFreedom2</emph> is the number of degrees of freedom in the denominator of the F distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156021" role="heading" level="3" l10n="U" oldref="9">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145073" role="paragraph" l10n="U" oldref="10">
+            <item type="input">=FINV(0.5;5;10)</item> yields 0.93.</paragraph>
+      </section>
+      <section id="fisher">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150888"><bookmark_value>FISHER function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHER" id="bm_id3146782" localize="false"/>
-<paragraph role="heading" id="hd_id3150888" xml-lang="en-US" level="2" l10n="U" oldref="12">FISHER</paragraph>
-<paragraph role="paragraph" id="par_id3155384" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_FUNC_FISHER">Returns the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149898" xml-lang="en-US" level="3" l10n="U" oldref="14">Syntax</paragraph>
-<paragraph role="code" id="par_id3143220" xml-lang="en-US" l10n="U" oldref="15">FISHER(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3159228" xml-lang="en-US" l10n="U" oldref="16">
-<emph>Number</emph> is the value to be transformed.</paragraph>
-<paragraph role="heading" id="hd_id3154763" xml-lang="en-US" level="3" l10n="U" oldref="17">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149383" xml-lang="en-US" l10n="U" oldref="18">
-<item type="input">=FISHER(0.5)</item> yields 0.55.</paragraph>
-</section>
-<section id="fisherinv">
+<paragraph xml-lang="en-US" id="hd_id3150888" role="heading" level="2" l10n="U"
+                    oldref="12">FISHER</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155384" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_FUNC_FISHER">Returns the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149898" role="heading" level="3" l10n="U"
+                    oldref="14">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143220" role="code" l10n="U" oldref="15">FISHER(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159228" role="paragraph" l10n="U" oldref="16">
+            <emph>Number</emph> is the value to be transformed.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154763" role="heading" level="3" l10n="U"
+                    oldref="17">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149383" role="paragraph" l10n="U" oldref="18">
+            <item type="input">=FISHER(0.5)</item> yields 0.55.</paragraph>
+      </section>
+      <section id="fisherinv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155758"><bookmark_value>FISHERINV function</bookmark_value>
-<bookmark_value>inverse of Fisher transformation</bookmark_value>
+         <bookmark_value>inverse of Fisher transformation</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHERINV" id="bm_id3149317" localize="false"/>
-<paragraph role="heading" id="hd_id3155758" xml-lang="en-US" level="2" l10n="U" oldref="20">FISHERINV</paragraph>
-<paragraph role="paragraph" id="par_id3154734" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_FUNC_FISHERINV">Returns the inverse of the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155755" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
-<paragraph role="code" id="par_id3146108" xml-lang="en-US" l10n="U" oldref="23">FISHERINV(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3145115" xml-lang="en-US" l10n="U" oldref="24">
-<emph>Number</emph> is the value that is to undergo reverse-transformation.</paragraph>
-<paragraph role="heading" id="hd_id3155744" xml-lang="en-US" level="3" l10n="U" oldref="25">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150432" xml-lang="en-US" l10n="U" oldref="26">
-<item type="input">=FISHERINV(0.5)</item> yields 0.46.</paragraph>
-</section>
-<section id="ftest">
+<paragraph xml-lang="en-US" id="hd_id3155758" role="heading" level="2" l10n="U"
+                    oldref="20">FISHERINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154734" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_FUNC_FISHERINV">Returns the inverse of the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155755" role="heading" level="3" l10n="U"
+                    oldref="22">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146108" role="code" l10n="U" oldref="23">FISHERINV(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145115" role="paragraph" l10n="U" oldref="24">
+            <emph>Number</emph> is the value that is to undergo reverse-transformation.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155744" role="heading" level="3" l10n="U"
+                    oldref="25">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150432" role="paragraph" l10n="U" oldref="26">
+            <item type="input">=FISHERINV(0.5)</item> yields 0.46.</paragraph>
+      </section>
+      <section id="ftest">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151390"><bookmark_value>FTEST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FTEST" id="bm_id3159263" localize="false"/>
-<paragraph role="heading" id="hd_id3151390" xml-lang="en-US" level="2" l10n="U" oldref="28">FTEST</paragraph>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_FUNC_FTEST">Returns the result of an F test.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3166466" xml-lang="en-US" level="3" l10n="U" oldref="30">Syntax</paragraph>
-<paragraph role="code" id="par_id3153024" xml-lang="en-US" l10n="U" oldref="31">FTEST(Data1; Data2)</paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="32">
-<emph>Data1</emph> is the first record array.</paragraph>
-<paragraph role="paragraph" id="par_id3153018" xml-lang="en-US" l10n="U" oldref="33">
-<emph>Data2</emph> is the second record array.</paragraph>
-<paragraph role="heading" id="hd_id3153123" xml-lang="en-US" level="3" l10n="U" oldref="34">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159126" xml-lang="en-US" l10n="U" oldref="35">
-<item type="input">=FTEST(A1:A30;B1:B12)</item> calculates whether the two data sets are different in their variance and returns the probability that both sets could have come from the same total population.</paragraph>
-</section>
-<section id="fdist">
+<paragraph xml-lang="en-US" id="hd_id3151390" role="heading" level="2" l10n="U"
+                    oldref="28">FTEST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150534" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_FUNC_FTEST">Returns the result of an F test.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3166466" role="heading" level="3" l10n="U"
+                    oldref="30">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153024" role="code" l10n="U" oldref="31">FTEST(Data1; Data2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="32">
+            <emph>Data1</emph> is the first record array.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153018" role="paragraph" l10n="U" oldref="33">
+            <emph>Data2</emph> is the second record array.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153123" role="heading" level="3" l10n="U"
+                    oldref="34">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="35">
+            <item type="input">=FTEST(A1:A30;B1:B12)</item> calculates whether the two data sets are different in their variance and returns the probability that both sets could have come from the same total population.</paragraph>
+      </section>
+      <section id="fdist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150372"><bookmark_value>FDIST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_FVERT" id="bm_id3149722" localize="false"/>
-<paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="37">FDIST</paragraph>
-<paragraph role="paragraph" id="par_id3152981" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_FUNC_FVERT">Calculates the values of an F distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150484" xml-lang="en-US" level="3" l10n="U" oldref="39">Syntax</paragraph>
-<paragraph role="code" id="par_id3145826" xml-lang="en-US" l10n="U" oldref="40">FDIST(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
-<paragraph role="paragraph" id="par_id3150461" xml-lang="en-US" l10n="U" oldref="41">
-<emph>Number</emph> is the value for which the F distribution is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3150029" xml-lang="en-US" l10n="U" oldref="42">
-<emph>degreesFreedom1</emph> is the degrees of freedom in the numerator in the F distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3146877" xml-lang="en-US" l10n="U" oldref="43">
-<emph>degreesFreedom2</emph> is the degrees of freedom in the denominator in the F distribution.</paragraph>
-<paragraph role="heading" id="hd_id3147423" xml-lang="en-US" level="3" l10n="U" oldref="44">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150696" xml-lang="en-US" l10n="U" oldref="45">
-<item type="input">=FDIST(0.8;8;12)</item> yields 0.61.</paragraph>
-</section>
-<section id="gammainv">
+<paragraph xml-lang="en-US" id="hd_id3150372" role="heading" level="2" l10n="U"
+                    oldref="37">FDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152981" role="paragraph" l10n="U" oldref="38"><ahelp hid="HID_FUNC_FVERT">Calculates the values of an F distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150484" role="heading" level="3" l10n="U"
+                    oldref="39">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145826" role="code" l10n="U" oldref="40">FDIST(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150461" role="paragraph" l10n="U" oldref="41">
+            <emph>Number</emph> is the value for which the F distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150029" role="paragraph" l10n="U" oldref="42">
+            <emph>degreesFreedom1</emph> is the degrees of freedom in the numerator in the F distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146877" role="paragraph" l10n="U" oldref="43">
+            <emph>degreesFreedom2</emph> is the degrees of freedom in the denominator in the F distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147423" role="heading" level="3" l10n="U"
+                    oldref="44">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150696" role="paragraph" l10n="U" oldref="45">
+            <item type="input">=FDIST(0.8;8;12)</item> yields 0.61.</paragraph>
+      </section>
+      <section id="gamma">
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMA" id="bm_id0119200903221254" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0119200903223192"><bookmark_value>GAMMA function</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0119200903205393" role="heading" level="2" l10n="NEW">GAMMA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200903205379" role="paragraph" l10n="NEW"><ahelp hid=".">Returns the Gamma function value.</ahelp> Note that GAMMAINV is not the inverse of GAMMA, but of GAMMADIST.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0119200903271613" role="heading" level="3" l10n="NEW">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200903271614" role="paragraph" l10n="NEW">
+            <emph>Number</emph> is the number for which the Gamma function value is to be calculated.</paragraph>
+      </section>
+      <section id="gammainv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154841"><bookmark_value>GAMMAINV function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAINV" id="bm_id3149249" localize="false"/>
-<paragraph role="heading" id="hd_id3154841" xml-lang="en-US" level="2" l10n="U" oldref="47">GAMMAINV</paragraph>
-<paragraph role="paragraph" id="par_id3153932" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="HID_FUNC_GAMMAINV">Returns the inverse of the Gamma cumulative distribution.</ahelp> This function allows you to search for variables with different distribution.</paragraph>
-<paragraph role="heading" id="hd_id3149949" xml-lang="en-US" level="3" l10n="U" oldref="49">Syntax</paragraph>
-<paragraph role="code" id="par_id3155828" xml-lang="en-US" l10n="U" oldref="50">GAMMAINV(Number; Alpha; Beta)</paragraph>
-<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="U" oldref="51">
-<emph>Number</emph> is the probability value for which the inverse Gamma distribution is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3152785" xml-lang="en-US" l10n="U" oldref="52">
-<emph>Alpha</emph> is the parameter Alpha of the Gamma distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3154561" xml-lang="en-US" l10n="U" oldref="53">
-<emph>Beta</emph> is the parameter Beta of the Gamma distribution.</paragraph>
-<paragraph role="heading" id="hd_id3148734" xml-lang="en-US" level="3" l10n="U" oldref="54">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="55">
-<item type="input">=GAMMAINV(0.8;1;1)</item> yields 1.61.</paragraph>
-</section>
-<section id="gammaln">
+<paragraph xml-lang="en-US" id="hd_id3154841" role="heading" level="2" l10n="U"
+                    oldref="47">GAMMAINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153932" role="paragraph" l10n="U" oldref="48"><ahelp hid="HID_FUNC_GAMMAINV">Returns the inverse of the Gamma cumulative distribution GAMMADIST.</ahelp> This function allows you to search for variables with different distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149949" role="heading" level="3" l10n="U"
+                    oldref="49">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155828" role="code" l10n="U" oldref="50">GAMMAINV(Number; Alpha; Beta)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145138" role="paragraph" l10n="U" oldref="51">
+            <emph>Number</emph> is the probability value for which the inverse Gamma distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152785" role="paragraph" l10n="U" oldref="52">
+            <emph>Alpha</emph> is the parameter Alpha of the Gamma distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154561" role="paragraph" l10n="U" oldref="53">
+            <emph>Beta</emph> is the parameter Beta of the Gamma distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148734" role="heading" level="3" l10n="U"
+                    oldref="54">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153331" role="paragraph" l10n="U" oldref="55">
+            <item type="input">=GAMMAINV(0.8;1;1)</item> yields 1.61.</paragraph>
+      </section>
+      <section id="gammaln">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154806"><bookmark_value>GAMMALN function</bookmark_value>
-<bookmark_value>natural logarithm of Gamma function</bookmark_value>
+         <bookmark_value>natural logarithm of Gamma function</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMALN" id="bm_id3149511" localize="false"/>
-<paragraph role="heading" id="hd_id3154806" xml-lang="en-US" level="2" l10n="U" oldref="57">GAMMALN</paragraph>
-<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_FUNC_GAMMALN">Returns the natural logarithm of the Gamma function: G(x).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152999" xml-lang="en-US" level="3" l10n="U" oldref="59">Syntax</paragraph>
-<paragraph role="code" id="par_id3153112" xml-lang="en-US" l10n="U" oldref="60">GAMMALN(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154502" xml-lang="en-US" l10n="U" oldref="61">
-<emph>Number</emph> is the value for which the natural logarithm of the Gamma function is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3153568" xml-lang="en-US" level="3" l10n="U" oldref="62">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153730" xml-lang="en-US" l10n="U" oldref="63">
-<item type="input">=GAMMALN(2)</item> yields 0.</paragraph>
-</section>
-<section id="gammadist">
+<paragraph xml-lang="en-US" id="hd_id3154806" role="heading" level="2" l10n="U"
+                    oldref="57">GAMMALN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148572" role="paragraph" l10n="U" oldref="58"><ahelp hid="HID_FUNC_GAMMALN">Returns the natural logarithm of the Gamma function: G(x).</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152999" role="heading" level="3" l10n="U"
+                    oldref="59">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153112" role="code" l10n="U" oldref="60">GAMMALN(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154502" role="paragraph" l10n="U" oldref="61">
+            <emph>Number</emph> is the value for which the natural logarithm of the Gamma function is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153568" role="heading" level="3" l10n="U"
+                    oldref="62">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153730" role="paragraph" l10n="U" oldref="63">
+            <item type="input">=GAMMALN(2)</item> yields 0.</paragraph>
+      </section>
+      <section id="gammadist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150132"><bookmark_value>GAMMADIST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAVERT" id="bm_id3154330" localize="false"/>
-<paragraph role="heading" id="hd_id3150132" xml-lang="en-US" level="2" l10n="U" oldref="65">GAMMADIST</paragraph>
-<paragraph role="paragraph" id="par_id3155931" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="HID_FUNC_GAMMAVERT">Returns the values of a Gamma distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="67">Syntax</paragraph>
-<paragraph role="code" id="par_id3155436" xml-lang="en-US" l10n="U" oldref="68">GAMMADIST(Number; Alpha; Beta; C)</paragraph>
-<paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="69">
-<emph>Number</emph> is the value for which the Gamma distribution is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="U" oldref="70">
-<emph>Alpha</emph> is the parameter Alpha of the Gamma distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3151015" xml-lang="en-US" l10n="U" oldref="71">
-<emph>Beta</emph> is the parameter Beta of the Gamma distribution</paragraph>
-<paragraph role="paragraph" id="par_id3157972" xml-lang="en-US" l10n="U" oldref="72">
-<emph>C</emph> = 0 calculates the density function <emph>C</emph> = 1 the distribution.</paragraph>
-<paragraph role="heading" id="hd_id3149535" xml-lang="en-US" level="3" l10n="U" oldref="73">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145354" xml-lang="en-US" l10n="U" oldref="74">
-<item type="input">=GAMMADIST(2;1;1;1)</item> yields 0.86.</paragraph>
-</section>
-<section id="gauss">
+<paragraph xml-lang="en-US" id="hd_id3150132" role="heading" level="2" l10n="U"
+                    oldref="65">GAMMADIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155931" role="paragraph" l10n="U" oldref="66"><ahelp hid="HID_FUNC_GAMMAVERT">Returns the values of a Gamma distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0119200903333675" role="paragraph" l10n="NEW">The inverse function is GAMMAINV.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147373" role="heading" level="3" l10n="U"
+                    oldref="67">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155436" role="code" l10n="U" oldref="68">GAMMADIST(Number; Alpha; Beta; C)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150571" role="paragraph" l10n="U" oldref="69">
+            <emph>Number</emph> is the value for which the Gamma distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145295" role="paragraph" l10n="U" oldref="70">
+            <emph>Alpha</emph> is the parameter Alpha of the Gamma distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151015" role="paragraph" l10n="U" oldref="71">
+            <emph>Beta</emph> is the parameter Beta of the Gamma distribution</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157972" role="paragraph" l10n="CHG" oldref="72">
+            <emph>C</emph> (optional) = 0 or False calculates the density function <emph>C</emph> = 1 or True calculates the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149535" role="heading" level="3" l10n="U"
+                    oldref="73">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145354" role="paragraph" l10n="U" oldref="74">
+            <item type="input">=GAMMADIST(2;1;1;1)</item> yields 0.86.</paragraph>
+      </section>
+      <section id="gauss">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150272"><bookmark_value>GAUSS function</bookmark_value>
-<bookmark_value>normal distribution; standard</bookmark_value>
+         <bookmark_value>normal distribution; standard</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAUSS" id="bm_id3149388" localize="false"/>
-<paragraph role="heading" id="hd_id3150272" xml-lang="en-US" level="2" l10n="U" oldref="76">GAUSS</paragraph>
-<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_GAUSS">Returns the standard normal cumulative distribution.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2059694" xml-lang="en-US" l10n="NEW">It is GAUSS(x)=NORMSDIST(x)-0.5</paragraph>
-<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
-<paragraph role="code" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="79">GAUSS(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3153228" xml-lang="en-US" l10n="CHG" oldref="80">
-<emph>Number</emph> is the value for which the value of the standard normal distribution is to be calculated.</paragraph>
-<paragraph role="heading" id="hd_id3150691" xml-lang="en-US" level="3" l10n="U" oldref="81">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154867" xml-lang="en-US" l10n="U" oldref="82">
-<item type="input">=GAUSS(0.19)</item> = 0.08</paragraph>
-<paragraph role="paragraph" id="par_id3148594" xml-lang="en-US" l10n="U" oldref="83">
-<item type="input">=GAUSS(0.0375)</item> = 0.01</paragraph>
-</section>
-<section id="geomean">
+<paragraph xml-lang="en-US" id="hd_id3150272" role="heading" level="2" l10n="U"
+                    oldref="76">GAUSS</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149030" role="paragraph" l10n="U" oldref="77"><ahelp hid="HID_FUNC_GAUSS">Returns the standard normal cumulative distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id2059694" role="paragraph" l10n="NEW">It is GAUSS(x)=NORMSDIST(x)-0.5</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153551" role="heading" level="3" l10n="U"
+                    oldref="78">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155368" role="code" l10n="U" oldref="79">GAUSS(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153228" role="paragraph" l10n="CHG" oldref="80">
+            <emph>Number</emph> is the value for which the value of the standard normal distribution is to be calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150691" role="heading" level="3" l10n="U"
+                    oldref="81">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154867" role="paragraph" l10n="U" oldref="82">
+            <item type="input">=GAUSS(0.19)</item> = 0.08</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148594" role="paragraph" l10n="U" oldref="83">
+            <item type="input">=GAUSS(0.0375)</item> = 0.01</paragraph>
+      </section>
+      <section id="geomean">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148425"><bookmark_value>GEOMEAN function</bookmark_value>
-<bookmark_value>means;geometric</bookmark_value>
+         <bookmark_value>means;geometric</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GEOMITTEL" id="bm_id3149777" localize="false"/>
-<paragraph role="heading" id="hd_id3148425" xml-lang="en-US" level="2" l10n="U" oldref="85">GEOMEAN</paragraph>
-<paragraph role="paragraph" id="par_id3156257" xml-lang="en-US" l10n="U" oldref="86"><ahelp hid="HID_FUNC_GEOMITTEL">Returns the geometric mean of a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="3" l10n="U" oldref="87">Syntax</paragraph>
-<paragraph role="code" id="par_id3153720" xml-lang="en-US" l10n="U" oldref="88">GEOMEAN(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3152585" xml-lang="en-US" l10n="CHG" oldref="89">
-<emph>Number1, Number2,...Number30</emph> are numeric arguments or ranges that represent a random sample.</paragraph>
-<paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3" l10n="U" oldref="90">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="92">
-<item type="input">=GEOMEAN(23;46;69)</item> = 41.79. The geometric mean value of this random sample is therefore 41.79.</paragraph>
-</section>
-<section id="trimmean">
+<paragraph xml-lang="en-US" id="hd_id3148425" role="heading" level="2" l10n="U"
+                    oldref="85">GEOMEAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156257" role="paragraph" l10n="U" oldref="86"><ahelp hid="HID_FUNC_GEOMITTEL">Returns the geometric mean of a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147167" role="heading" level="3" l10n="U"
+                    oldref="87">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153720" role="code" l10n="U" oldref="88">GEOMEAN(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152585" role="paragraph" l10n="CHG" oldref="89">
+            <emph>Number1, Number2,...Number30</emph> are numeric arguments or ranges that represent a random sample.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146146" role="heading" level="3" l10n="U"
+                    oldref="90">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="U" oldref="92">
+            <item type="input">=GEOMEAN(23;46;69)</item> = 41.79. The geometric mean value of this random sample is therefore 41.79.</paragraph>
+      </section>
+      <section id="trimmean">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152966"><bookmark_value>TRIMMEAN function</bookmark_value>
-<bookmark_value>means;of data set without margin data</bookmark_value>
+         <bookmark_value>means;of data set without margin data</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GESTUTZTMITTEL" id="bm_id3145081" localize="false"/>
-<paragraph role="heading" id="hd_id3152966" xml-lang="en-US" level="2" l10n="U" oldref="94">TRIMMEAN</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="HID_FUNC_GESTUTZTMITTEL">Returns the mean of a data set without the Alpha percent of data at the margins.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149281" xml-lang="en-US" level="3" l10n="U" oldref="96">Syntax</paragraph>
-<paragraph role="code" id="par_id3154821" xml-lang="en-US" l10n="U" oldref="97">TRIMMEAN(Data; Alpha)</paragraph>
-<paragraph role="paragraph" id="par_id3155834" xml-lang="en-US" l10n="U" oldref="98">
-<emph>Data</emph> is the array of data in the sample.</paragraph>
-<paragraph role="paragraph" id="par_id3156304" xml-lang="en-US" l10n="U" oldref="99">
-<emph>Alpha</emph> is the percentage of the marginal data that will not be taken into consideration.</paragraph>
-<paragraph role="heading" id="hd_id3151180" xml-lang="en-US" level="3" l10n="U" oldref="100">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="101">
-<item type="input">=TRIMMEAN(A1:A50; 0.1)</item> calculates the mean value of numbers in A1:A50, without taking into consideration the 5 percent of the values representing the highest values and the 5 percent of the values representing the lowest ones. The percentage numbers refer to the amount of the untrimmed mean value, not to the number of summands.</paragraph>
-</section>
-<section id="ztest">
+<paragraph xml-lang="en-US" id="hd_id3152966" role="heading" level="2" l10n="U"
+                    oldref="94">TRIMMEAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="95"><ahelp hid="HID_FUNC_GESTUTZTMITTEL">Returns the mean of a data set without the Alpha percent of data at the margins.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149281" role="heading" level="3" l10n="U"
+                    oldref="96">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154821" role="code" l10n="U" oldref="97">TRIMMEAN(Data; Alpha)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155834" role="paragraph" l10n="U" oldref="98">
+            <emph>Data</emph> is the array of data in the sample.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156304" role="paragraph" l10n="U" oldref="99">
+            <emph>Alpha</emph> is the percentage of the marginal data that will not be taken into consideration.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151180" role="heading" level="3" l10n="U"
+                    oldref="100">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156130" role="paragraph" l10n="U" oldref="101">
+            <item type="input">=TRIMMEAN(A1:A50; 0.1)</item> calculates the mean value of numbers in A1:A50, without taking into consideration the 5 percent of the values representing the highest values and the 5 percent of the values representing the lowest ones. The percentage numbers refer to the amount of the untrimmed mean value, not to the number of summands.</paragraph>
+      </section>
+      <section id="ztest">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153216"><bookmark_value>ZTEST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_GTEST" id="bm_id3147569" localize="false"/>
-<paragraph role="heading" id="hd_id3153216" xml-lang="en-US" level="2" l10n="U" oldref="103">ZTEST</paragraph>
-<paragraph role="paragraph" id="par_id3150758" xml-lang="en-US" l10n="U" oldref="104"><ahelp hid="HID_FUNC_GTEST">Returns the two-tailed P value of a z test with standard distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="105">Syntax</paragraph>
-<paragraph role="code" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="106">ZTEST(Data; Number; Sigma)</paragraph>
-<paragraph role="paragraph" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="107">
-<emph>Data</emph> is the array of the data.</paragraph>
-<paragraph role="paragraph" id="par_id3149977" xml-lang="en-US" l10n="U" oldref="108">
-<emph>Number</emph> is the value to be tested.</paragraph>
-<paragraph role="paragraph" id="par_id3154740" xml-lang="en-US" l10n="U" oldref="109">
-<emph>Sigma</emph> (optional) is the standard deviation of the total population. If this argument is missing, the standard deviation of the sample in question will be processed.</paragraph>
-<paragraph role="heading" id="hd_id3151289" xml-lang="en-US" level="3" l10n="U" oldref="110">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153756" xml-lang="en-US" l10n="U" oldref="111">
-<item type="input">=ZTEST(A1:A50;12)</item> yields the probability that value 12 belongs to the standard distribution of the total population of data in A1:A50.</paragraph>
-</section>
-<section id="harmean">
+<paragraph xml-lang="en-US" id="hd_id3153216" role="heading" level="2" l10n="U"
+                    oldref="103">ZTEST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150758" role="paragraph" l10n="CHG" oldref="104"><ahelp hid="HID_FUNC_GTEST">Calculates the probability of observing a z-statistic greater than the one computed based on a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="3" l10n="U"
+                    oldref="105">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153274" role="code" l10n="CHG" oldref="106">ZTEST(Data; mu; Sigma)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156109" role="paragraph" l10n="CHG" oldref="107">
+            <emph>Data</emph> is the given sample, drawn from a normally distributed population.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="CHG" oldref="108">
+            <emph>mu</emph> is the known mean of the population.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="CHG" oldref="109">
+            <emph>Sigma</emph> (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used.</paragraph>
+	 <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
+      </section>
+      <section id="harmean">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153623"><bookmark_value>HARMEAN function</bookmark_value>
-<bookmark_value>means;harmonic</bookmark_value>
+         <bookmark_value>means;harmonic</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_HARMITTEL" id="bm_id3154052" localize="false"/>
-<paragraph role="heading" id="hd_id3153623" xml-lang="en-US" level="2" l10n="U" oldref="113">HARMEAN</paragraph>
-<paragraph role="paragraph" id="par_id3155102" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FUNC_HARMITTEL">Returns the harmonic mean of a data set.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146900" xml-lang="en-US" level="3" l10n="U" oldref="115">Syntax</paragraph>
-<paragraph role="code" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="116">HARMEAN(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3154303" xml-lang="en-US" l10n="CHG" oldref="117">
-<emph>Number1,Number2,...Number30</emph> are up to 30 values or ranges, that can be used to calculate the harmonic mean.</paragraph>
-<paragraph role="heading" id="hd_id3159179" xml-lang="en-US" level="3" l10n="U" oldref="118">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146093" xml-lang="en-US" l10n="U" oldref="120">
-<item type="input">=HARMEAN(23;46;69)</item> = 37.64. The harmonic mean of this random sample is thus 37.64</paragraph>
-</section>
-<section id="hypgeomdist">
+<paragraph xml-lang="en-US" id="hd_id3153623" role="heading" level="2" l10n="U"
+                    oldref="113">HARMEAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155102" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FUNC_HARMITTEL">Returns the harmonic mean of a data set.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146900" role="heading" level="3" l10n="U"
+                    oldref="115">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149287" role="code" l10n="U" oldref="116">HARMEAN(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154303" role="paragraph" l10n="CHG" oldref="117">
+            <emph>Number1,Number2,...Number30</emph> are up to 30 values or ranges, that can be used to calculate the harmonic mean.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159179" role="heading" level="3" l10n="U"
+                    oldref="118">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146093" role="paragraph" l10n="U" oldref="120">
+            <item type="input">=HARMEAN(23;46;69)</item> = 37.64. The harmonic mean of this random sample is thus 37.64</paragraph>
+      </section>
+      <section id="hypgeomdist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>HYPGEOMDIST function</bookmark_value>
-<bookmark_value>sampling without replacement</bookmark_value>
+         <bookmark_value>sampling without replacement</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_HYPGEOMVERT" id="bm_id3153910" localize="false"/>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="122">HYPGEOMDIST</paragraph>
-<paragraph role="paragraph" id="par_id3159341" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_FUNC_HYPGEOMVERT">Returns the hypergeometric distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154697" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
-<paragraph role="code" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="125">HYPGEOMDIST(X; NSample; Successes; NPopulation)</paragraph>
-<paragraph role="paragraph" id="par_id3154933" xml-lang="en-US" l10n="U" oldref="126">
-<emph>X</emph> is the number of results achieved in the random sample.</paragraph>
-<paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="U" oldref="127">
-<emph>NSample</emph> is the size of the random sample.</paragraph>
-<paragraph role="paragraph" id="par_id3146992" xml-lang="en-US" l10n="U" oldref="128">
-<emph>Successes</emph> is the number of possible results in the total population.</paragraph>
-<paragraph role="paragraph" id="par_id3148826" xml-lang="en-US" l10n="U" oldref="129">
-<emph>NPopulation </emph>is the size of the total population.</paragraph>
-<paragraph role="heading" id="hd_id3150529" xml-lang="en-US" level="3" l10n="U" oldref="130">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154904" xml-lang="en-US" l10n="U" oldref="131">
-<item type="input">=HYPGEOMDIST(2;2;90;100)</item> yields 0.81. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3152801" role="heading" level="2" l10n="U"
+                    oldref="122">HYPGEOMDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159341" role="paragraph" l10n="U" oldref="123"><ahelp hid="HID_FUNC_HYPGEOMVERT">Returns the hypergeometric distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154697" role="heading" level="3" l10n="U"
+                    oldref="124">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155388" role="code" l10n="U" oldref="125">HYPGEOMDIST(X; NSample; Successes; NPopulation)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154933" role="paragraph" l10n="U" oldref="126">
+            <emph>X</emph> is the number of results achieved in the random sample.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153106" role="paragraph" l10n="U" oldref="127">
+            <emph>NSample</emph> is the size of the random sample.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146992" role="paragraph" l10n="U" oldref="128">
+            <emph>Successes</emph> is the number of possible results in the total population.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148826" role="paragraph" l10n="U" oldref="129">
+            <emph>NPopulation </emph>is the size of the total population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150529" role="heading" level="3" l10n="U"
+                    oldref="130">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154904" role="paragraph" l10n="U" oldref="131">
+            <item type="input">=HYPGEOMDIST(2;2;90;100)</item> yields 0.81. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first.</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060183.xhp b/helpcontent2/source/text/scalc/01/04060183.xhp
index 7ef96b3843..a93ebcac78 100755
--- a/helpcontent2/source/text/scalc/01/04060183.xhp
+++ b/helpcontent2/source/text/scalc/01/04060183.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060183.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -188,13 +185,15 @@
 <paragraph role="heading" id="hd_id3158417" xml-lang="en-US" level="2" l10n="U" oldref="76">LOGNORMDIST</paragraph>
 <paragraph role="paragraph" id="par_id3154953" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_LOGNORMVERT">Returns the cumulative lognormal distribution.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150474" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
-<paragraph role="code" id="par_id3150686" xml-lang="en-US" l10n="U" oldref="79">LOGNORMDIST(Number; Mean; StDev)</paragraph>
+<paragraph role="code" id="par_id3150686" xml-lang="en-US" l10n="U" oldref="79">LOGNORMDIST(Number; Mean; StDev; Cumulative)</paragraph>
 <paragraph role="paragraph" id="par_id3154871" xml-lang="en-US" l10n="U" oldref="80">
 <emph>Number</emph> is the probability value for which the standard logarithmic distribution is to be calculated.</paragraph>
 <paragraph role="paragraph" id="par_id3155820" xml-lang="en-US" l10n="U" oldref="81">
-<emph>Mean</emph> is the mean value of the standard logarithmic distribution.</paragraph>
+<emph>Mean</emph> (optional) is the mean value of the standard logarithmic distribution.</paragraph>
 <paragraph role="paragraph" id="par_id3155991" xml-lang="en-US" l10n="U" oldref="82">
-<emph>StDev</emph> is the standard deviation of the standard logarithmic distribution.</paragraph>
+<emph>StDev</emph> (optional) is the standard deviation of the standard logarithmic distribution.</paragraph>
+<paragraph role="paragraph" id="par_id3155992" xml-lang="en-US" l10n="NEW">
+<emph>Cumulative</emph> (optional) = 0 calculates the density function, Cumulative = 1 calculates the distribution.</paragraph>
 <paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="83">Example</paragraph>
 <paragraph role="paragraph" id="par_id3149778" xml-lang="en-US" l10n="U" oldref="84">
 <item type="input">=LOGNORMDIST(0.1;0;1)</item> returns 0.01.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060184.xhp b/helpcontent2/source/text/scalc/01/04060184.xhp
index fb3aa2fb43..ea21a96603 100755
--- a/helpcontent2/source/text/scalc/01/04060184.xhp
+++ b/helpcontent2/source/text/scalc/01/04060184.xhp
@@ -3,16 +3,13 @@
 	
 <!--
 ***********************************************************************
- *
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060184.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,98 +27,105 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
- 
+************************************************************************
+-->
+
 	
 <meta>
 <topic id="textscalc0104060184xml" indexer="include">
-<title id="tit" xml-lang="en-US">Statistical Functions Part Four</title>
+<title xml-lang="en-US" id="tit">Statistical Functions Part Four</title>
 <filename>/text/scalc/01/04060184.xhp</filename>
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3153415" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="mq"><link href="text/scalc/01/04060184.xhp" name="Statistical Functions Part Four">Statistical Functions Part Four</link>
+<paragraph xml-lang="en-US" id="hd_id3153415" role="heading" level="1" l10n="U" oldref="1"><variable id="mq"><link href="text/scalc/01/04060184.xhp" name="Statistical Functions Part Four">Statistical Functions Part Four</link>
 </variable></paragraph>
 <sort order="asc">
 <section id="max">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154511"><bookmark_value>MAX function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAX" id="bm_id3146972" localize="false"/>
-<paragraph role="heading" id="hd_id3154511" xml-lang="en-US" level="2" l10n="U" oldref="2">MAX</paragraph>
-<paragraph role="paragraph" id="par_id3153709" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_MAX">Returns the maximum value in a list of arguments.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id9282509" xml-lang="en-US" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
-<paragraph role="heading" id="hd_id3154256" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
-<paragraph role="code" id="par_id3147340" xml-lang="en-US" l10n="U" oldref="5">MAX(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="6">
-<emph>Number1; Number2;...Number30</emph> are numerical values or ranges. </paragraph>
-<paragraph role="heading" id="hd_id3153963" xml-lang="en-US" level="3" l10n="U" oldref="7">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="8">
+<paragraph xml-lang="en-US" id="hd_id3154511" role="heading" level="2" l10n="U" oldref="2">MAX</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153709" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_FUNC_MAX">Returns the maximum value in a list of arguments.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id9282509" role="paragraph" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154256" role="heading" level="3" l10n="U" oldref="4">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147340" role="code" l10n="U" oldref="5">MAX(Number1; Number2; ...Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="6"><emph>Number1; Number2;...Number30</emph> are numerical values or ranges. </paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153963" role="heading" level="3" l10n="U" oldref="7">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147343" role="paragraph" l10n="U" oldref="8">
 <item type="input">=MAX(A1;A2;A3;50;100;200)</item> returns the largest value from the list.</paragraph>
-<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="9">
+<paragraph xml-lang="en-US" id="par_id3148485" role="paragraph" l10n="U" oldref="9">
 <item type="input">=MAX(A1:B100)</item> returns the largest value from the list.</paragraph>
 </section>
 <section id="maxa">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3166426"><bookmark_value>MAXA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAXA" id="bm_id3150304" localize="false"/>
-<paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2" l10n="U" oldref="139">MAXA</paragraph>
-<paragraph role="paragraph" id="par_id3150363" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_FUNC_MAXA">Returns the maximum value in a list of arguments. In opposite to MAX, here you can enter text. The value of the text is 0.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id7689443" xml-lang="en-US" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
-<paragraph role="heading" id="hd_id3150516" xml-lang="en-US" level="3" l10n="U" oldref="141">Syntax</paragraph>
-<paragraph role="code" id="par_id3166431" xml-lang="en-US" l10n="U" oldref="142">MAXA(Value1; Value2; ... Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="143">
-<emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
-<paragraph role="heading" id="hd_id3156290" xml-lang="en-US" level="3" l10n="U" oldref="144">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156446" xml-lang="en-US" l10n="CHG" oldref="145">
+<paragraph xml-lang="en-US" id="hd_id3166426" role="heading" level="2" l10n="U"
+oldref="139">MAXA</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150363" role="paragraph" l10n="U" oldref="140"><ahelp hid="HID_FUNC_MAXA">Returns the maximum value in a list of arguments. In opposite to MAX, here you can enter text. The value of the text is 0.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7689443" role="paragraph" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150516" role="heading" level="3" l10n="U"
+oldref="141">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166431" role="code" l10n="U" oldref="142">MAXA(Value1; Value2; ... Value30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150202" role="paragraph" l10n="CHG" oldref="143"><emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156290" role="heading" level="3" l10n="U"
+oldref="144">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156446" role="paragraph" l10n="CHG" oldref="145">
 <item type="input">=MAXA(A1;A2;A3;50;100;200;"Text")</item> returns the largest value from the list.</paragraph>
-<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US" l10n="U" oldref="146">
+<paragraph xml-lang="en-US" id="par_id3149404" role="paragraph" l10n="U" oldref="146">
 <item type="input">=MAXA(A1:B100)</item> returns the largest value from the list.</paragraph>
 </section>
 <section id="median">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153820"><bookmark_value>MEDIAN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MEDIAN" id="bm_id3153069" localize="false"/>
-<paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="11">MEDIAN</paragraph>
-<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_FUNC_MEDIAN">Returns the median of a set of numbers. In a set containing an uneven number of values, the median will be the number in the middle of the set and in a set containing an even number of values, it will be the mean of the two values in the middle of the set.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148871" xml-lang="en-US" level="3" l10n="U" oldref="13">Syntax</paragraph>
-<paragraph role="code" id="par_id3155264" xml-lang="en-US" l10n="U" oldref="14">MEDIAN(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3150109" xml-lang="en-US" l10n="CHG" oldref="15">
-<emph>Number1; Number2;...Number30</emph> are values or ranges, which represent a sample. Each number can also be replaced by a reference.</paragraph>
-<paragraph role="heading" id="hd_id3144506" xml-lang="en-US" level="3" l10n="U" oldref="16">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145078" xml-lang="en-US" l10n="U" oldref="17">for an odd number: <item type="input">=MEDIAN(1;5;9;20;21)</item> returns 9 as the median value.</paragraph>
-<paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="165">for an even number: <item type="input">=MEDIAN(1;5;9;20)</item> returns the average of the two middle values 5 and 9, thus 7.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153820" role="heading" level="2" l10n="U"
+oldref="11">MEDIAN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_FUNC_MEDIAN">Returns the median of a set of numbers. In a set containing an uneven number of values, the median will be the number in the middle of the set and in a set containing an even number of values, it will be the mean of the two values in the middle of the set.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148871" role="heading" level="3" l10n="U"
+oldref="13">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155264" role="code" l10n="U" oldref="14">MEDIAN(Number1; Number2; ...Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150109" role="paragraph" l10n="CHG" oldref="15"><emph>Number1; Number2;...Number30</emph> are values or ranges, which represent a sample. Each number can also be replaced by a reference.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144506" role="heading" level="3" l10n="U"
+oldref="16">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145078" role="paragraph" l10n="U" oldref="17">for an odd number: <item type="input">=MEDIAN(1;5;9;20;21)</item> returns 9 as the median value.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149126" role="paragraph" l10n="U" oldref="165">for an even number: <item type="input">=MEDIAN(1;5;9;20)</item> returns the average of the two middle values 5 and 9, thus 7.</paragraph>
 </section>
 <section id="min">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154541"><bookmark_value>MIN function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MIN" id="bm_id3159226" localize="false"/>
-<paragraph role="heading" id="hd_id3154541" xml-lang="en-US" level="2" l10n="U" oldref="19">MIN</paragraph>
-<paragraph role="paragraph" id="par_id3143222" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_MIN">Returns the minimum value in a list of arguments.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2301400" xml-lang="en-US" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
-<paragraph role="heading" id="hd_id3154651" xml-lang="en-US" level="3" l10n="U" oldref="21">Syntax</paragraph>
-<paragraph role="code" id="par_id3146964" xml-lang="en-US" l10n="U" oldref="22">MIN(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3153486" xml-lang="en-US" l10n="CHG" oldref="23">
-<emph>Number1; Number2;...Number30</emph> are numerical values or ranges.</paragraph>
-<paragraph role="heading" id="hd_id3155523" xml-lang="en-US" level="3" l10n="U" oldref="24">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154734" xml-lang="en-US" l10n="U" oldref="25">
+<paragraph xml-lang="en-US" id="hd_id3154541" role="heading" level="2" l10n="U"
+oldref="19">MIN</paragraph>
+<paragraph xml-lang="en-US" id="par_id3143222" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FUNC_MIN">Returns the minimum value in a list of arguments.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id2301400" role="paragraph" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154651" role="heading" level="3" l10n="U"
+oldref="21">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146964" role="code" l10n="U" oldref="22">MIN(Number1; Number2; ...Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153486" role="paragraph" l10n="CHG" oldref="23"><emph>Number1; Number2;...Number30</emph> are numerical values or ranges.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155523" role="heading" level="3" l10n="U"
+oldref="24">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154734" role="paragraph" l10n="U" oldref="25">
 <item type="input">=MIN(A1:B100)</item> returns the smallest value in the list.</paragraph>
 </section>
 <section id="mina">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147504"><bookmark_value>MINA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MINA" id="bm_id3155752" localize="false"/>
-<paragraph role="heading" id="hd_id3147504" xml-lang="en-US" level="2" l10n="U" oldref="148">MINA</paragraph>
-<paragraph role="paragraph" id="par_id3147249" xml-lang="en-US" l10n="U" oldref="149"><ahelp hid="HID_FUNC_MINA">Returns the minimum value in a list of arguments. Here you can also enter text. The value of the text is 0.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id4294564" xml-lang="en-US" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
-<paragraph role="heading" id="hd_id3150435" xml-lang="en-US" level="3" l10n="U" oldref="150">Syntax</paragraph>
-<paragraph role="code" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="151">MINA(Value1; Value2; ... Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3146098" xml-lang="en-US" l10n="CHG" oldref="152">
-<emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
-<paragraph role="heading" id="hd_id3148743" xml-lang="en-US" level="3" l10n="U" oldref="153">Example</paragraph>
-<paragraph role="paragraph" id="par_id3147401" xml-lang="en-US" l10n="CHG" oldref="154">
+<paragraph xml-lang="en-US" id="hd_id3147504" role="heading" level="2" l10n="U"
+oldref="148">MINA</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147249" role="paragraph" l10n="U" oldref="149"><ahelp hid="HID_FUNC_MINA">Returns the minimum value in a list of arguments. Here you can also enter text. The value of the text is 0.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id4294564" role="paragraph" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150435" role="heading" level="3" l10n="U"
+oldref="150">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153336" role="code" l10n="U" oldref="151">MINA(Value1; Value2; ... Value30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146098" role="paragraph" l10n="CHG" oldref="152"><emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148743" role="heading" level="3" l10n="U"
+oldref="153">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147401" role="paragraph" l10n="CHG" oldref="154">
 <item type="input">=MINA(1;"Text";20)</item> returns 0.</paragraph>
-<paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="155">
+<paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="155">
 <item type="input">=MINA(A1:B100)</item> returns the smallest value in the list.</paragraph>
 </section>
 <section id="avedev">
@@ -133,25 +137,26 @@
 <paragraph role="paragraph" id="par_id3150373" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_FUNC_MITTELABW">Returns the average of the absolute deviations of data points from their mean.</ahelp> Displays the diffusion in a data set.</paragraph>
 <paragraph role="heading" id="hd_id3150038" xml-lang="en-US" level="3" l10n="U" oldref="29">Syntax</paragraph>
 <paragraph role="code" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="30">AVEDEV(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3157871" xml-lang="en-US" l10n="U" oldref="31">
-<emph>Number1, Number2,...Number 0</emph> are values or ranges that represent a sample. Each number can also be replaced by a reference.</paragraph>
+<paragraph role="paragraph" id="par_id3157871" xml-lang="en-US" l10n="U" oldref="31"><emph>Number1, Number2,...Number30</emph> are values or ranges that represent a sample. Each number can also be replaced by a reference.</paragraph>
 <paragraph role="heading" id="hd_id3149725" xml-lang="en-US" level="3" l10n="U" oldref="32">Example</paragraph>
 <paragraph role="paragraph" id="par_id3153122" xml-lang="en-US" l10n="U" oldref="33">
-<item type="input">=AVEDEV(A1:A50)</item>
-</paragraph>
+            <item type="input">=AVEDEV(A1:A50)</item>
+         </paragraph>
 </section>
 <section id="average">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145824"><bookmark_value>AVERAGE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERT" id="bm_id3146878" localize="false"/>
-<paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="2" l10n="U" oldref="35">AVERAGE</paragraph>
-<paragraph role="paragraph" id="par_id3150482" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FUNC_MITTELWERT">Returns the average of the arguments.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146943" xml-lang="en-US" level="3" l10n="U" oldref="37">Syntax</paragraph>
-<paragraph role="code" id="par_id3154679" xml-lang="en-US" l10n="U" oldref="38">AVERAGE(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3150741" xml-lang="en-US" l10n="CHG" oldref="39">
-<emph>Number1; Number2;...Number 0</emph> are numerical values or ranges.</paragraph>
-<paragraph role="heading" id="hd_id3153039" xml-lang="en-US" level="3" l10n="U" oldref="40">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151232" xml-lang="en-US" l10n="U" oldref="41">
+<paragraph xml-lang="en-US" id="hd_id3145824" role="heading" level="2" l10n="U"
+oldref="35">AVERAGE</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150482" role="paragraph" l10n="U" oldref="36"><ahelp hid="HID_FUNC_MITTELWERT">Returns the average of the arguments.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146943" role="heading" level="3" l10n="U"
+oldref="37">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154679" role="code" l10n="U" oldref="38">AVERAGE(Number1; Number2; ...Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150741" role="paragraph" l10n="CHG" oldref="39"><emph>Number1; Number2;...Number 0</emph> are numerical values or ranges.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153039" role="heading" level="3" l10n="U"
+oldref="40">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151232" role="paragraph" l10n="U" oldref="41">
 <item type="input">=AVERAGE(A1:A50)</item>
 </paragraph>
 </section>
@@ -159,14 +164,16 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148754"><bookmark_value>AVERAGEA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERTA" id="bm_id3149690" localize="false"/>
-<paragraph role="heading" id="hd_id3148754" xml-lang="en-US" level="2" l10n="U" oldref="157">AVERAGEA</paragraph>
-<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="U" oldref="158"><ahelp hid="HID_FUNC_MITTELWERTA">Returns the average of the arguments. The value of a text is 0.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153326" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
-<paragraph role="code" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="160">AVERAGEA(Value1; Value2; ... Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3155260" xml-lang="en-US" l10n="CHG" oldref="161">
-<emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
-<paragraph role="heading" id="hd_id3149504" xml-lang="en-US" level="3" l10n="U" oldref="162">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150864" xml-lang="en-US" l10n="U" oldref="163">
+<paragraph xml-lang="en-US" id="hd_id3148754" role="heading" level="2" l10n="U"
+oldref="157">AVERAGEA</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145138" role="paragraph" l10n="U" oldref="158"><ahelp hid="HID_FUNC_MITTELWERTA">Returns the average of the arguments. The value of a text is 0.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153326" role="heading" level="3" l10n="U"
+oldref="159">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149734" role="code" l10n="U" oldref="160">AVERAGEA(Value1; Value2; ... Value30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155260" role="paragraph" l10n="CHG" oldref="161"><emph>Value1; Value2;...Value30</emph> are values or ranges. Text has the value of 0.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149504" role="heading" level="3" l10n="U"
+oldref="162">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150864" role="paragraph" l10n="U" oldref="163">
 <item type="input">=AVERAGEA(A1:A50)</item>
 </paragraph>
 </section>
@@ -175,14 +182,16 @@
 <bookmark_value>most common value</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MODALWERT" id="bm_id3149253" localize="false"/>
-<paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" l10n="U" oldref="43">MODE</paragraph>
-<paragraph role="paragraph" id="par_id3153085" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_FUNC_MODALWERT">Returns the most common value in a data set.</ahelp> If there are several values with the same frequency, it returns the smallest value. An error occurs when a value doesn't appear twice.</paragraph>
-<paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="3" l10n="U" oldref="45">Syntax</paragraph>
-<paragraph role="code" id="par_id3155950" xml-lang="en-US" l10n="U" oldref="46">MODE(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3150337" xml-lang="en-US" l10n="CHG" oldref="47">
-<emph>Number1; Number2;...Number30</emph> are numerical values or ranges.</paragraph>
-<paragraph role="heading" id="hd_id3153571" xml-lang="en-US" level="3" l10n="U" oldref="48">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153733" xml-lang="en-US" l10n="U" oldref="49">
+<paragraph xml-lang="en-US" id="hd_id3153933" role="heading" level="2" l10n="U"
+oldref="43">MODE</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153085" role="paragraph" l10n="U" oldref="44"><ahelp hid="HID_FUNC_MODALWERT">Returns the most common value in a data set.</ahelp> If there are several values with the same frequency, it returns the smallest value. An error occurs when a value doesn't appear twice.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153003" role="heading" level="3" l10n="U"
+oldref="45">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155950" role="code" l10n="U" oldref="46">MODE(Number1; Number2; ...Number30)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150337" role="paragraph" l10n="CHG" oldref="47"><emph>Number1; Number2;...Number30</emph> are numerical values or ranges.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153571" role="heading" level="3" l10n="U"
+oldref="48">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153733" role="paragraph" l10n="U" oldref="49">
 <item type="input">=MODE(A1:A50)</item>
 </paragraph>
 </section>
@@ -191,18 +200,18 @@
 <bookmark_value>negative binomial distribution</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_NEGBINOMVERT" id="bm_id3159135" localize="false"/>
-<paragraph role="heading" id="hd_id3149879" xml-lang="en-US" level="2" l10n="U" oldref="51">NEGBINOMDIST</paragraph>
-<paragraph role="paragraph" id="par_id3155437" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_FUNC_NEGBINOMVERT">Returns the negative binomial distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145351" xml-lang="en-US" level="3" l10n="U" oldref="53">Syntax</paragraph>
-<paragraph role="code" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="54">NEGBINOMDIST(X; R; SP)</paragraph>
-<paragraph role="paragraph" id="par_id3153044" xml-lang="en-US" l10n="U" oldref="55">
-<emph>X</emph> represents the value returned for unsuccessful tests.</paragraph>
-<paragraph role="paragraph" id="par_id3151018" xml-lang="en-US" l10n="U" oldref="56">
-<emph>R</emph> represents the value returned for successful tests.</paragraph>
-<paragraph role="paragraph" id="par_id3148878" xml-lang="en-US" l10n="U" oldref="57">
-<emph>SP</emph> is the probability of the success of an attempt.</paragraph>
-<paragraph role="heading" id="hd_id3149539" xml-lang="en-US" level="3" l10n="U" oldref="58">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148770" xml-lang="en-US" l10n="U" oldref="59">
+<paragraph xml-lang="en-US" id="hd_id3149879" role="heading" level="2" l10n="U"
+oldref="51">NEGBINOMDIST</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155437" role="paragraph" l10n="U" oldref="52"><ahelp hid="HID_FUNC_NEGBINOMVERT">Returns the negative binomial distribution.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145351" role="heading" level="3" l10n="U"
+oldref="53">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150935" role="code" l10n="U" oldref="54">NEGBINOMDIST(X; R; SP)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153044" role="paragraph" l10n="U" oldref="55"><emph>X</emph> represents the value returned for unsuccessful tests.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151018" role="paragraph" l10n="U" oldref="56"><emph>R</emph> represents the value returned for successful tests.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148878" role="paragraph" l10n="U" oldref="57"><emph>SP</emph> is the probability of the success of an attempt.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149539" role="heading" level="3" l10n="U"
+oldref="58">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148770" role="paragraph" l10n="U" oldref="59">
 <item type="input">=NEGBINOMDIST(1;1;0.5)</item> returns 0.25.</paragraph>
 </section>
 <section id="norminv">
@@ -210,18 +219,18 @@
 <bookmark_value>normal distribution;inverse of</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMINV" id="bm_id3149396" localize="false"/>
-<paragraph role="heading" id="hd_id3155516" xml-lang="en-US" level="2" l10n="U" oldref="61">NORMINV</paragraph>
-<paragraph role="paragraph" id="par_id3154634" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_FUNC_NORMINV">Returns the inverse of the normal cumulative distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153227" xml-lang="en-US" level="3" l10n="U" oldref="63">Syntax</paragraph>
-<paragraph role="code" id="par_id3147534" xml-lang="en-US" l10n="U" oldref="64">NORMINV(Number; Mean; StDev)</paragraph>
-<paragraph role="paragraph" id="par_id3154950" xml-lang="en-US" l10n="U" oldref="65">
-<emph>Number</emph> represents the probability value used to determine the inverse normal distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3150690" xml-lang="en-US" l10n="U" oldref="66">
-<emph>Mean</emph> represents the mean value in the normal distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3148594" xml-lang="en-US" l10n="U" oldref="67">
-<emph>StDev</emph> represents the standard deviation of the normal distribution.</paragraph>
-<paragraph role="heading" id="hd_id3155822" xml-lang="en-US" level="3" l10n="U" oldref="68">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153921" xml-lang="en-US" l10n="CHG" oldref="69">
+<paragraph xml-lang="en-US" id="hd_id3155516" role="heading" level="2" l10n="U"
+oldref="61">NORMINV</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154634" role="paragraph" l10n="U" oldref="62"><ahelp hid="HID_FUNC_NORMINV">Returns the inverse of the normal cumulative distribution.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153227" role="heading" level="3" l10n="U"
+oldref="63">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147534" role="code" l10n="U" oldref="64">NORMINV(Number; Mean; StDev)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154950" role="paragraph" l10n="U" oldref="65"><emph>Number</emph> represents the probability value used to determine the inverse normal distribution.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150690" role="paragraph" l10n="U" oldref="66"><emph>Mean</emph> represents the mean value in the normal distribution.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148594" role="paragraph" l10n="U" oldref="67"><emph>StDev</emph> represents the standard deviation of the normal distribution.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155822" role="heading" level="3" l10n="U"
+oldref="68">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153921" role="paragraph" l10n="CHG" oldref="69">
 <item type="input">=NORMINV(0.9;63;5)</item> returns 69.41. If the average egg weighs 63 grams with a standard deviation of 5, then there will be 90% probability that the egg will not be heavier than 69.41g grams.</paragraph>
 </section>
 <section id="normdist">
@@ -229,122 +238,126 @@
 <bookmark_value>density function</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMVERT" id="bm_id3147484" localize="false"/>
-<paragraph role="heading" id="hd_id3153722" xml-lang="en-US" level="2" l10n="U" oldref="71">NORMDIST</paragraph>
-<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="HID_FUNC_NORMVERT">Returns the density function or the normal cumulative distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3083282" xml-lang="en-US" level="3" l10n="U" oldref="73">Syntax</paragraph>
-<paragraph role="code" id="par_id3150613" xml-lang="en-US" l10n="U" oldref="74">NORMDIST(Number; Mean; StDev; C)</paragraph>
-<paragraph role="paragraph" id="par_id3149820" xml-lang="en-US" l10n="U" oldref="75">
-<emph>Number</emph> is the value of the distribution based on which the normal distribution is to be calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3146063" xml-lang="en-US" l10n="U" oldref="76">
-<emph>Mean</emph> is the mean value of the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3156295" xml-lang="en-US" l10n="U" oldref="77">
-<emph>StDev</emph> is the standard deviation of the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3145080" xml-lang="en-US" l10n="U" oldref="78">
-<emph>C</emph> = 0 calculates the density function; <emph>C</emph> = 1 calculates the distribution.</paragraph>
-<paragraph role="heading" id="hd_id3152972" xml-lang="en-US" level="3" l10n="U" oldref="79">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="80">
+<paragraph xml-lang="en-US" id="hd_id3153722" role="heading" level="2" l10n="U"
+oldref="71">NORMDIST</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150386" role="paragraph" l10n="CHG" oldref="72"><ahelp hid="HID_FUNC_NORMVERT">Returns the density function or the normal cumulative distribution.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3083282" role="heading" level="3" l10n="U"
+oldref="73">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150613" role="code" l10n="U" oldref="74">NORMDIST(Number; Mean; StDev; C)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149820" role="paragraph" l10n="U" oldref="75"><emph>Number</emph> is the value of the distribution based on which the normal distribution is to be calculated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146063" role="paragraph" l10n="U" oldref="76"><emph>Mean</emph> is the mean value of the distribution.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156295" role="paragraph" l10n="U" oldref="77"><emph>StDev</emph> is the standard deviation of the distribution.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145080" role="paragraph" l10n="U" oldref="78"><emph>C</emph> is optional. <emph>C</emph> = 0 calculates the density function, <emph>C</emph> = 1 calculates the distribution.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152972" role="heading" level="3" l10n="U"
+oldref="79">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149283" role="paragraph" l10n="CHG" oldref="80">
 <item type="input">=NORMDIST(70;63;5;0)</item> returns 0.03.</paragraph>
-<paragraph role="paragraph" id="par_id3149448" xml-lang="en-US" l10n="CHG" oldref="81">
+<paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="CHG" oldref="81">
 <item type="input">=NORMDIST(70;63;5;1)</item> returns 0.92.</paragraph>
 </section>
 <section id="pearson">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152934"><bookmark_value>PEARSON function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_PEARSON" id="bm_id3156103" localize="false"/>
-<paragraph role="heading" id="hd_id3152934" xml-lang="en-US" level="2" l10n="U" oldref="83">PEARSON</paragraph>
-<paragraph role="paragraph" id="par_id3153216" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="HID_FUNC_PEARSON">Returns the Pearson product moment correlation coefficient r.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147081" xml-lang="en-US" level="3" l10n="U" oldref="85">Syntax</paragraph>
-<paragraph role="code" id="par_id3156133" xml-lang="en-US" l10n="U" oldref="86">PEARSON(Data1; Data2)</paragraph>
-<paragraph role="paragraph" id="par_id3151272" xml-lang="en-US" l10n="U" oldref="87">
-<emph>Data1</emph> represents the array of the first data set.</paragraph>
-<paragraph role="paragraph" id="par_id3153279" xml-lang="en-US" l10n="U" oldref="88">
-<emph>Data2</emph> represents the array of the second data set.</paragraph>
-<paragraph role="heading" id="hd_id3147567" xml-lang="en-US" level="3" l10n="U" oldref="89">Example</paragraph>
-<paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="90">
+<paragraph xml-lang="en-US" id="hd_id3152934" role="heading" level="2" l10n="U"
+oldref="83">PEARSON</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153216" role="paragraph" l10n="U" oldref="84"><ahelp hid="HID_FUNC_PEARSON">Returns the Pearson product moment correlation coefficient r.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147081" role="heading" level="3" l10n="U"
+oldref="85">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156133" role="code" l10n="U" oldref="86">PEARSON(Data1; Data2)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151272" role="paragraph" l10n="U" oldref="87"><emph>Data1</emph> represents the array of the first data set.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153279" role="paragraph" l10n="U" oldref="88"><emph>Data2</emph> represents the array of the second data set.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147567" role="heading" level="3" l10n="U"
+oldref="89">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151187" role="paragraph" l10n="U" oldref="90">
 <item type="input">=PEARSON(A1:A30;B1:B30)</item> returns the Pearson correlation coefficient of both data sets.</paragraph>
 </section>
 <section id="phi">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152806"><bookmark_value>PHI function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_PHI" id="bm_id3153757" localize="false"/>
-<paragraph role="heading" id="hd_id3152806" xml-lang="en-US" level="2" l10n="U" oldref="92">PHI</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="HID_FUNC_PHI">Returns the values of the distribution function for a standard normal distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154748" xml-lang="en-US" level="3" l10n="U" oldref="94">Syntax</paragraph>
-<paragraph role="code" id="par_id3149976" xml-lang="en-US" l10n="U" oldref="95">PHI(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3156108" xml-lang="en-US" l10n="U" oldref="96">
-<emph>Number</emph> represents the value based on which the standard normal distribution is calculated.</paragraph>
-<paragraph role="heading" id="hd_id3153621" xml-lang="en-US" level="3" l10n="U" oldref="97">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155849" xml-lang="en-US" l10n="CHG" oldref="98">
+<paragraph xml-lang="en-US" id="hd_id3152806" role="heading" level="2" l10n="U"
+oldref="92">PHI</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="93"><ahelp hid="HID_FUNC_PHI">Returns the values of the distribution function for a standard normal distribution.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154748" role="heading" level="3" l10n="U"
+oldref="94">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149976" role="code" l10n="U" oldref="95">PHI(Number)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156108" role="paragraph" l10n="U" oldref="96"><emph>Number</emph> represents the value based on which the standard normal distribution is calculated.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153621" role="heading" level="3" l10n="U"
+oldref="97">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155849" role="paragraph" l10n="CHG" oldref="98">
 <item type="input">=PHI(2.25) </item>= 0.03</paragraph>
-<paragraph role="paragraph" id="par_id3143236" xml-lang="en-US" l10n="CHG" oldref="99">
+<paragraph xml-lang="en-US" id="par_id3143236" role="paragraph" l10n="CHG" oldref="99">
 <item type="input">=PHI(-2.25)</item> = 0.03</paragraph>
-<paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="CHG" oldref="100">
+<paragraph xml-lang="en-US" id="par_id3149286" role="paragraph" l10n="CHG" oldref="100">
 <item type="input">=PHI(0)</item> = 0.4</paragraph>
 </section>
 <section id="poisson">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153985"><bookmark_value>POISSON function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_POISSON" id="bm_id3156011" localize="false"/>
-<paragraph role="heading" id="hd_id3153985" xml-lang="en-US" level="2" oldref="102">POISSON</paragraph>
-<paragraph role="paragraph" id="par_id3154298" xml-lang="en-US" l10n="U" oldref="103"><ahelp hid="HID_FUNC_POISSON">Returns the Poisson distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159183" xml-lang="en-US" level="3" l10n="U" oldref="104">Syntax</paragraph>
-<paragraph role="code" id="par_id3146093" xml-lang="en-US" l10n="U" oldref="105">POISSON(Number; Mean; C)</paragraph>
-<paragraph role="paragraph" id="par_id3147253" xml-lang="en-US" l10n="U" oldref="106">
-<emph>Number</emph> represents the value based on which the Poisson distribution is calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="107">
-<emph>Mean</emph> represents the middle value of the Poisson distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3149200" xml-lang="en-US" l10n="U" oldref="108">
-<emph>C</emph> = 0 calculates the density function; <emph>C</emph> = 1 calculates the distribution.</paragraph>
-<paragraph role="heading" id="hd_id3159347" xml-lang="en-US" level="3" l10n="U" oldref="109">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="U" oldref="110">
+<paragraph xml-lang="en-US" id="hd_id3153985" role="heading" level="2" oldref="102">POISSON</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154298" role="paragraph" l10n="U" oldref="103"><ahelp hid="HID_FUNC_POISSON">Returns the Poisson distribution.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159183" role="heading" level="3" l10n="U"
+oldref="104">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146093" role="code" l10n="U" oldref="105">POISSON(Number; Mean; C)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147253" role="paragraph" l10n="U" oldref="106"><emph>Number</emph> represents the value based on which the Poisson distribution is calculated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151177" role="paragraph" l10n="U" oldref="107"><emph>Mean</emph> represents the middle value of the Poisson distribution.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149200" role="paragraph" l10n="CHG" oldref="108"><emph>C</emph> (optional) = 0 or False calculates the density function; <emph>C</emph> = 1 or True calculates the distribution. When omitted, the default value True is inserted when you save the document, for best compatibility with other programs and older versions of %PRODUCTNAME.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159347" role="heading" level="3" l10n="U"
+oldref="109">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150113" role="paragraph" l10n="U" oldref="110">
 <item type="input">=POISSON(60;50;1)</item> returns 0.93.</paragraph>
 </section>
 <section id="percentile">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153100"><bookmark_value>PERCENTILE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTIL" id="bm_id3155394" localize="false"/>
-<paragraph role="heading" id="hd_id3153100" xml-lang="en-US" level="2" l10n="U" oldref="112">PERCENTILE</paragraph>
-<paragraph role="paragraph" id="par_id3154940" xml-lang="en-US" l10n="U" oldref="113"><ahelp hid="HID_FUNC_QUANTIL">Returns the alpha-percentile of data values in an array.</ahelp> A percentile returns the scale value for a data series which goes from the smallest (Alpha=0) to the largest value (alpha=1) of a data series. For <item type="literal">Alpha</item> = 25%, the percentile means the first quartile; <item type="literal">Alpha</item> = 50% is the MEDIAN.</paragraph>
-<paragraph role="heading" id="hd_id3150531" xml-lang="en-US" level="3" l10n="U" oldref="114">Syntax</paragraph>
-<paragraph role="code" id="par_id3148813" xml-lang="en-US" l10n="U" oldref="115">PERCENTILE(Data; Alpha)</paragraph>
-<paragraph role="paragraph" id="par_id3153054" xml-lang="en-US" l10n="U" oldref="116">
-<emph>Data</emph> represents the array of data.</paragraph>
-<paragraph role="paragraph" id="par_id3154212" xml-lang="en-US" l10n="U" oldref="117">
-<emph>Alpha</emph> represents the percentage of the scale between 0 and 1.</paragraph>
-<paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="3" l10n="U" oldref="118">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="CHG" oldref="119">
+<paragraph xml-lang="en-US" id="hd_id3153100" role="heading" level="2" l10n="U"
+oldref="112">PERCENTILE</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154940" role="paragraph" l10n="U" oldref="113"><ahelp hid="HID_FUNC_QUANTIL">Returns the alpha-percentile of data values in an array.</ahelp> A percentile returns the scale value for a data series which goes from the smallest (Alpha=0) to the largest value (alpha=1) of a data series. For <item type="literal">Alpha</item> = 25%, the percentile means the first quartile; <item type="literal">Alpha</item> = 50% is the MEDIAN.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150531" role="heading" level="3" l10n="U"
+oldref="114">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148813" role="code" l10n="U" oldref="115">PERCENTILE(Data; Alpha)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153054" role="paragraph" l10n="U" oldref="116"><emph>Data</emph> represents the array of data.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154212" role="paragraph" l10n="U" oldref="117"><emph>Alpha</emph> represents the percentage of the scale between 0 and 1.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154290" role="heading" level="3" l10n="U"
+oldref="118">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159147" role="paragraph" l10n="CHG" oldref="119">
 <item type="input">=PERCENTILE(A1:A50;0.1)</item> represents the value in the data set, which equals 10% of the total data scale in A1:A50.</paragraph>
 </section>
 <section id="percentrank">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148807"><bookmark_value>PERCENTRANK function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTILSRANG" id="bm_id3154902" localize="false"/>
-<paragraph role="heading" id="hd_id3148807" xml-lang="en-US" level="2" l10n="U" oldref="121">PERCENTRANK</paragraph>
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="HID_FUNC_QUANTILSRANG">Returns the percentage rank of a value in a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147512" xml-lang="en-US" level="3" l10n="U" oldref="123">Syntax</paragraph>
-<paragraph role="code" id="par_id3147238" xml-lang="en-US" l10n="U" oldref="124">PERCENTRANK(Data; Value)</paragraph>
-<paragraph role="paragraph" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="125">
-<emph>Data</emph> represents the array of data in the sample.</paragraph>
-<paragraph role="paragraph" id="par_id3148475" xml-lang="en-US" l10n="U" oldref="126">
-<emph>Value</emph> represents the value whose percentile rank must be determined.</paragraph>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="3" l10n="U" oldref="127">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149163" xml-lang="en-US" l10n="U" oldref="128">
+<paragraph xml-lang="en-US" id="hd_id3148807" role="heading" level="2" l10n="U"
+oldref="121">PERCENTRANK</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="122"><ahelp hid="HID_FUNC_QUANTILSRANG">Returns the percentage rank of a value in a sample.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147512" role="heading" level="3" l10n="U"
+oldref="123">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147238" role="code" l10n="U" oldref="124">PERCENTRANK(Data; Value)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154266" role="paragraph" l10n="U" oldref="125"><emph>Data</emph> represents the array of data in the sample.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148475" role="paragraph" l10n="U" oldref="126"><emph>Value</emph> represents the value whose percentile rank must be determined.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="3" l10n="U"
+oldref="127">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149163" role="paragraph" l10n="U" oldref="128">
 <item type="input">=PERCENTRANK(A1:A50;50)</item> returns the percentage rank of the value 50 from the total range of all values found in A1:A50. If 50 falls outside the total range, an error message will appear.</paragraph>
 </section>
 <section id="quartile">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3166442"><bookmark_value>QUARTILE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUARTILE" id="bm_id3150709" localize="false"/>
-<paragraph role="heading" id="hd_id3166442" xml-lang="en-US" level="2" l10n="U" oldref="130">QUARTILE</paragraph>
-<paragraph role="paragraph" id="par_id3146958" xml-lang="en-US" l10n="U" oldref="131"><ahelp hid="HID_FUNC_QUARTILE">Returns the quartile of a data set.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152942" xml-lang="en-US" level="3" l10n="U" oldref="132">Syntax</paragraph>
-<paragraph role="code" id="par_id3153684" xml-lang="en-US" l10n="U" oldref="133">QUARTILE(Data; Type)</paragraph>
-<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="134">
-<emph>Data</emph> represents the array of data in the sample.</paragraph>
-<paragraph role="paragraph" id="par_id3155589" xml-lang="en-US" l10n="U" oldref="135">
-<emph>Type</emph> represents the type of quartile. (0 = MIN, 1 = 25%, 2 = 50% (MEDIAN), 3 = 75% and 4 = MAX.)</paragraph>
-<paragraph role="heading" id="hd_id3149103" xml-lang="en-US" level="3" l10n="U" oldref="136">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159276" xml-lang="en-US" l10n="CHG" oldref="137">
+<paragraph xml-lang="en-US" id="hd_id3166442" role="heading" level="2" l10n="U"
+oldref="130">QUARTILE</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146958" role="paragraph" l10n="U" oldref="131"><ahelp hid="HID_FUNC_QUARTILE">Returns the quartile of a data set.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152942" role="heading" level="3" l10n="U"
+oldref="132">Syntax</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153684" role="code" l10n="U" oldref="133">QUARTILE(Data; Type)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153387" role="paragraph" l10n="U" oldref="134"><emph>Data</emph> represents the array of data in the sample.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155589" role="paragraph" l10n="U" oldref="135"><emph>Type</emph> represents the type of quartile. (0 = MIN, 1 = 25%, 2 = 50% (MEDIAN), 3 = 75% and 4 = MAX.)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149103" role="heading" level="3" l10n="U"
+oldref="136">Example</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159276" role="paragraph" l10n="CHG" oldref="137">
 <item type="input">=QUARTILE(A1:A50;2)</item> returns the value of which 50% of the scale corresponds to the lowest to highest values in the range A1:A50.</paragraph>
 </section>
 </sort>
@@ -352,4 +365,4 @@
 <embed href="text/scalc/01/04060100.xhp#drking"/>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060185.xhp b/helpcontent2/source/text/scalc/01/04060185.xhp
index a01c0d71de..501c0f2ac1 100755
--- a/helpcontent2/source/text/scalc/01/04060185.xhp
+++ b/helpcontent2/source/text/scalc/01/04060185.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060185.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,427 +32,500 @@
  
 	
 <meta>
-<topic id="textscalc0104060185xml" indexer="include">
-<title id="tit" xml-lang="en-US">Statistical Functions Part Five</title>
-<filename>/text/scalc/01/04060185.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3147072" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="rz"><link href="text/scalc/01/04060185.xhp" name="Statistical Functions Part Five">Statistical Functions Part Five</link>
+      <topic id="textscalc0104060185xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Statistical Functions Part Five</title>
+         <filename>/text/scalc/01/04060185.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3147072" role="heading" level="1" l10n="U" oldref="1"><variable id="rz"><link href="text/scalc/01/04060185.xhp" name="Statistical Functions Part Five">Statistical Functions Part Five</link>
 </variable></paragraph>
 <sort order="asc">
 <section id="rank">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155071"><bookmark_value>RANK function</bookmark_value>
-<bookmark_value>numbers;determining ranks</bookmark_value>
+         <bookmark_value>numbers;determining ranks</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_RANG" id="bm_id3146778" localize="false"/>
-<paragraph role="heading" id="hd_id3155071" xml-lang="en-US" level="2" l10n="U" oldref="2">RANK</paragraph>
-<paragraph role="paragraph" id="par_id3153976" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_RANG">Returns the rank of a number in a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159206" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
-<paragraph role="code" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="5">RANK(Value; Data; Type)</paragraph>
-<paragraph role="paragraph" id="par_id3154543" xml-lang="en-US" l10n="U" oldref="6">
-<emph>Value</emph> is the value, whose rank is to be determined.</paragraph>
-<paragraph role="paragraph" id="par_id3149130" xml-lang="en-US" l10n="U" oldref="7">
-<emph>Data</emph> is the array or range of data in the sample.</paragraph>
-<paragraph role="paragraph" id="par_id3150215" xml-lang="en-US" l10n="CHG" oldref="8">
-<emph>Type</emph> (optional) is the sequence order.</paragraph>
-<paragraph role="paragraph" id="par_id9305398" xml-lang="en-US" l10n="NEW">Type = 0 means descending from the last item of the array to the first (this is the default), </paragraph>
-<paragraph role="paragraph" id="par_id9996948" xml-lang="en-US" l10n="NEW">Type = 1 means ascending from the first item of the range to the last.</paragraph>
-<paragraph role="heading" id="hd_id3143223" xml-lang="en-US" level="3" l10n="U" oldref="9">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155919" xml-lang="en-US" l10n="U" oldref="10">
-<item type="input">=RANK(A10;A1:A50)</item> returns the ranking of the value in A10 in value range A1:A50. If <item type="literal">Value</item> does not exist within the range an error message is displayed.</paragraph>
-</section>
-<section id="skew">
+<paragraph xml-lang="en-US" id="hd_id3155071" role="heading" level="2" l10n="U" oldref="2">RANK</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153976" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_FUNC_RANG">Returns the rank of a number in a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159206" role="heading" level="3" l10n="U" oldref="4">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153250" role="code" l10n="U" oldref="5">RANK(Value; Data; Type)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154543" role="paragraph" l10n="U" oldref="6">
+            <emph>Value</emph> is the value, whose rank is to be determined.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149130" role="paragraph" l10n="U" oldref="7">
+            <emph>Data</emph> is the array or range of data in the sample.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150215" role="paragraph" l10n="CHG" oldref="8">
+            <emph>Type</emph> (optional) is the sequence order.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9305398" role="paragraph" l10n="NEW">Type = 0 means descending from the last item of the array to the first (this is the default), </paragraph>
+         <paragraph xml-lang="en-US" id="par_id9996948" role="paragraph" l10n="NEW">Type = 1 means ascending from the first item of the range to the last.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3143223" role="heading" level="3" l10n="U" oldref="9">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155919" role="paragraph" l10n="U" oldref="10">
+            <item type="input">=RANK(A10;A1:A50)</item> returns the ranking of the value in A10 in value range A1:A50. If <item type="literal">Value</item> does not exist within the range an error message is displayed.</paragraph>
+      </section>
+      <section id="skew">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153556"><bookmark_value>SKEW function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SCHIEFE" id="bm_id3153801" localize="false"/>
-<paragraph role="heading" id="hd_id3153556" xml-lang="en-US" level="2" l10n="U" oldref="12">SKEW</paragraph>
-<paragraph role="paragraph" id="par_id3153485" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_FUNC_SCHIEFE">Returns the skewness of a distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154733" xml-lang="en-US" level="3" l10n="U" oldref="14">Syntax</paragraph>
-<paragraph role="code" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="15">SKEW(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3155757" xml-lang="en-US" l10n="CHG" oldref="16">
-<emph>Number1, Number2...Number30</emph> are numerical values or ranges.</paragraph>
-<paragraph role="heading" id="hd_id3153297" xml-lang="en-US" level="3" l10n="U" oldref="17">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145118" xml-lang="en-US" l10n="U" oldref="18">
-<item type="input">=SKEW(A1:A50)</item> calculates the value of skew for the data referenced.</paragraph>
-</section>
-<section id="forecast">
+<paragraph xml-lang="en-US" id="hd_id3153556" role="heading" level="2" l10n="U"
+                    oldref="12">SKEW</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153485" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_FUNC_SCHIEFE">Returns the skewness of a distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154733" role="heading" level="3" l10n="U"
+                    oldref="14">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151191" role="code" l10n="U" oldref="15">SKEW(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155757" role="paragraph" l10n="CHG" oldref="16">
+            <emph>Number1, Number2...Number30</emph> are numerical values or ranges.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153297" role="heading" level="3" l10n="U"
+                    oldref="17">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph" l10n="U" oldref="18">
+            <item type="input">=SKEW(A1:A50)</item> calculates the value of skew for the data referenced.</paragraph>
+      </section>
+      <section id="forecast">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149051"><bookmark_value>regression lines;FORECAST function</bookmark_value>
-<bookmark_value>extrapolations</bookmark_value>
-<bookmark_value>FORECAST function</bookmark_value>
+         <bookmark_value>extrapolations</bookmark_value>
+         <bookmark_value>FORECAST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SCHAETZER" id="bm_id3146102" localize="false"/><comment>mw made "regression lines" a two level entry</comment>
-<paragraph role="heading" id="hd_id3149051" xml-lang="en-US" level="2" l10n="U" oldref="20">FORECAST</paragraph>
-<paragraph role="paragraph" id="par_id3153290" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_FUNC_SCHAETZER">Extrapolates future values based on existing x and y values.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151343" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
-<paragraph role="code" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="23">FORECAST(Value; DataY; DataX)</paragraph>
-<paragraph role="paragraph" id="par_id3148743" xml-lang="en-US" l10n="U" oldref="24">
-<emph>Value</emph> is the x value, for which the y value on the linear regression is to be returned.</paragraph>
-<paragraph role="paragraph" id="par_id3146325" xml-lang="en-US" l10n="U" oldref="25">
-<emph>DataY</emph> is the array or range of known y's.</paragraph>
-<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="26">
-<emph>DataX</emph> is the array or range of known x's.</paragraph>
-<paragraph role="heading" id="hd_id3147416" xml-lang="en-US" level="3" l10n="U" oldref="27">Example</paragraph>
-<paragraph role="paragraph" id="par_id3157874" xml-lang="en-US" l10n="U" oldref="28">
-<item type="input">=FORECAST(50;A1:A50;B1;B50)</item> returns the Y value expected for the X value of 50 if the X and Y values in both references are linked by a linear trend.</paragraph>
-</section>
-<section id="stdev">
+<paragraph xml-lang="en-US" id="hd_id3149051" role="heading" level="2" l10n="U"
+                    oldref="20">FORECAST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153290" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_FUNC_SCHAETZER">Extrapolates future values based on existing x and y values.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151343" role="heading" level="3" l10n="U"
+                    oldref="22">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147404" role="code" l10n="U" oldref="23">FORECAST(Value; DataY; DataX)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148743" role="paragraph" l10n="U" oldref="24">
+            <emph>Value</emph> is the x value, for which the y value on the linear regression is to be returned.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146325" role="paragraph" l10n="U" oldref="25">
+            <emph>DataY</emph> is the array or range of known y's.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="26">
+            <emph>DataX</emph> is the array or range of known x's.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147416" role="heading" level="3" l10n="U"
+                    oldref="27">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157874" role="paragraph" l10n="U" oldref="28">
+            <item type="input">=FORECAST(50;A1:A50;B1;B50)</item> returns the Y value expected for the X value of 50 if the X and Y values in both references are linked by a linear trend.</paragraph>
+      </section>
+      <section id="stdev">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149143"><bookmark_value>STDEV function</bookmark_value>
-<bookmark_value>standard deviations in statistics;based on a sample</bookmark_value>
+         <bookmark_value>standard deviations in statistics;based on a sample</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STABW" id="bm_id3153121" localize="false"/>
-<paragraph role="heading" id="hd_id3149143" xml-lang="en-US" level="2" l10n="U" oldref="30">STDEV</paragraph>
-<paragraph role="paragraph" id="par_id3146888" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_FUNC_STABW">Estimates the standard deviation based on a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="3" l10n="U" oldref="32">Syntax</paragraph>
-<paragraph role="code" id="par_id3149946" xml-lang="en-US" l10n="U" oldref="33">STDEV(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3157904" xml-lang="en-US" l10n="CHG" oldref="34">
-<emph>Number1, Number2, ... Number30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
-<paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="35">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149434" xml-lang="en-US" l10n="U" oldref="36">
-<item type="input">=STDEV(A1:A50)</item> returns the estimated standard deviation based on the data referenced.</paragraph>
-</section>
-<section id="stdeva">
+<paragraph xml-lang="en-US" id="hd_id3149143" role="heading" level="2" l10n="U"
+                    oldref="30">STDEV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146888" role="paragraph" l10n="U" oldref="31"><ahelp hid="HID_FUNC_STABW">Estimates the standard deviation based on a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146815" role="heading" level="3" l10n="U"
+                    oldref="32">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149946" role="code" l10n="U" oldref="33">STDEV(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157904" role="paragraph" l10n="CHG" oldref="34">
+            <emph>Number1, Number2, ... Number30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150650" role="heading" level="3" l10n="U"
+                    oldref="35">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149434" role="paragraph" l10n="U" oldref="36">
+            <item type="input">=STDEV(A1:A50)</item> returns the estimated standard deviation based on the data referenced.</paragraph>
+      </section>
+      <section id="stdeva">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3144745"><bookmark_value>STDEVA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STABWA" id="bm_id3154846" localize="false"/>
-<paragraph role="heading" id="hd_id3144745" xml-lang="en-US" level="2" l10n="U" oldref="186">STDEVA</paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="187"><ahelp hid="HID_FUNC_STABWA">Calculates the standard deviation of an estimation based on a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148884" xml-lang="en-US" level="3" l10n="U" oldref="188">Syntax</paragraph>
-<paragraph role="code" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="189">STDEVA(Value1;Value2;...Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3154547" xml-lang="en-US" l10n="CHG" oldref="190">
-<emph>Value1, Value2, ...Value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
-<paragraph role="heading" id="hd_id3155829" xml-lang="en-US" level="3" l10n="U" oldref="191">Example</paragraph>
-<paragraph role="paragraph" id="par_id3148581" xml-lang="en-US" l10n="U" oldref="192">
-<item type="input">=STDEVA(A1:A50)</item> returns the estimated standard deviation based on the data referenced.</paragraph>
-</section>
-<section id="stdevp">
+<paragraph xml-lang="en-US" id="hd_id3144745" role="heading" level="2" l10n="U"
+                    oldref="186">STDEVA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="187"><ahelp hid="HID_FUNC_STABWA">Calculates the standard deviation of an estimation based on a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3148884" role="heading" level="3" l10n="U"
+                    oldref="188">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147422" role="code" l10n="U" oldref="189">STDEVA(Value1;Value2;...Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154547" role="paragraph" l10n="CHG" oldref="190">
+            <emph>Value1, Value2, ...Value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155829" role="heading" level="3" l10n="U"
+                    oldref="191">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148581" role="paragraph" l10n="U" oldref="192">
+            <item type="input">=STDEVA(A1:A50)</item> returns the estimated standard deviation based on the data referenced.</paragraph>
+      </section>
+      <section id="stdevp">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149734"><bookmark_value>STDEVP function</bookmark_value>
-<bookmark_value>standard deviations in statistics;based on a population</bookmark_value>
+         <bookmark_value>standard deviations in statistics;based on a population</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STABWN" id="bm_id3146139" localize="false"/>
-<paragraph role="heading" id="hd_id3149734" xml-lang="en-US" level="2" l10n="U" oldref="38">STDEVP</paragraph>
-<paragraph role="paragraph" id="par_id3149187" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_FUNC_STABWN">Calculates the standard deviation based on the entire population.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154387" xml-lang="en-US" level="3" l10n="U" oldref="40">Syntax</paragraph>
-<paragraph role="code" id="par_id3154392" xml-lang="en-US" l10n="U" oldref="41">STDEVP(Number1;Number2;...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3155261" xml-lang="en-US" l10n="CHG" oldref="42">
-<emph>Number 1,Number 2,...Number 30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
-<paragraph role="heading" id="hd_id3145591" xml-lang="en-US" level="3" l10n="U" oldref="43">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153933" xml-lang="en-US" l10n="U" oldref="44">
-<item type="input">=STDEVP(A1:A50)</item> returns a standard deviation of the data referenced.</paragraph>
-</section>
-<section id="stdevpa">
+<paragraph xml-lang="en-US" id="hd_id3149734" role="heading" level="2" l10n="U"
+                    oldref="38">STDEVP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149187" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_FUNC_STABWN">Calculates the standard deviation based on the entire population.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154387" role="heading" level="3" l10n="U"
+                    oldref="40">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154392" role="code" l10n="U" oldref="41">STDEVP(Number1;Number2;...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155261" role="paragraph" l10n="CHG" oldref="42">
+            <emph>Number 1,Number 2,...Number 30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145591" role="heading" level="3" l10n="U"
+                    oldref="43">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153933" role="paragraph" l10n="U" oldref="44">
+            <item type="input">=STDEVP(A1:A50)</item> returns a standard deviation of the data referenced.</paragraph>
+      </section>
+      <section id="stdevpa">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154522"><bookmark_value>STDEVPA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STABWNA" id="bm_id3150902" localize="false"/>
-<paragraph role="heading" id="hd_id3154522" xml-lang="en-US" level="2" l10n="U" oldref="194">STDEVPA</paragraph>
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="195"><ahelp hid="HID_FUNC_STABWNA">Calculates the standard deviation based on the entire population.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155950" xml-lang="en-US" level="3" l10n="U" oldref="196">Syntax</paragraph>
-<paragraph role="code" id="par_id3146851" xml-lang="en-US" l10n="U" oldref="197">STDEVPA(Value1;Value2;...Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3153109" xml-lang="en-US" l10n="CHG" oldref="198">
-<emph>Value1,value2,...value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
-<paragraph role="heading" id="hd_id3154506" xml-lang="en-US" level="3" l10n="U" oldref="199">Example</paragraph>
-<paragraph role="paragraph" id="par_id3145163" xml-lang="en-US" l10n="U" oldref="200">
-<item type="input">=STDEVPA(A1:A50)</item> returns the standard deviation of the data referenced.</paragraph>
-</section>
-<section id="standardize">
+<paragraph xml-lang="en-US" id="hd_id3154522" role="heading" level="2" l10n="U"
+                    oldref="194">STDEVPA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="U" oldref="195"><ahelp hid="HID_FUNC_STABWNA">Calculates the standard deviation based on the entire population.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155950" role="heading" level="3" l10n="U"
+                    oldref="196">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146851" role="code" l10n="U" oldref="197">STDEVPA(Value1;Value2;...Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153109" role="paragraph" l10n="CHG" oldref="198">
+            <emph>Value1,value2,...value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154506" role="heading" level="3" l10n="U"
+                    oldref="199">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145163" role="paragraph" l10n="U" oldref="200">
+            <item type="input">=STDEVPA(A1:A50)</item> returns the standard deviation of the data referenced.</paragraph>
+      </section>
+      <section id="standardize">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155928"><bookmark_value>STANDARDIZE function</bookmark_value>
-<bookmark_value>converting;random variables, into normalized values</bookmark_value>
+         <bookmark_value>converting;random variables, into normalized values</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STANDARDISIERUNG" id="bm_id3148764" localize="false"/>
-<paragraph role="heading" id="hd_id3155928" xml-lang="en-US" level="2" l10n="U" oldref="46">STANDARDIZE</paragraph>
-<paragraph role="paragraph" id="par_id3149883" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_FUNC_STANDARDISIERUNG">Converts a random variable to a normalized value.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154330" xml-lang="en-US" level="3" l10n="U" oldref="48">Syntax</paragraph>
-<paragraph role="code" id="par_id3150132" xml-lang="en-US" l10n="U" oldref="49">STANDARDIZE(Number; Mean; StDev)</paragraph>
-<paragraph role="paragraph" id="par_id3159139" xml-lang="en-US" l10n="U" oldref="50">
-<emph>Number</emph> is the value to be standardized.</paragraph>
-<paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="51">
-<emph>Mean</emph> is the arithmetic mean of the distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3148874" xml-lang="en-US" l10n="U" oldref="52">
-<emph>StDev</emph> is the standard deviation of the distribution.</paragraph>
-<paragraph role="heading" id="hd_id3145351" xml-lang="en-US" level="3" l10n="U" oldref="53">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156067" xml-lang="en-US" l10n="U" oldref="54">
-<item type="input">=STANDARDIZE(11;10;1)</item> returns 1. The value 11 in a normal distribution with a mean of 10 and a standard deviation of 1 is as much above the mean of 10, as the value 1 is above the mean of the standard normal distribution.</paragraph>
-</section>
-<section id="normsinv">
+<paragraph xml-lang="en-US" id="hd_id3155928" role="heading" level="2" l10n="U"
+                    oldref="46">STANDARDIZE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149883" role="paragraph" l10n="U" oldref="47"><ahelp hid="HID_FUNC_STANDARDISIERUNG">Converts a random variable to a normalized value.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154330" role="heading" level="3" l10n="U"
+                    oldref="48">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150132" role="code" l10n="U" oldref="49">STANDARDIZE(Number; Mean; StDev)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159139" role="paragraph" l10n="U" oldref="50">
+            <emph>Number</emph> is the value to be standardized.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145241" role="paragraph" l10n="U" oldref="51">
+            <emph>Mean</emph> is the arithmetic mean of the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148874" role="paragraph" l10n="U" oldref="52">
+            <emph>StDev</emph> is the standard deviation of the distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145351" role="heading" level="3" l10n="U"
+                    oldref="53">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156067" role="paragraph" l10n="U" oldref="54">
+            <item type="input">=STANDARDIZE(11;10;1)</item> returns 1. The value 11 in a normal distribution with a mean of 10 and a standard deviation of 1 is as much above the mean of 10, as the value 1 is above the mean of the standard normal distribution.</paragraph>
+      </section>
+      <section id="normsinv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3157986"><bookmark_value>NORMSINV function</bookmark_value>
-<bookmark_value>normal distribution;inverse of standard</bookmark_value>
+         <bookmark_value>normal distribution;inverse of standard</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STANDNORMINV" id="bm_id3148389" localize="false"/>
-<paragraph role="heading" id="hd_id3157986" xml-lang="en-US" level="2" l10n="U" oldref="56">NORMSINV</paragraph>
-<paragraph role="paragraph" id="par_id3151282" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_FUNC_STANDNORMINV">Returns the inverse of the standard normal cumulative distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153261" xml-lang="en-US" level="3" l10n="U" oldref="58">Syntax</paragraph>
-<paragraph role="code" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="59">NORMINV(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3148772" xml-lang="en-US" l10n="U" oldref="60">
-<emph>Number</emph> is the probability to which the inverse standard normal distribution is calculated.</paragraph>
-<paragraph role="heading" id="hd_id3150934" xml-lang="en-US" level="3" l10n="U" oldref="61">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="62">
-<item type="input">=NORMSINV(0.908789)</item> returns 1.3333.</paragraph>
-</section>
-<section id="normsdist">
+<paragraph xml-lang="en-US" id="hd_id3157986" role="heading" level="2" l10n="U"
+                    oldref="56">NORMSINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151282" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_FUNC_STANDNORMINV">Returns the inverse of the standard normal cumulative distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153261" role="heading" level="3" l10n="U"
+                    oldref="58">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154195" role="code" l10n="U" oldref="59">NORMINV(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148772" role="paragraph" l10n="U" oldref="60">
+            <emph>Number</emph> is the probability to which the inverse standard normal distribution is calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150934" role="heading" level="3" l10n="U"
+                    oldref="61">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149030" role="paragraph" l10n="U" oldref="62">
+            <item type="input">=NORMSINV(0.908789)</item> returns 1.3333.</paragraph>
+      </section>
+      <section id="normsdist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147538"><bookmark_value>NORMSDIST function</bookmark_value>
-<bookmark_value>normal distribution;statistics</bookmark_value>
+         <bookmark_value>normal distribution;statistics</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STANDNORMVERT" id="bm_id3145269" localize="false"/>
-<paragraph role="heading" id="hd_id3147538" xml-lang="en-US" level="2" l10n="U" oldref="64">NORMSDIST</paragraph>
-<paragraph role="paragraph" id="par_id3150474" xml-lang="en-US" l10n="CHG" oldref="65"><ahelp hid="HID_FUNC_STANDNORMVERT">Returns the standard normal cumulative distribution function. The distribution has a mean of zero and a standard deviation of one.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id8652302" xml-lang="en-US" l10n="NEW">It is GAUSS(x)=NORMSDIST(x)-0.5</paragraph>
-<paragraph role="heading" id="hd_id3155083" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
-<paragraph role="code" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="67">NORMSDIST(Number)</paragraph>
-<paragraph role="paragraph" id="par_id3154950" xml-lang="en-US" l10n="CHG" oldref="68">
-<emph>Number</emph> is the value to which the standard normal cumulative distribution is calculated.</paragraph>
-<paragraph role="heading" id="hd_id3153228" xml-lang="en-US" level="3" l10n="U" oldref="69">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155984" xml-lang="en-US" l10n="U" oldref="70">
-<item type="input">=NORMSDIST(1)</item> returns 0.84. The area below the standard normal distribution curve to the left of X value 1 is 84% of the total area.</paragraph>
-</section>
-<section id="slope">
+<paragraph xml-lang="en-US" id="hd_id3147538" role="heading" level="2" l10n="U"
+                    oldref="64">NORMSDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150474" role="paragraph" l10n="CHG" oldref="65"><ahelp hid="HID_FUNC_STANDNORMVERT">Returns the standard normal cumulative distribution function. The distribution has a mean of zero and a standard deviation of one.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id8652302" role="paragraph" l10n="NEW">It is GAUSS(x)=NORMSDIST(x)-0.5</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155083" role="heading" level="3" l10n="U"
+                    oldref="66">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158411" role="code" l10n="U" oldref="67">NORMSDIST(Number)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154950" role="paragraph" l10n="CHG" oldref="68">
+            <emph>Number</emph> is the value to which the standard normal cumulative distribution is calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153228" role="heading" level="3" l10n="U"
+                    oldref="69">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155984" role="paragraph" l10n="U" oldref="70">
+            <item type="input">=NORMSDIST(1)</item> returns 0.84. The area below the standard normal distribution curve to the left of X value 1 is 84% of the total area.</paragraph>
+      </section>
+      <section id="slope">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152592"><bookmark_value>SLOPE function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STEIGUNG" id="bm_id3153716" localize="false"/>
-<paragraph role="heading" id="hd_id3152592" xml-lang="en-US" level="2" l10n="U" oldref="72">SLOPE</paragraph>
-<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="HID_FUNC_STEIGUNG">Returns the slope of the linear regression line.</ahelp> The slope is adapted to the data points set in the y and x values.</paragraph>
-<paragraph role="heading" id="hd_id3154315" xml-lang="en-US" level="3" l10n="U" oldref="74">Syntax</paragraph>
-<paragraph role="code" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="75">SLOPE(DataY; DataX)</paragraph>
-<paragraph role="paragraph" id="par_id3083446" xml-lang="en-US" l10n="U" oldref="76">
-<emph>DataY</emph> is the array or matrix of Y data.</paragraph>
-<paragraph role="paragraph" id="par_id3152375" xml-lang="en-US" l10n="U" oldref="77">
-<emph>DataX</emph> is the array or matrix of X data.</paragraph>
-<paragraph role="heading" id="hd_id3146061" xml-lang="en-US" level="3" l10n="U" oldref="78">Example</paragraph>
-<paragraph role="paragraph" id="par_id3152480" xml-lang="en-US" l10n="U" oldref="79">
-<item type="input">=SLOPE(A1:A50;B1:B50)</item>
-</paragraph>
-</section>
-<section id="steyx">
+<paragraph xml-lang="en-US" id="hd_id3152592" role="heading" level="2" l10n="U"
+                    oldref="72">SLOPE</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150386" role="paragraph" l10n="U" oldref="73"><ahelp hid="HID_FUNC_STEIGUNG">Returns the slope of the linear regression line.</ahelp> The slope is adapted to the data points set in the y and x values.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154315" role="heading" level="3" l10n="U"
+                    oldref="74">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149819" role="code" l10n="U" oldref="75">SLOPE(DataY; DataX)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083446" role="paragraph" l10n="U" oldref="76">
+            <emph>DataY</emph> is the array or matrix of Y data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152375" role="paragraph" l10n="U" oldref="77">
+            <emph>DataX</emph> is the array or matrix of X data.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146061" role="heading" level="3" l10n="U"
+                    oldref="78">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152480" role="paragraph" l10n="U" oldref="79">
+            <item type="input">=SLOPE(A1:A50;B1:B50)</item>
+         </paragraph>
+      </section>
+      <section id="steyx">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155836"><bookmark_value>STEYX function</bookmark_value>
-<bookmark_value>standard errors;statistical functions</bookmark_value>
+         <bookmark_value>standard errors;statistical functions</bookmark_value>
 </bookmark><comment>mw changed "standard errors"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_STFEHLERYX" id="bm_id3150964" localize="false"/>
-<paragraph role="heading" id="hd_id3155836" xml-lang="en-US" level="2" l10n="U" oldref="81">STEYX</paragraph>
-<paragraph role="paragraph" id="par_id3149446" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="HID_FUNC_STFEHLERYX">Returns the standard error of the predicted y value for each x in the regression.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147562" xml-lang="en-US" level="3" l10n="U" oldref="83">Syntax</paragraph>
-<paragraph role="code" id="par_id3151267" xml-lang="en-US" l10n="U" oldref="84">STEYX(DataY; DataX)</paragraph>
-<paragraph role="paragraph" id="par_id3147313" xml-lang="en-US" l10n="U" oldref="85">
-<emph>DataY</emph> is the array or matrix of Y data.</paragraph>
-<paragraph role="paragraph" id="par_id3156097" xml-lang="en-US" l10n="U" oldref="86">
-<emph>DataX</emph> is the array or matrix of X data.</paragraph>
-<paragraph role="heading" id="hd_id3145204" xml-lang="en-US" level="3" l10n="U" oldref="87">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156131" xml-lang="en-US" l10n="U" oldref="88">
-<item type="input">=STEXY(A1:A50;B1:B50)</item>
-</paragraph>
-</section>
-<section id="devsq">
+<paragraph xml-lang="en-US" id="hd_id3155836" role="heading" level="2" l10n="U"
+                    oldref="81">STEYX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149446" role="paragraph" l10n="U" oldref="82"><ahelp hid="HID_FUNC_STFEHLERYX">Returns the standard error of the predicted y value for each x in the regression.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147562" role="heading" level="3" l10n="U"
+                    oldref="83">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151267" role="code" l10n="U" oldref="84">STEYX(DataY; DataX)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147313" role="paragraph" l10n="U" oldref="85">
+            <emph>DataY</emph> is the array or matrix of Y data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156097" role="paragraph" l10n="U" oldref="86">
+            <emph>DataX</emph> is the array or matrix of X data.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145204" role="heading" level="3" l10n="U"
+                    oldref="87">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156131" role="paragraph" l10n="U" oldref="88">
+            <item type="input">=STEXY(A1:A50;B1:B50)</item>
+         </paragraph>
+      </section>
+      <section id="devsq">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150873"><bookmark_value>DEVSQ function</bookmark_value>
-<bookmark_value>sums;of squares of deviations</bookmark_value>
+         <bookmark_value>sums;of squares of deviations</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUMQUADABW" id="bm_id3156317" localize="false"/>
-<paragraph role="heading" id="hd_id3150873" xml-lang="en-US" level="2" l10n="U" oldref="90">DEVSQ</paragraph>
-<paragraph role="paragraph" id="par_id3154748" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="HID_FUNC_SUMQUADABW">Returns the sum of squares of deviations based on a sample mean.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156121" xml-lang="en-US" level="3" l10n="U" oldref="92">Syntax</paragraph>
-<paragraph role="code" id="par_id3146790" xml-lang="en-US" l10n="U" oldref="93">DEVSQ(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3155995" xml-lang="en-US" l10n="CHG" oldref="94">
-<emph>Number1, Number2, ...Number30</emph> numerical values or ranges representing a sample. </paragraph>
-<paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="3" l10n="U" oldref="95">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149136" xml-lang="en-US" l10n="U" oldref="96">
-<item type="input">=DEVSQ(A1:A50)</item>
-</paragraph>
-</section>
-<section id="tinv">
+<paragraph xml-lang="en-US" id="hd_id3150873" role="heading" level="2" l10n="U"
+                    oldref="90">DEVSQ</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154748" role="paragraph" l10n="U" oldref="91"><ahelp hid="HID_FUNC_SUMQUADABW">Returns the sum of squares of deviations based on a sample mean.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156121" role="heading" level="3" l10n="U"
+                    oldref="92">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146790" role="code" l10n="U" oldref="93">DEVSQ(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155995" role="paragraph" l10n="CHG" oldref="94">
+            <emph>Number1, Number2, ...Number30</emph> numerical values or ranges representing a sample. </paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150254" role="heading" level="3" l10n="U"
+                    oldref="95">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149136" role="paragraph" l10n="U" oldref="96">
+            <item type="input">=DEVSQ(A1:A50)</item>
+         </paragraph>
+      </section>
+      <section id="tinv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149579"><bookmark_value>TINV function</bookmark_value>
-<bookmark_value>inverse of t-distribution</bookmark_value>
+         <bookmark_value>inverse of t-distribution</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TINV" id="bm_id3153155" localize="false"/>
-<paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="98">TINV</paragraph>
-<paragraph role="paragraph" id="par_id3143232" xml-lang="en-US" l10n="U" oldref="99"><ahelp hid="HID_FUNC_TINV">Returns the inverse of the t-distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155101" xml-lang="en-US" level="3" l10n="U" oldref="100">Syntax</paragraph>
-<paragraph role="code" id="par_id3149289" xml-lang="en-US" l10n="U" oldref="101">TINV(Number; DegreesFreedom)</paragraph>
-<paragraph role="paragraph" id="par_id3154070" xml-lang="en-US" l10n="U" oldref="102">
-<emph>Number</emph> is the probability associated with the two-tailed t-distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3155315" xml-lang="en-US" l10n="U" oldref="103">
-<emph>DegreesFreedom</emph> is the number of degrees of freedom for the t-distribution.</paragraph>
-<paragraph role="heading" id="hd_id3153885" xml-lang="en-US" level="3" l10n="U" oldref="104">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156010" xml-lang="en-US" l10n="CHG" oldref="105">
-<item type="input">=TINV(0.1;6)</item> returns 1.94</paragraph>
-</section>
-<section id="ttest">
+<paragraph xml-lang="en-US" id="hd_id3149579" role="heading" level="2" l10n="U"
+                    oldref="98">TINV</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143232" role="paragraph" l10n="U" oldref="99"><ahelp hid="HID_FUNC_TINV">Returns the inverse of the t-distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155101" role="heading" level="3" l10n="U"
+                    oldref="100">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149289" role="code" l10n="U" oldref="101">TINV(Number; DegreesFreedom)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154070" role="paragraph" l10n="U" oldref="102">
+            <emph>Number</emph> is the probability associated with the two-tailed t-distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155315" role="paragraph" l10n="U" oldref="103">
+            <emph>DegreesFreedom</emph> is the number of degrees of freedom for the t-distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153885" role="heading" level="3" l10n="U"
+                    oldref="104">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156010" role="paragraph" l10n="CHG" oldref="105">
+            <item type="input">=TINV(0.1;6)</item> returns 1.94</paragraph>
+      </section>
+      <section id="ttest">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154129"><bookmark_value>TTEST function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TTEST" id="bm_id3153981" localize="false"/>
-<paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="2" l10n="U" oldref="107">TTEST</paragraph>
-<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="108"><ahelp hid="HID_FUNC_TTEST">Returns the probability associated with a Student's t-Test.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147257" xml-lang="en-US" level="3" l10n="U" oldref="109">Syntax</paragraph>
-<paragraph role="code" id="par_id3151175" xml-lang="en-US" l10n="U" oldref="110">TTEST(Data1; Data2; Mode; Type)</paragraph>
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="111">
-<emph>Data1</emph> is the dependent array or range of data for the first record.</paragraph>
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="U" oldref="112">
-<emph>Data2</emph> is the dependent array or range of data for the second record.</paragraph>
-<paragraph role="paragraph" id="par_id3153903" xml-lang="en-US" l10n="U" oldref="113">
-<emph>Mode</emph> = 1 calculates the one-tailed test, <emph>Mode</emph> = 2 the two- tailed test.</paragraph>
-<paragraph role="paragraph" id="par_id3155327" xml-lang="en-US" l10n="U" oldref="114">
-<emph>Type</emph> is the kind of t-test to perform. Type 1 means paired. Type 2 means two samples, equal variance (homoscedastic). Type 3 means two samples, unequal variance (heteroscedastic).</paragraph>
-<paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="3" l10n="U" oldref="115">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150119" xml-lang="en-US" l10n="U" oldref="116">
-<item type="input">=TTEST(A1:A50;B1:B50;2;2)</item>
-</paragraph>
-</section>
-<section id="tdist">
+<paragraph xml-lang="en-US" id="hd_id3154129" role="heading" level="2" l10n="U"
+                    oldref="107">TTEST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159184" role="paragraph" l10n="U" oldref="108"><ahelp hid="HID_FUNC_TTEST">Returns the probability associated with a Student's t-Test.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147257" role="heading" level="3" l10n="U"
+                    oldref="109">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151175" role="code" l10n="U" oldref="110">TTEST(Data1; Data2; Mode; Type)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="111">
+            <emph>Data1</emph> is the dependent array or range of data for the first record.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145666" role="paragraph" l10n="U" oldref="112">
+            <emph>Data2</emph> is the dependent array or range of data for the second record.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153903" role="paragraph" l10n="U" oldref="113">
+            <emph>Mode</emph> = 1 calculates the one-tailed test, <emph>Mode</emph> = 2 the two- tailed test.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155327" role="paragraph" l10n="U" oldref="114">
+            <emph>Type</emph> is the kind of t-test to perform. Type 1 means paired. Type 2 means two samples, equal variance (homoscedastic). Type 3 means two samples, unequal variance (heteroscedastic).</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159342" role="heading" level="3" l10n="U"
+                    oldref="115">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150119" role="paragraph" l10n="U" oldref="116">
+            <item type="input">=TTEST(A1:A50;B1:B50;2;2)</item>
+         </paragraph>
+      </section>
+      <section id="tdist">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154930"><bookmark_value>TDIST function</bookmark_value>
-<bookmark_value>t-distribution</bookmark_value>
+         <bookmark_value>t-distribution</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_TVERT" id="bm_id3153095" localize="false"/>
-<paragraph role="heading" id="hd_id3154930" xml-lang="en-US" level="2" l10n="U" oldref="118">TDIST</paragraph>
-<paragraph role="paragraph" id="par_id3153372" xml-lang="en-US" l10n="U" oldref="119"><ahelp hid="HID_FUNC_TVERT">Returns the t-distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149911" xml-lang="en-US" level="3" l10n="U" oldref="120">Syntax</paragraph>
-<paragraph role="code" id="par_id3150521" xml-lang="en-US" l10n="U" oldref="121">TDIST(Number; DegreesFreedom; Mode)</paragraph>
-<paragraph role="paragraph" id="par_id3146991" xml-lang="en-US" l10n="U" oldref="122">
-<emph>Number</emph> is the value for which the t-distribution is calculated.</paragraph>
-<paragraph role="paragraph" id="par_id3148824" xml-lang="en-US" l10n="U" oldref="123">
-<emph>DegreesFreedom</emph> is the number of degrees of freedom for the t-distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3149340" xml-lang="en-US" l10n="U" oldref="124">
-<emph>Mode</emph> = 1 returns the one-tailed test, <emph>Mode</emph> = 2 returns the two-tailed test.</paragraph>
-<paragraph role="heading" id="hd_id3159150" xml-lang="en-US" level="3" l10n="U" oldref="125">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149773" xml-lang="en-US" l10n="U" oldref="126">
-<item type="input">=TDIST(12;5;1)</item>
-</paragraph>
-</section>
-<section id="var">
+<paragraph xml-lang="en-US" id="hd_id3154930" role="heading" level="2" l10n="U"
+                    oldref="118">TDIST</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153372" role="paragraph" l10n="U" oldref="119"><ahelp hid="HID_FUNC_TVERT">Returns the t-distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149911" role="heading" level="3" l10n="U"
+                    oldref="120">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150521" role="code" l10n="U" oldref="121">TDIST(Number; DegreesFreedom; Mode)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146991" role="paragraph" l10n="U" oldref="122">
+            <emph>Number</emph> is the value for which the t-distribution is calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148824" role="paragraph" l10n="U" oldref="123">
+            <emph>DegreesFreedom</emph> is the number of degrees of freedom for the t-distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149340" role="paragraph" l10n="U" oldref="124">
+            <emph>Mode</emph> = 1 returns the one-tailed test, <emph>Mode</emph> = 2 returns the two-tailed test.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159150" role="heading" level="3" l10n="U"
+                    oldref="125">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149773" role="paragraph" l10n="U" oldref="126">
+            <item type="input">=TDIST(12;5;1)</item>
+         </paragraph>
+      </section>
+      <section id="var">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153828"><bookmark_value>VAR function</bookmark_value>
-<bookmark_value>variances</bookmark_value>
+         <bookmark_value>variances</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIANZ" id="bm_id3154898" localize="false"/>
-<paragraph role="heading" id="hd_id3153828" xml-lang="en-US" level="2" l10n="U" oldref="128">VAR</paragraph>
-<paragraph role="paragraph" id="par_id3159165" xml-lang="en-US" l10n="U" oldref="129"><ahelp hid="HID_FUNC_VARIANZ">Estimates the variance based on a sample.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154286" xml-lang="en-US" level="3" l10n="U" oldref="130">Syntax</paragraph>
-<paragraph role="code" id="par_id3153054" xml-lang="en-US" l10n="U" oldref="131">VAR(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3148938" xml-lang="en-US" l10n="CHG" oldref="132">
-<emph>Number1, Number2, ...Number30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
-<paragraph role="heading" id="hd_id3147233" xml-lang="en-US" level="3" l10n="U" oldref="133">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153575" xml-lang="en-US" l10n="U" oldref="134">
-<item type="input">=VAR(A1:A50)</item>
-</paragraph>
-</section>
-<section id="vara">
+<paragraph xml-lang="en-US" id="hd_id3153828" role="heading" level="2" l10n="U"
+                    oldref="128">VAR</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159165" role="paragraph" l10n="U" oldref="129"><ahelp hid="HID_FUNC_VARIANZ">Estimates the variance based on a sample.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154286" role="heading" level="3" l10n="U"
+                    oldref="130">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153054" role="code" l10n="U" oldref="131">VAR(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148938" role="paragraph" l10n="CHG" oldref="132">
+            <emph>Number1, Number2, ...Number30</emph> are numerical values or ranges representing a sample based on an entire population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147233" role="heading" level="3" l10n="U"
+                    oldref="133">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153575" role="paragraph" l10n="U" oldref="134">
+            <item type="input">=VAR(A1:A50)</item>
+         </paragraph>
+      </section>
+      <section id="vara">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151045"><bookmark_value>VARA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIANZA" id="bm_id3148473" localize="false"/>
-<paragraph role="heading" id="hd_id3151045" xml-lang="en-US" level="2" l10n="U" oldref="202">VARA</paragraph>
-<paragraph role="paragraph" id="par_id3155122" xml-lang="en-US" l10n="U" oldref="203"><ahelp hid="HID_FUNC_VARIANZA">Estimates a variance based on a sample. The value of text is 0.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149176" xml-lang="en-US" level="3" l10n="U" oldref="204">Syntax</paragraph>
-<paragraph role="code" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="205">VARA(Value1; Value2; ...Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3158421" xml-lang="en-US" l10n="CHG" oldref="206">
-<emph>Value1, Value2,...Value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
-<paragraph role="heading" id="hd_id3149160" xml-lang="en-US" level="3" l10n="U" oldref="207">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154279" xml-lang="en-US" l10n="U" oldref="208">
-<item type="input">=VARA(A1:A50)</item>
-</paragraph>
-</section>
-<section id="varp">
+<paragraph xml-lang="en-US" id="hd_id3151045" role="heading" level="2" l10n="U"
+                    oldref="202">VARA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155122" role="paragraph" l10n="U" oldref="203"><ahelp hid="HID_FUNC_VARIANZA">Estimates a variance based on a sample. The value of text is 0.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149176" role="heading" level="3" l10n="U"
+                    oldref="204">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149999" role="code" l10n="U" oldref="205">VARA(Value1; Value2; ...Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158421" role="paragraph" l10n="CHG" oldref="206">
+            <emph>Value1, Value2,...Value30</emph> are values or ranges representing a sample derived from an entire population. Text has the value 0.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149160" role="heading" level="3" l10n="U"
+                    oldref="207">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154279" role="paragraph" l10n="U" oldref="208">
+            <item type="input">=VARA(A1:A50)</item>
+         </paragraph>
+      </section>
+      <section id="varp">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3166441"><bookmark_value>VARP function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIANZEN" id="bm_id3152359" localize="false"/>
-<paragraph role="heading" id="hd_id3166441" xml-lang="en-US" level="2" l10n="U" oldref="136">VARP</paragraph>
-<paragraph role="paragraph" id="par_id3159199" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_FUNC_VARIANZEN">Calculates a variance based on the entire population.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150706" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph>
-<paragraph role="code" id="par_id3147282" xml-lang="en-US" l10n="U" oldref="139">VARP(Number1; Number2; ...Number30)</paragraph>
-<paragraph role="paragraph" id="par_id3149793" xml-lang="en-US" l10n="CHG" oldref="140">
-<emph>Number1, Number2, ...Number30</emph> are numerical values or ranges representing an entire population.</paragraph>
-<paragraph role="heading" id="hd_id3152939" xml-lang="en-US" level="3" l10n="U" oldref="141">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153385" xml-lang="en-US" l10n="U" oldref="142">
-<item type="input">=VARP(A1:A50)</item>
-</paragraph>
-</section>
-<section id="varpa">
+<paragraph xml-lang="en-US" id="hd_id3166441" role="heading" level="2" l10n="U"
+                    oldref="136">VARP</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159199" role="paragraph" l10n="U" oldref="137"><ahelp hid="HID_FUNC_VARIANZEN">Calculates a variance based on the entire population.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3150706" role="heading" level="3" l10n="U"
+                    oldref="138">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147282" role="code" l10n="U" oldref="139">VARP(Number1; Number2; ...Number30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149793" role="paragraph" l10n="CHG" oldref="140">
+            <emph>Number1, Number2, ...Number30</emph> are numerical values or ranges representing an entire population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152939" role="heading" level="3" l10n="U"
+                    oldref="141">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153385" role="paragraph" l10n="U" oldref="142">
+            <item type="input">=VARP(A1:A50)</item>
+         </paragraph>
+      </section>
+      <section id="varpa">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153688"><bookmark_value>VARPA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIANZENA" id="bm_id3159276" localize="false"/>
-<paragraph role="heading" id="hd_id3153688" xml-lang="en-US" level="2" l10n="U" oldref="210">VARPA</paragraph>
-<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="U" oldref="211"><ahelp hid="HID_FUNC_VARIANZENA">Calculates the variance based on the entire population. The value of text is 0.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152880" xml-lang="en-US" level="3" l10n="U" oldref="212">Syntax</paragraph>
-<paragraph role="code" id="par_id3149967" xml-lang="en-US" l10n="U" oldref="213">VARPA(Value1; Value2; ...Value30)</paragraph>
-<paragraph role="paragraph" id="par_id3149920" xml-lang="en-US" l10n="CHG" oldref="214">
-<emph>Value1,value2,...Value30</emph> are values or ranges representing an entire population.</paragraph>
-<paragraph role="heading" id="hd_id3154862" xml-lang="en-US" level="3" l10n="U" oldref="215">Example</paragraph>
-<paragraph role="paragraph" id="par_id3156203" xml-lang="en-US" l10n="U" oldref="216">
-<item type="input">=VARPA(A1:A50)</item>
-</paragraph>
-</section>
-<section id="permut">
+<paragraph xml-lang="en-US" id="hd_id3153688" role="heading" level="2" l10n="U"
+                    oldref="210">VARPA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph" l10n="U" oldref="211"><ahelp hid="HID_FUNC_VARIANZENA">Calculates the variance based on the entire population. The value of text is 0.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3152880" role="heading" level="3" l10n="U"
+                    oldref="212">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149967" role="code" l10n="U" oldref="213">VARPA(Value1; Value2; ...Value30)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149920" role="paragraph" l10n="CHG" oldref="214">
+            <emph>Value1,value2,...Value30</emph> are values or ranges representing an entire population.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3154862" role="heading" level="3" l10n="U"
+                    oldref="215">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156203" role="paragraph" l10n="U" oldref="216">
+            <item type="input">=VARPA(A1:A50)</item>
+         </paragraph>
+      </section>
+      <section id="permut">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154599"><bookmark_value>PERMUT function</bookmark_value>
-<bookmark_value>number of permutations</bookmark_value>
+         <bookmark_value>number of permutations</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIATIONEN" id="bm_id3154610" localize="false"/>
-<paragraph role="heading" id="hd_id3154599" xml-lang="en-US" level="2" l10n="U" oldref="144">PERMUT</paragraph>
-<paragraph role="paragraph" id="par_id3154334" xml-lang="en-US" l10n="U" oldref="145"><ahelp hid="HID_FUNC_VARIATIONEN">Returns the number of permutations for a given number of objects.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149422" xml-lang="en-US" level="3" l10n="U" oldref="146">Syntax</paragraph>
-<paragraph role="code" id="par_id3148466" xml-lang="en-US" l10n="U" oldref="147">PERMUT(Count1; Count2)</paragraph>
-<paragraph role="paragraph" id="par_id3148656" xml-lang="en-US" l10n="U" oldref="148">
-<emph>Count1</emph> is the total number of objects.</paragraph>
-<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="149">
-<emph>Count2</emph> is the number of objects in each permutation.</paragraph>
-<paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="U" oldref="150">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150424" xml-lang="en-US" l10n="U" oldref="151">
-<item type="input">=PERMUT(6;3)</item> returns 120. There are 120 different possibilities, to pick a sequence of 3 playing cards out of 6 playing cards.</paragraph>
-</section>
-<section id="permutationa">
+<paragraph xml-lang="en-US" id="hd_id3154599" role="heading" level="2" l10n="U"
+                    oldref="144">PERMUT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154334" role="paragraph" l10n="U" oldref="145"><ahelp hid="HID_FUNC_VARIATIONEN">Returns the number of permutations for a given number of objects.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149422" role="heading" level="3" l10n="U"
+                    oldref="146">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148466" role="code" l10n="U" oldref="147">PERMUT(Count1; Count2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148656" role="paragraph" l10n="U" oldref="148">
+            <emph>Count1</emph> is the total number of objects.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="149">
+            <emph>Count2</emph> is the number of objects in each permutation.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="3" l10n="U"
+                    oldref="150">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150424" role="paragraph" l10n="U" oldref="151">
+            <item type="input">=PERMUT(6;3)</item> returns 120. There are 120 different possibilities, to pick a sequence of 3 playing cards out of 6 playing cards.</paragraph>
+      </section>
+      <section id="permutationa">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143276"><bookmark_value>PERMUTATIONA function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_VARIATIONEN2" id="bm_id3153531" localize="false"/>
-<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="2" l10n="U" oldref="153">PERMUTATIONA</paragraph>
-<paragraph role="paragraph" id="par_id3144759" xml-lang="en-US" l10n="U" oldref="154"><ahelp hid="HID_FUNC_VARIATIONEN2">Returns the number of permutations for a given number of objects (repetition allowed).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145598" xml-lang="en-US" level="3" l10n="U" oldref="155">Syntax</paragraph>
-<paragraph role="code" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="156">PERMUTATIONA(Count1; Count2)</paragraph>
-<paragraph role="paragraph" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="157">
-<emph>Count1</emph> is the total number of objects.</paragraph>
-<paragraph role="paragraph" id="par_id3149519" xml-lang="en-US" l10n="U" oldref="158">
-<emph>Count2</emph> is the number of objects in each permutation.</paragraph>
-<paragraph role="heading" id="hd_id3151382" xml-lang="en-US" level="3" l10n="U" oldref="159">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153949" xml-lang="en-US" l10n="U" oldref="160">How often can 2 objects be selected from a total of 11 objects?</paragraph>
-<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="161">
-<item type="input">=PERMUTATIONA(11;2)</item> returns 121.</paragraph>
-<paragraph role="paragraph" id="par_id3150622" xml-lang="en-US" l10n="U" oldref="162">
-<item type="input">=PERMUTATIONA(6;3)</item> returns 216. There are 216 different possibilities to put a sequence of 3 playing cards together out of six playing cards if every card is returned before the next one is drawn.</paragraph>
-</section>
-<section id="prob">
+<paragraph xml-lang="en-US" id="hd_id3143276" role="heading" level="2" l10n="U"
+                    oldref="153">PERMUTATIONA</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144759" role="paragraph" l10n="U" oldref="154"><ahelp hid="HID_FUNC_VARIATIONEN2">Returns the number of permutations for a given number of objects (repetition allowed).</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3145598" role="heading" level="3" l10n="U"
+                    oldref="155">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149298" role="code" l10n="U" oldref="156">PERMUTATIONA(Count1; Count2)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156139" role="paragraph" l10n="U" oldref="157">
+            <emph>Count1</emph> is the total number of objects.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149519" role="paragraph" l10n="U" oldref="158">
+            <emph>Count2</emph> is the number of objects in each permutation.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3151382" role="heading" level="3" l10n="U"
+                    oldref="159">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153949" role="paragraph" l10n="U" oldref="160">How often can 2 objects be selected from a total of 11 objects?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="161">
+            <item type="input">=PERMUTATIONA(11;2)</item> returns 121.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150622" role="paragraph" l10n="U" oldref="162">
+            <item type="input">=PERMUTATIONA(6;3)</item> returns 216. There are 216 different possibilities to put a sequence of 3 playing cards together out of six playing cards if every card is returned before the next one is drawn.</paragraph>
+      </section>
+      <section id="prob">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152952"><bookmark_value>PROB function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHRSCHBEREICH" id="bm_id3152963" localize="false"/>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="164">PROB</paragraph>
-<paragraph role="paragraph" id="par_id3154110" xml-lang="en-US" l10n="U" oldref="165"><ahelp hid="HID_FUNC_WAHRSCHBEREICH">Returns the probability that values in a range are between two limits.</ahelp> If there is no <item type="literal">End</item> value, this function calculates the probability based on the principle that the Data values are equal to the value of <item type="literal">Start</item>.</paragraph>
-<paragraph role="heading" id="hd_id3146810" xml-lang="en-US" level="3" l10n="U" oldref="166">Syntax</paragraph>
-<paragraph role="code" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="167">PROB(Data; Probability; Start; End)</paragraph>
-<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="168">
-<emph>Data</emph> is the array or range of data in the sample.</paragraph>
-<paragraph role="paragraph" id="par_id3156334" xml-lang="en-US" l10n="U" oldref="169">
-<emph>Probability</emph> is the array or range of the corresponding probabilities.</paragraph>
-<paragraph role="paragraph" id="par_id3151107" xml-lang="en-US" l10n="U" oldref="170">
-<emph>Start</emph> is the start value of the interval whose probabilities are to be summed.</paragraph>
-<paragraph role="paragraph" id="par_id3153694" xml-lang="en-US" l10n="U" oldref="171">
-<emph>End</emph> (optional) is the end value of the interval whose probabilities are to be summed. If this parameter is missing, the probability for the <emph>Start </emph>value is calculated.</paragraph>
-<paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="3" l10n="U" oldref="172">Example</paragraph>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="173">
-<item type="input">=PROB(A1:A50;B1:B50;50;60)</item> returns the probability with which a value within the range of A1:A50 is also within the limits between 50 and 60. Every value within the range of A1:A50 has a probability within the range of B1:B50.</paragraph>
-</section>
-<section id="weibull">
+<paragraph xml-lang="en-US" id="hd_id3152952" role="heading" level="2" l10n="U"
+                    oldref="164">PROB</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154110" role="paragraph" l10n="U" oldref="165"><ahelp hid="HID_FUNC_WAHRSCHBEREICH">Returns the probability that values in a range are between two limits.</ahelp> If there is no <item type="literal">End</item> value, this function calculates the probability based on the principle that the Data values are equal to the value of <item type="literal">Start</item>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146810" role="heading" level="3" l10n="U"
+                    oldref="166">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147330" role="code" l10n="U" oldref="167">PROB(Data; Probability; Start; End)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154573" role="paragraph" l10n="U" oldref="168">
+            <emph>Data</emph> is the array or range of data in the sample.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156334" role="paragraph" l10n="U" oldref="169">
+            <emph>Probability</emph> is the array or range of the corresponding probabilities.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151107" role="paragraph" l10n="U" oldref="170">
+            <emph>Start</emph> is the start value of the interval whose probabilities are to be summed.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153694" role="paragraph" l10n="U" oldref="171">
+            <emph>End</emph> (optional) is the end value of the interval whose probabilities are to be summed. If this parameter is missing, the probability for the <emph>Start </emph>value is calculated.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147574" role="heading" level="3" l10n="U"
+                    oldref="172">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153666" role="paragraph" l10n="U" oldref="173">
+            <item type="input">=PROB(A1:A50;B1:B50;50;60)</item> returns the probability with which a value within the range of A1:A50 is also within the limits between 50 and 60. Every value within the range of A1:A50 has a probability within the range of B1:B50.</paragraph>
+      </section>
+      <section id="weibull">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150941"><bookmark_value>WEIBULL function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_WEIBULL" id="bm_id3150405" localize="false"/>
-<paragraph role="heading" id="hd_id3150941" xml-lang="en-US" level="2" l10n="U" oldref="175">WEIBULL</paragraph>
-<paragraph role="paragraph" id="par_id3154916" xml-lang="en-US" l10n="U" oldref="176"><ahelp hid="HID_FUNC_WEIBULL">Returns the values of the Weibull distribution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159393" xml-lang="en-US" level="3" l10n="U" oldref="177">Syntax</paragraph>
-<paragraph role="code" id="par_id3154478" xml-lang="en-US" l10n="U" oldref="178">WEIBULL(Number; Alpha; Beta; C)</paragraph>
-<paragraph role="paragraph" id="par_id3151317" xml-lang="en-US" l10n="U" oldref="179">
-<emph>Number</emph> is the value at which to calculate the Weibull distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3158436" xml-lang="en-US" l10n="U" oldref="180">
-<emph>Alpha </emph>is the Alpha parameter of the Weibull distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3154668" xml-lang="en-US" l10n="U" oldref="181">
-<emph>Beta</emph> is the Beta parameter of the Weibull distribution.</paragraph>
-<paragraph role="paragraph" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="182">
-<emph>C</emph> indicates the type of function. If C equals 0 the form of the function is calculated, if C equals 1 the distribution is calculated.</paragraph>
-<paragraph role="heading" id="hd_id3153794" xml-lang="en-US" level="3" l10n="U" oldref="183">Example</paragraph>
-<paragraph role="paragraph" id="par_id3146077" xml-lang="en-US" l10n="U" oldref="184">
-<item type="input">=WEIBULL(2;1;1;1)</item> returns 0.86.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150941" role="heading" level="2" l10n="U"
+                    oldref="175">WEIBULL</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154916" role="paragraph" l10n="U" oldref="176"><ahelp hid="HID_FUNC_WEIBULL">Returns the values of the Weibull distribution.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0305200911372767" role="paragraph" l10n="NEW">The Weibull distribution is a continuous probability distribution, with parameters Alpha &gt; 0 (shape) and Beta &gt; 0 (scale). </paragraph>
+         <paragraph xml-lang="en-US" id="par_id0305200911372777" role="paragraph" l10n="NEW">If C is 0, WEIBULL calculates the probability density function.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0305200911372743" role="paragraph" l10n="NEW">If C is 1, WEIBULL calculates the cumulative distribution function.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159393" role="heading" level="3" l10n="U"
+                    oldref="177">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154478" role="code" l10n="U" oldref="178">WEIBULL(Number; Alpha; Beta; C)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151317" role="paragraph" l10n="U" oldref="179">
+            <emph>Number</emph> is the value at which to calculate the Weibull distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3158436" role="paragraph" l10n="U" oldref="180">
+            <emph>Alpha </emph>is the shape parameter of the Weibull distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154668" role="paragraph" l10n="U" oldref="181">
+            <emph>Beta</emph> is the scale parameter of the Weibull distribution.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154825" role="paragraph" l10n="CHG" oldref="182">
+            <emph>C</emph> indicates the type of function.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153794" role="heading" level="3" l10n="U"
+                    oldref="183">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146077" role="paragraph" l10n="U" oldref="184">
+            <item type="input">=WEIBULL(2;1;1;1)</item> returns 0.86.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0305200911372899" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_WEIBULL_function">Wiki page</link>.</paragraph>
+      </section>
 </sort>
 <section id="relatedtopics">
-<embed href="text/scalc/01/04060100.xhp#drking"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/scalc/01/04060100.xhp#drking"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/04060199.xhp b/helpcontent2/source/text/scalc/01/04060199.xhp
index 931f123877..138c768fac 100755..100644
--- a/helpcontent2/source/text/scalc/01/04060199.xhp
+++ b/helpcontent2/source/text/scalc/01/04060199.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04060199.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -308,6 +305,6 @@
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="note" id="par_id181890" xml-lang="en-US" l10n="NEW">Reference concatenation using a tilde character is a new operator, available starting with OpenOffice.org 3.0 and StarOffice 9. When a formula with the tilde operator exists in a document that is opened in previous versions of the software, an error is returned. A reference list is not allowed inside an array expression.</paragraph>
+<paragraph role="note" id="par_id181890" xml-lang="en-US" l10n="NEW">Reference concatenation using a tilde character was implemented lately. When a formula with the tilde operator exists in a document that is opened in old versions of the software, an error is returned. A reference list is not allowed inside an array expression.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04070000.xhp b/helpcontent2/source/text/scalc/01/04070000.xhp
index 03b0bff734..d70036af99 100755
--- a/helpcontent2/source/text/scalc/01/04070000.xhp
+++ b/helpcontent2/source/text/scalc/01/04070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/04070100.xhp b/helpcontent2/source/text/scalc/01/04070100.xhp
index 000d38c154..cf0687b1d2 100644
--- a/helpcontent2/source/text/scalc/01/04070100.xhp
+++ b/helpcontent2/source/text/scalc/01/04070100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,32 +48,32 @@
 <embed href="text/scalc/00/00000404.xhp#einafe"/>
 </section>
 <paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="30">The <emph>Sheet Area</emph> box on the Formula bar contains a list of defined names for the ranges. Click a name from this box to highlight the corresponding reference on the spreadsheet. Names given formulas or parts of a formula are not listed here.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_NAMES:ED_NAME" id="bm_id3151114" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_NAMES:ED_NAME" id="bm_id3151114" localize="false"/>
 <paragraph role="heading" id="hd_id3151118" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3163712" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SC:COMBOBOX:RID_SCDLG_NAMES:ED_NAME">Enter the name of the area for which you want to define a reference. All area names already defined in the spreadsheet are listed in the text field below.</ahelp> If you click a name on the list, the corresponding reference in the document will be shown with a blue frame. If multiple cell ranges belong to the same area name, they are displayed with different colored frames.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_NAMES:ED_ASSIGN" id="bm_id3145750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN" id="bm_id3145750" localize="false"/>
 <paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="2" l10n="U" oldref="9">Assigned to</paragraph>
 <paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_NAMES:ED_ASSIGN">The reference of the selected area name is shown here as an absolute value.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="U" oldref="12">To insert a new area reference, place the cursor in this field and use your mouse to select the desired area in any sheet of your spreadsheet document.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_NAMES:BTN_MORE" id="bm_id3148455" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE" id="bm_id3148455" localize="false"/>
 <paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="13">More</paragraph>
 <paragraph role="paragraph" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_NAMES:BTN_MORE">Allows you to specify the <emph>Area type </emph>(optional) for the reference.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147394" xml-lang="en-US" level="3" l10n="U" oldref="15">Area type</paragraph>
 <paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="16">Defines additional options related to the type of reference area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES:BTN_PRINTAREA" id="bm_id3146972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA" id="bm_id3146972" localize="false"/>
 <paragraph role="heading" id="hd_id3150716" xml-lang="en-US" level="4" l10n="U" oldref="17">Print range</paragraph>
 <paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_PRINTAREA">Defines the area as a print range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES:BTN_CRITERIA" id="bm_id3155446" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA" id="bm_id3155446" localize="false"/>
 <paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="4" l10n="U" oldref="19">Filter</paragraph>
 <paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_CRITERIA">Defines the selected area to be used in an <link href="text/scalc/01/12040300.xhp" name="advanced filter">advanced filter</link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES:BTN_COLHEADER" id="bm_id3147344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER" id="bm_id3147344" localize="false"/>
 <paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="4" l10n="U" oldref="21">Repeat column</paragraph>
 <paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_COLHEADER">Defines the area as a repeating column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES:BTN_ROWHEADER" id="bm_id3154021" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER" id="bm_id3154021" localize="false"/>
 <paragraph role="heading" id="hd_id3153966" xml-lang="en-US" level="4" l10n="U" oldref="23">Repeat row</paragraph>
 <paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_ROWHEADER">Defines the area as a repeating row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_ADD" id="bm_id3150207" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_NAMES:BTN_ADD" id="bm_id3150207" localize="false"/>
 <paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="2" l10n="U" oldref="27">Add/Modify</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_ADD">Click the <emph>Add</emph> button to add the defined name to the list. Click the <emph>Modify</emph> button to enter another name for an already existing name selected from the list.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
diff --git a/helpcontent2/source/text/scalc/01/04070200.xhp b/helpcontent2/source/text/scalc/01/04070200.xhp
index 186f608a3b..a3f18debee 100644
--- a/helpcontent2/source/text/scalc/01/04070200.xhp
+++ b/helpcontent2/source/text/scalc/01/04070200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,10 +52,10 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000404.xhp#einaei"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST" id="bm_id3155415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST" id="bm_id3155415" localize="false"/>
 <paragraph role="heading" id="hd_id3153160" xml-lang="en-US" level="2" l10n="U" oldref="3">Insert name <comment>Changed in #102078#</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST">Lists all defined cell areas. Double-click an entry to insert the named area into the active sheet at the current cursor position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES_PASTE:BTN_ADD" id="bm_id3153707" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_NAMES_PASTE:BTN_ADD" id="bm_id3153707" localize="false"/>
 <paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="2" l10n="U" oldref="5">Insert All</paragraph>
 <paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_NAMES_PASTE:BTN_ADD">Inserts a list of all named areas and the corresponding cell references at the current cursor position.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/04070300.xhp b/helpcontent2/source/text/scalc/01/04070300.xhp
index 762369332d..325959b9cb 100644
--- a/helpcontent2/source/text/scalc/01/04070300.xhp
+++ b/helpcontent2/source/text/scalc/01/04070300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
 <paragraph role="paragraph" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="13">Select the area containing all the ranges that you want to name. Then choose <emph>Insert - Names - Create</emph>. This opens the <emph>Create Names</emph> dialog, from which you can select the naming options that you want.</paragraph>
 <paragraph role="heading" id="hd_id3151116" xml-lang="en-US" level="2" l10n="U" oldref="3">Create names from</paragraph>
 <paragraph role="paragraph" id="par_id3152597" xml-lang="en-US" l10n="U" oldref="4">Defines which part of the spreadsheet is to be used for creating the name.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_TOP" id="bm_id3156444" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_TOP" id="bm_id3156444" localize="false"/>
 <paragraph role="heading" id="hd_id3153729" xml-lang="en-US" level="3" l10n="U" oldref="5">Top row</paragraph>
 <paragraph role="paragraph" id="par_id3149263" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_TOP">Creates the range names from the header row of the selected range.</ahelp> Each column receives a separated name and cell reference.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_LEFT" id="bm_id3145749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_LEFT" id="bm_id3145749" localize="false"/>
 <paragraph role="heading" id="hd_id3146984" xml-lang="en-US" level="3" l10n="U" oldref="7">Left Column</paragraph>
 <paragraph role="paragraph" id="par_id3153190" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_LEFT">Creates the range names from the entries in the first column of the selected sheet range.</ahelp> Each row receives a separated name and cell reference.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM" id="bm_id3145645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM" id="bm_id3145645" localize="false"/>
 <paragraph role="heading" id="hd_id3156284" xml-lang="en-US" level="3" l10n="U" oldref="9">Bottom row</paragraph>
 <paragraph role="paragraph" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM">Creates the range names from the entries in the last row of the selected sheet range.</ahelp> Each column receives a separated name and cell reference.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_RIGHT" id="bm_id3145253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_RIGHT" id="bm_id3145253" localize="false"/>
 <paragraph role="heading" id="hd_id3154731" xml-lang="en-US" level="3" l10n="U" oldref="11">Right Column</paragraph>
 <paragraph role="paragraph" id="par_id3153158" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_RIGHT">Creates the range names from the entries in the last column of the selected sheet range.</ahelp> Each row receives a separated name and cell reference.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/04070400.xhp b/helpcontent2/source/text/scalc/01/04070400.xhp
index 5a69e9fc00..37174b391f 100644
--- a/helpcontent2/source/text/scalc/01/04070400.xhp
+++ b/helpcontent2/source/text/scalc/01/04070400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070400.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,22 +53,22 @@
 <embed href="text/scalc/guide/address_auto.xhp#address_auto"/>
 <paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="13">The cell contents of a label range can be used like names in formulas - $[officename] recognizes these names in the same manner that it does the predefined names of the weekdays and months. These names are automatically completed when typed into a formula. In addition, the names defined by label ranges will have priority over names defined by automatically generated ranges.</paragraph>
 <paragraph role="note" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="14">You can set label ranges that contain the same labels on different sheets. $[officename] first searches the label ranges of the current sheet and, following a failed search, the ranges of other sheets.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_COLROWNAMERANGES:LB_RANGE" id="bm_id3149958" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_AREA" id="bm_id3148457" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE" id="bm_id3149958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA" id="bm_id3148457" localize="false"/>
 <paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="3">Range</paragraph>
 <paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_AREA">Displays the cell reference of each label range.</ahelp> In order to remove a label range from the list box, select it and then click <emph>Delete</emph>.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD" id="bm_id3155064" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD" id="bm_id3155064" localize="false"/>
 <paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="5">Contains column labels</paragraph>
 <paragraph role="paragraph" id="par_id3150330" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD">Includes column labels in the current label range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD" id="bm_id3145642" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD" id="bm_id3145642" localize="false"/>
 <paragraph role="heading" id="hd_id3149020" xml-lang="en-US" level="3" l10n="U" oldref="7">Contains row labels</paragraph>
 <paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD">Includes row labels in the current label range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA" id="bm_id3146919" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_DATA" id="bm_id3146919" localize="false"/>
 <paragraph role="heading" id="hd_id3159264" xml-lang="en-US" level="3" l10n="U" oldref="11">For data range</paragraph>
 <paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA">Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select another range with the mouse.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ADD" id="bm_id3150299" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD" id="bm_id3150299" localize="false"/>
 <paragraph role="heading" id="hd_id3145789" xml-lang="en-US" level="2" l10n="U" oldref="9">Add</paragraph>
 <paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ADD">Adds the current label range to the list.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
diff --git a/helpcontent2/source/text/scalc/01/04080000.xhp b/helpcontent2/source/text/scalc/01/04080000.xhp
index 13e1a4f289..645c04e337 100644
--- a/helpcontent2/source/text/scalc/01/04080000.xhp
+++ b/helpcontent2/source/text/scalc/01/04080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04080000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <bookmark_value>function list window</bookmark_value>
 <bookmark_value>inserting functions; function list window</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FUNCTIONLIST" id="bm_id3153194" localize="false"/>
+<!-- removed HID HID_SC_FUNCTIONLIST -->
 <bookmark xml-lang="en-US" branch="hid/FID_FUNCTION_BOX" id="bm_id998166" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:FunctionBox" id="bm_id7607654" localize="false"/>
 <paragraph role="heading" id="hd_id3154126" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/04080000.xhp" name="Function List">Function List</link></paragraph>
@@ -57,13 +54,13 @@
   <embed href="text/scalc/00/00000404.xhp#funktionsliste"/>
 </section>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="3">The <emph>Function List</emph> window is a resizable <link href="text/shared/00/00000005.xhp#andocken" name="dockable window">dockable window</link>. Use it to quickly enter functions in the spreadsheet. By double-clicking an entry in the functions list, the respective function is directly inserted with all parameters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:FID_FUNCTION_BOX:CB_CAT" id="bm_id3149960" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:FID_FUNCTION_BOX:CB_CAT" id="bm_id3149960" localize="false"/>
 <paragraph role="heading" id="hd_id3145799" xml-lang="en-US" level="2" l10n="U" oldref="4">Category List</paragraph>
 <embed href="text/scalc/01/04060000.xhp#kategorienliste"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:FID_FUNCTION_BOX:LB_FUNC" id="bm_id3147126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:FID_FUNCTION_BOX:LB_FUNC" id="bm_id3147126" localize="false"/>
 <paragraph role="heading" id="hd_id3153160" xml-lang="en-US" level="2" l10n="U" oldref="5">Function List</paragraph>
 <paragraph role="paragraph" id="par_id3149412" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:FID_FUNCTION_BOX:LB_FUNC">Displays the available functions.</ahelp> When you select a function, the area below the list box displays a short description. To insert the selected function double-click it or click the <emph>Insert Function into calculation sheet</emph> icon.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:FID_FUNCTION_BOX:IMB_INSERT" id="bm_id3150752" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT" id="bm_id3150752" localize="false"/>
 <paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2" l10n="U" oldref="7">Insert Function into calculation sheet</paragraph>
 <table id="tbl_id3153711">
 <tablerow>
diff --git a/helpcontent2/source/text/scalc/01/04090000.xhp b/helpcontent2/source/text/scalc/01/04090000.xhp
index 666c5a20fa..51e24bca0a 100644
--- a/helpcontent2/source/text/scalc/01/04090000.xhp
+++ b/helpcontent2/source/text/scalc/01/04090000.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04090000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,44 +27,41 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
 <meta>
-<topic id="textscalc0104090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Link to External Data</title>
-<filename>/text/scalc/01/04090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T13:51:02">UFI: changed name of menu (sc-features Calc: New menu entry "Sheet from File" in Insert menu)
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="extdata">
-<paragraph role="paragraph" id="par_id3153361" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" id="bm_id3151041" localize="false"/>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" visibility="hidden">Locate the file containing the data you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_EXTERNAL_SOURCE" id="bm_id3748965" localize="false"/><!-- HID added by script -->
+      <topic id="textscalc0104090000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Link to External Data</title>
+         <filename>/text/scalc/01/04090000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="extdata">
+         <paragraph xml-lang="en-US" id="par_id3153361" role="paragraph" l10n="E" oldref="1"
+                    localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE" id="bm_id3151041" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="2"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" visibility="hidden">Locate the file containing the data you want to insert.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_EXTERNAL_SOURCE" id="bm_id3748965" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertExternalDataSource" id="bm_id3150441" localize="false"/>
-<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="1" l10n="CHG" oldref="3"><link href="text/scalc/01/04090000.xhp" name="External Data">Link to External Data</link></paragraph>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:InsertExternalDataSourc">Inserts data from an HTML, Calc, or Excel file into the current sheet as a link. The data must be located within a named range.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="11">To import data from a <link href="text/scalc/guide/csv_formula.xhp" name="*.csv or *.txt">*.csv or *.txt</link> file, choose <emph>File - Open</emph> and then select the <emph>Files of type </emph>"Text CSV".</paragraph>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000404.xhp#eiextdata"/>
-</section>
-<embed href="text/scalc/guide/webquery.xhp#webquery"/>
+<paragraph xml-lang="en-US" id="hd_id3145785" role="heading" level="1" l10n="CHG"
+                    oldref="3"><link href="text/scalc/01/04090000.xhp" name="External Data">Link to External Data</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149262" role="paragraph" l10n="U" oldref="4"><ahelp hid=".uno:InsertExternalDataSourc">Inserts data from an HTML, Calc, or Excel file into the current sheet as a link. The data must be located within a named range.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000404.xhp#eiextdata"/>
+      </section>
+      <embed href="text/scalc/guide/webquery.xhp#webquery"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCDLG_LINKAREAURL" id="bm_id3148577" localize="false"/>
-<paragraph role="heading" id="hd_id3146984" xml-lang="en-US" level="2" l10n="U" oldref="5">URL of external data source.</paragraph>
-<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_SCDLG_LINKAREAURL">Enter the URL or the file name that contains the data that you want to insert, and then press <item type="keycode">Enter</item>.</ahelp><comment>only after Enter the URL will be requested from the net.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES" id="bm_id3153876" localize="false"/>
-<paragraph role="heading" id="hd_id3145251" xml-lang="en-US" level="2" l10n="U" oldref="7">Available tables/ranges</paragraph>
-<paragraph role="paragraph" id="par_id3147397" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES">Select the table or the data range that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_LINKAREA_BTN_RELOAD" id="bm_id3153418" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY" id="bm_id3150718" localize="false"/>
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Update every</paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY">Enter the number of seconds to wait before the external data are reloaded into the current document.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U" oldref="5">URL of external data source.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145366" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_SCDLG_LINKAREAURL">Enter the URL or the file name that contains the data that you want to insert, and then press Enter.</ahelp><comment>only after Enter the URL will be requested from the net.</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES" id="bm_id3153876" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145251" role="heading" level="2" l10n="U" oldref="7">Available tables/ranges</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147397" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES">Select the table or the data range that you want to insert.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD" id="bm_id3153418" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY" id="bm_id3150718" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U" oldref="9">Update every</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154017" role="paragraph" l10n="U" oldref="10"><ahelp hid="SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY">Enter the number of seconds to wait before the external data are reloaded into the current document.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/05020000.xhp b/helpcontent2/source/text/scalc/01/05020000.xhp
index 0602834e7b..1eea9a0d96 100644
--- a/helpcontent2/source/text/scalc/01/05020000.xhp
+++ b/helpcontent2/source/text/scalc/01/05020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05020600.xhp b/helpcontent2/source/text/scalc/01/05020600.xhp
index f7e5e8017a..313a0d4cc6 100644
--- a/helpcontent2/source/text/scalc/01/05020600.xhp
+++ b/helpcontent2/source/text/scalc/01/05020600.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05020600.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0105020600xml" indexer="include" status="PUBLISH">
@@ -52,19 +49,19 @@
   <embed href="text/scalc/00/00000405.xhp#fozelstz"/>
 </section>
 <paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="2" l10n="U" oldref="3">Protection</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL" id="bm_id3153192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL" id="bm_id3153192" localize="false"/>
 <paragraph role="heading" id="hd_id3125864" xml-lang="en-US" level="3" l10n="U" oldref="9">Hide all</paragraph>
 <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL">Hides formulas and contents of the selected cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_PROTECTED" id="bm_id3149260" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED" id="bm_id3149260" localize="false"/>
 <paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="5">Protected</paragraph>
 <paragraph role="paragraph" id="par_id3151119" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_PROTECTED">Prevents the selected cells from being modified.</ahelp></paragraph>
-<paragraph role="note" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="15">This cell protection only takes effect if you also protect the spreadsheet (<emph>Tools - Protect Document - Sheet</emph>).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR" id="bm_id3149958" localize="false"/>
+<paragraph role="note" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="15">This cell protection only takes effect if you also protect the sheet (<emph>Tools - Protect Document - Sheet</emph>).</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR" id="bm_id3149958" localize="false"/>
 <paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="7">Hide formula</paragraph>
 <paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR">Hides formulas in the selected cells.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155602" xml-lang="en-US" level="2" l10n="U" oldref="11">Print</paragraph>
 <paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="12">Defines print options for the sheet.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT" id="bm_id3153715" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT" id="bm_id3153715" localize="false"/>
 <paragraph role="heading" id="hd_id3155065" xml-lang="en-US" level="3" l10n="U" oldref="13">Hide when printing</paragraph>
 <paragraph role="paragraph" id="par_id3155443" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT">Keeps the selected cells from being printed.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/05030000.xhp b/helpcontent2/source/text/scalc/01/05030000.xhp
index ac6224625c..c2c32a2ba3 100755
--- a/helpcontent2/source/text/scalc/01/05030000.xhp
+++ b/helpcontent2/source/text/scalc/01/05030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05030200.xhp b/helpcontent2/source/text/scalc/01/05030200.xhp
index a51aea827a..eead59b05f 100644
--- a/helpcontent2/source/text/scalc/01/05030200.xhp
+++ b/helpcontent2/source/text/scalc/01/05030200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,10 +52,10 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000405.xhp#fozeiophoe"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:METRICFIELD:RID_SCDLG_ROW_OPT:ED_VALUE" id="bm_id3156280" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCDLG_ROW_OPT:ED_VALUE" id="bm_id3156280" localize="false"/>
 <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="3">Add</paragraph>
 <paragraph role="paragraph" id="par_id3151044" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:METRICFIELD:RID_SCDLG_ROW_OPT:ED_VALUE">Sets additional spacing between the largest character in a row and the cell boundaries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ROW_OPT:BTN_DEFVAL" id="bm_id3145271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL" id="bm_id3145271" localize="false"/>
 <paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="2" l10n="U" oldref="5">Default value</paragraph>
 <paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ROW_OPT:BTN_DEFVAL">Restores the default value for the optimal row height.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/05030300.xhp b/helpcontent2/source/text/scalc/01/05030300.xhp
index b9d83832f4..798432aae5 100644
--- a/helpcontent2/source/text/scalc/01/05030300.xhp
+++ b/helpcontent2/source/text/scalc/01/05030300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05030400.xhp b/helpcontent2/source/text/scalc/01/05030400.xhp
index 06b3befa29..acf7e5da5e 100644
--- a/helpcontent2/source/text/scalc/01/05030400.xhp
+++ b/helpcontent2/source/text/scalc/01/05030400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05040000.xhp b/helpcontent2/source/text/scalc/01/05040000.xhp
index e0bb2a5a21..953429d55f 100755
--- a/helpcontent2/source/text/scalc/01/05040000.xhp
+++ b/helpcontent2/source/text/scalc/01/05040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05040200.xhp b/helpcontent2/source/text/scalc/01/05040200.xhp
index 89b9883593..b8a8da2f28 100644
--- a/helpcontent2/source/text/scalc/01/05040200.xhp
+++ b/helpcontent2/source/text/scalc/01/05040200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,10 +54,10 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000405.xhp#fospob"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:METRICFIELD:RID_SCDLG_COL_OPT:ED_VALUE" id="bm_id3153192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCDLG_COL_OPT:ED_VALUE" id="bm_id3153192" localize="false"/>
 <paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="3">Add</paragraph>
 <paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:METRICFIELD:RID_SCDLG_COL_OPT:ED_VALUE">Defines additional spacing between the longest entry in a column and the vertical column borders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_COL_OPT:BTN_DEFVAL" id="bm_id3155855" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_COL_OPT:BTN_DEFVAL" id="bm_id3155855" localize="false"/>
 <paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="5">Default value</paragraph>
 <paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCDLG_COL_OPT:BTN_DEFVAL">Defines the optimal column width in order to display the entire contents of the column.</ahelp> The additional spacing for the optimal column width is preset to 0.1 in.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/05050000.xhp b/helpcontent2/source/text/scalc/01/05050000.xhp
index 0771c5a89e..b2a2c88767 100644
--- a/helpcontent2/source/text/scalc/01/05050000.xhp
+++ b/helpcontent2/source/text/scalc/01/05050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05050100.xhp b/helpcontent2/source/text/scalc/01/05050100.xhp
index df262cb4c3..418834a1d7 100644
--- a/helpcontent2/source/text/scalc/01/05050100.xhp
+++ b/helpcontent2/source/text/scalc/01/05050100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <bookmark_value>changing; sheet names</bookmark_value>
 <bookmark_value>sheets; renaming</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_STRINPUT" id="bm_id3149166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_STRINPUT" id="bm_id3149166" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FID_TAB_RENAME" id="bm_id8359250" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Name" id="bm_id3153252" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FID_TAB_MENU_RENAME" id="bm_id9504501" localize="false"/>
@@ -57,7 +54,7 @@
 <embed href="text/scalc/00/00000405.xhp#fotu"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_RENAME_NAME" id="bm_id3156280" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_STRINPUT:ED_INPUT" id="bm_id3154908" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_STRINPUT:ED_INPUT" id="bm_id3154908" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_APPEND_NAME" id="bm_id3151041" localize="false"/>
 <paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="C"><ahelp hid="HID_SC_APPEND_NAME">Enter a new name for the sheet here.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05050300.xhp b/helpcontent2/source/text/scalc/01/05050300.xhp
index d12efaa328..bce6abba63 100644
--- a/helpcontent2/source/text/scalc/01/05050300.xhp
+++ b/helpcontent2/source/text/scalc/01/05050300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
   <section id="howtoget">
   <embed href="text/scalc/00/00000405.xhp#fotenb"/>
 </section>
-  <bookmark branch="hid/SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" xml-lang="en-US" id="bm_id3149260"/><paragraph role="heading" level="2" id="hd_id3151112" l10n="U" xml-lang="en-US" oldref="3">Hidden sheets</paragraph>
+  <bookmark branch="hid/sc:MultiListBox:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" xml-lang="en-US" id="bm_id3149260"/><paragraph role="heading" level="2" id="hd_id3151112" l10n="U" xml-lang="en-US" oldref="3">Hidden sheets</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145273" xml-lang="en-US" oldref="4"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" visibility="visible">Displays a list of all hidden sheets in your spreadsheet document.</ahelp> To show a certain sheet, click the corresponding entry on the list and confirm with OK.</paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/05060000.xhp b/helpcontent2/source/text/scalc/01/05060000.xhp
index a33394a333..d47b3bf22d 100755
--- a/helpcontent2/source/text/scalc/01/05060000.xhp
+++ b/helpcontent2/source/text/scalc/01/05060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05070000.xhp b/helpcontent2/source/text/scalc/01/05070000.xhp
index 1cb7428051..add22f3457 100644
--- a/helpcontent2/source/text/scalc/01/05070000.xhp
+++ b/helpcontent2/source/text/scalc/01/05070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05070500.xhp b/helpcontent2/source/text/scalc/01/05070500.xhp
index f58ccc8010..929a863da5 100644
--- a/helpcontent2/source/text/scalc/01/05070500.xhp
+++ b/helpcontent2/source/text/scalc/01/05070500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070500.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,38 +52,38 @@
 </section>
 <paragraph role="heading" id="hd_id3150542" xml-lang="en-US" level="2" l10n="U" oldref="3">Print</paragraph>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="4">Defines which elements of the spreadsheet are to be printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_HEADER" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Column and row headers</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Column and row headers</paragraph>
 <paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_HEADER">Specifies whether you want the column and row headers to be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID" id="bm_id3154320" localize="false"/><paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="3" l10n="U" oldref="7">Grid</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID">Prints out the borders of the individual cells as a grid.</ahelp> For the view on screen, make your choice under <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060100.xhp" name="View"><emph>View</emph></link> - <emph>Grid lines</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES" id="bm_id3159153" localize="false"/><paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="9">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES">Prints the notes defined in your spreadsheet.</ahelp> They will be printed on a separate page, along with the corresponding cell reference.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_OBJECTS" id="bm_id3144764" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="11">Objects/graphics</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID" id="bm_id3154320" localize="false"/><paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="3" l10n="U" oldref="7">Grid</paragraph>
+<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID">Prints out the borders of the individual cells as a grid.</ahelp> For the view on screen, make your choice under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060100.xhp" name="View"><emph>View</emph></link> - <emph>Grid lines</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES" id="bm_id3159153" localize="false"/><paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="9">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES">Prints the comments defined in your spreadsheet.</ahelp> They will be printed on a separate page, along with the corresponding cell reference.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS" id="bm_id3144764" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="11">Objects/graphics</paragraph>
 <paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_OBJECTS">Includes all inserted objects (if printable) and graphics with the printed document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_CHARTS" id="bm_id3156283" localize="false"/><paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="13">Charts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS" id="bm_id3156283" localize="false"/><paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="13">Charts</paragraph>
 <paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_CHARTS">Prints the charts that have been inserted into your spreadsheet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_DRAWINGS" id="bm_id3153839" localize="false"/><paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="3" l10n="U" oldref="15">Drawing Objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS" id="bm_id3153839" localize="false"/><paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="3" l10n="U" oldref="15">Drawing Objects</paragraph>
 <paragraph role="paragraph" id="par_id3149122" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_DRAWINGS">Includes all drawing objects in the printed document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_FORMULAS" id="bm_id3155765" localize="false"/><paragraph role="heading" id="hd_id3150330" xml-lang="en-US" level="3" l10n="U" oldref="17">Formulas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS" id="bm_id3155765" localize="false"/><paragraph role="heading" id="hd_id3150330" xml-lang="en-US" level="3" l10n="U" oldref="17">Formulas</paragraph>
 <paragraph role="paragraph" id="par_id3153715" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_FORMULAS">Prints the formulas contained in the cells, instead of the results.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NULLVALS" id="bm_id3146314" localize="false"/><paragraph role="heading" id="hd_id3156385" xml-lang="en-US" level="3" l10n="U" oldref="19">Zero Values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS" id="bm_id3146314" localize="false"/><paragraph role="heading" id="hd_id3156385" xml-lang="en-US" level="3" l10n="U" oldref="19">Zero Values</paragraph>
 <paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NULLVALS">Specifies that cells with a zero value are printed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154022" xml-lang="en-US" level="2" l10n="U" oldref="21">Page Order</paragraph>
 <paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="U" oldref="22">Defines the order in which data in a sheet is numbered and printed when it does not fit on one printed page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_TABLE:BTN_TOPDOWN" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3152580" xml-lang="en-US" level="3" l10n="U" oldref="23">Top to bottom, then right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3152580" xml-lang="en-US" level="3" l10n="U" oldref="23">Top to bottom, then right</paragraph>
 <paragraph role="paragraph" id="par_id3150205" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_TABLE:BTN_TOPDOWN">Prints vertically from the left column to the bottom of the sheet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_TABLE:BTN_LEFTRIGHT" id="bm_id3150342" localize="false"/><paragraph role="heading" id="hd_id3150786" xml-lang="en-US" level="3" l10n="U" oldref="25">Left to right, then down</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT" id="bm_id3150342" localize="false"/><paragraph role="heading" id="hd_id3150786" xml-lang="en-US" level="3" l10n="U" oldref="25">Left to right, then down</paragraph>
 <paragraph role="paragraph" id="par_id3154657" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_TABLE:BTN_LEFTRIGHT">Prints horizontally from the top row of the sheet to the right column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_PAGENO" id="bm_id3150367" localize="false"/><paragraph role="heading" id="hd_id3150887" xml-lang="en-US" level="3" l10n="U" oldref="27">First page number</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO" id="bm_id3150367" localize="false"/><paragraph role="heading" id="hd_id3150887" xml-lang="en-US" level="3" l10n="U" oldref="27">First page number</paragraph>
 <paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_PAGENO">Select this option if you want the first page to start with a number other than 1.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_TABLE:ED_PAGENO" id="bm_id3156288" localize="false"/><paragraph role="paragraph" id="par_id3145389" xml-lang="en-US" l10n="CHG" oldref="35"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_TABLE:ED_PAGENO">Enter the number of the first page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO" id="bm_id3156288" localize="false"/><paragraph role="paragraph" id="par_id3145389" xml-lang="en-US" l10n="CHG" oldref="35"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_TABLE:ED_PAGENO">Enter the number of the first page.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146978" xml-lang="en-US" level="2" l10n="U" oldref="29">Scale</paragraph>
 <paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="U" oldref="30">Defines a page scale for the printed spreadsheet.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE" id="bm_id8574175" localize="false"/><paragraph role="heading" id="par_idN1096D" xml-lang="en-US" level="3" l10n="NEW">Scaling mode</paragraph>
 <paragraph role="paragraph" id="par_idN10971" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE">Select a scaling mode from the list box. Appropriate controls will be shown at the side of the list box.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155089" xml-lang="en-US" level="4" l10n="U" oldref="31">Reduce/enlarge printout</paragraph>
 <paragraph role="paragraph" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="32">Specifies a scaling factor to scale all printed pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_METRICFIELD_RID_SCPAGE_TABLE_ED_SCALEALL" id="bm_id3153067" localize="false"/><paragraph role="heading" id="par_idN1099A" xml-lang="en-US" level="5" l10n="NEW">Scaling factor</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL" id="bm_id3153067" localize="false"/><paragraph role="heading" id="par_idN1099A" xml-lang="en-US" level="5" l10n="NEW">Scaling factor</paragraph>
 <paragraph role="paragraph" id="par_id3152899" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="SC_METRICFIELD_RID_SCPAGE_TABLE_ED_SCALEALL" visibility="hidden">Enter a scaling factor. Factors less than 100 reduce the pages, higher factors enlarge the pages.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN109B2" xml-lang="en-US" level="4" l10n="NEW">Fit print range(s) to width/height</paragraph>
 <paragraph role="paragraph" id="par_idN109B5" xml-lang="en-US" l10n="NEW">Specifies the maximum number of pages horizontally (width) and vertically (height) on which every sheet with the current Page Style is to be printed. </paragraph>
@@ -107,7 +104,7 @@
 <paragraph role="paragraph" id="par_idN109EB" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT">Enter the maximum number of pages to be printed vertically stacked.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="4" l10n="CHG" oldref="33">Fit print range(s) on number of pages</paragraph>
 <paragraph role="paragraph" id="par_id3145074" xml-lang="en-US" l10n="CHG" oldref="34">Specifies the maximum number of pages on which every sheet with the current Page Style is to be printed. The scale will be reduced as necessary to fit the defined number of pages.<comment>UFI: fixes #112585#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_TABLE:ED_SCALEPAGENUM" id="bm_id3157983" localize="false"/><paragraph role="heading" id="par_idN10A26" xml-lang="en-US" level="5" l10n="NEW">Number of pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM" id="bm_id3157983" localize="false"/><paragraph role="heading" id="par_idN10A26" xml-lang="en-US" level="5" l10n="NEW">Number of pages</paragraph>
 <paragraph role="paragraph" id="par_id3144507" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_TABLE:ED_SCALEPAGENUM">Enter the maximum number of pages to be printed.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/05080000.xhp b/helpcontent2/source/text/scalc/01/05080000.xhp
index c5d7396564..470f829778 100755
--- a/helpcontent2/source/text/scalc/01/05080000.xhp
+++ b/helpcontent2/source/text/scalc/01/05080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05080100.xhp b/helpcontent2/source/text/scalc/01/05080100.xhp
index 588fa1e135..ec292b249b 100644
--- a/helpcontent2/source/text/scalc/01/05080100.xhp
+++ b/helpcontent2/source/text/scalc/01/05080100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05080200.xhp b/helpcontent2/source/text/scalc/01/05080200.xhp
index ec87d5fc36..c876a90c98 100644
--- a/helpcontent2/source/text/scalc/01/05080200.xhp
+++ b/helpcontent2/source/text/scalc/01/05080200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05080300.xhp b/helpcontent2/source/text/scalc/01/05080300.xhp
index 6be1baf33c..ad13fd77c6 100644
--- a/helpcontent2/source/text/scalc/01/05080300.xhp
+++ b/helpcontent2/source/text/scalc/01/05080300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080300.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,21 +50,21 @@
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/scalc/guide/printranges.xhp#printranges"/>
 </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AREAS:LB_PRINTAREA" id="bm_id3154910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_AREAS:ED_PRINTAREA" id="bm_id3150447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA" id="bm_id3154910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA" id="bm_id3150447" localize="false"/>
 <paragraph role="heading" id="hd_id3156281" xml-lang="en-US" level="2" l10n="U" oldref="3">Print range</paragraph>
 <paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:EDIT:RID_SCDLG_AREAS:ED_PRINTAREA">Allows you to modify a defined print range.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="5">Select <emph>-none-</emph> to remove a print range definition for the current spreadsheet. Select <emph>-entire sheet-</emph> to set the current sheet as a print range. Select <emph>-selection-</emph> to define the selected area of a spreadsheet as the print range. By selecting <emph>-user-defined-</emph>, you can define a print range that you have already defined using the <emph>Format - Print Ranges - Define</emph> command. If you have given a name to a range using the <emph>Insert - Names - Define</emph> command, this name will be displayed and can be selected from the list box.</paragraph>
 <paragraph role="paragraph" id="par_id3145272" xml-lang="en-US" l10n="U" oldref="6">In the right-hand text box, you can enter a print range by reference or by name. If the cursor is in the <emph>Print range</emph> text box, you can also select the print range in the spreadsheet with your mouse.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AREAS:LB_REPEATROW" id="bm_id3147435" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_AREAS:ED_REPEATROW" id="bm_id3153190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW" id="bm_id3147435" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW" id="bm_id3153190" localize="false"/>
 <paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="7">Rows to repeat</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_AREAS:ED_REPEATROW">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or $1" or "$2:$3".</ahelp> The list box displays <emph>-user defined-</emph>. You can also select <emph>-none-</emph> to remove a defined repeating row.</paragraph>
+<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_AREAS:ED_REPEATROW">Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3".</ahelp> The list box displays <emph>-user defined-</emph>. You can also select <emph>-none-</emph> to remove a defined repeating row.</paragraph>
 <paragraph role="paragraph" id="par_id3155418" xml-lang="en-US" l10n="U" oldref="9">You can also define repeating rows by dragging the mouse in the spreadsheet, if the cursor is in the <emph>Rows to repeat</emph> text field in the dialog.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AREAS:LB_REPEATCOL" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_AREAS:ED_REPEATCOL" id="bm_id3147396" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_AREAS:LB_REPEATCOL" id="bm_id3153876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_AREAS:ED_REPEATCOL" id="bm_id3147396" localize="false"/>
 <paragraph role="heading" id="hd_id3149581" xml-lang="en-US" level="2" l10n="U" oldref="10">Columns to repeat</paragraph>
 <paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:EDIT:RID_SCDLG_AREAS:ED_REPEATCOL">Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E".</ahelp> The list box then displays <emph>-user defined-</emph>. You can also select <emph>-none-</emph> to remove a defined repeating column.</paragraph>
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="12">You can also define repeating columns by dragging the mouse in the spreadsheet, if the cursor is in the <emph>Columns to repeat</emph> text field in the dialog.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05080400.xhp b/helpcontent2/source/text/scalc/01/05080400.xhp
index d3a8786ddf..f5fa9eef3f 100644
--- a/helpcontent2/source/text/scalc/01/05080400.xhp
+++ b/helpcontent2/source/text/scalc/01/05080400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/05100000.xhp b/helpcontent2/source/text/scalc/01/05100000.xhp
index f867669a47..a8a83f60e4 100644
--- a/helpcontent2/source/text/scalc/01/05100000.xhp
+++ b/helpcontent2/source/text/scalc/01/05100000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,146 +27,150 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalc0105100000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Styles and Formatting</title>
-<filename>/text/scalc/01/05100000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-03T10:45:59">UFI: deleted index bookmarks, corrected wording of bottom listbox to "style groups"</lastedited>
-</history>
-</meta>
-<body>
-<section id="gestalter">
+      <topic id="textscalc0105100000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Styles and Formatting</title>
+         <filename>/text/scalc/01/05100000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="gestalter">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150447"><bookmark_value>Stylist, see Styles and Formatting window</bookmark_value>
-<bookmark_value>Styles and Formatting window</bookmark_value>
-<bookmark_value>formats; Styles and Formatting window</bookmark_value>
-<bookmark_value>formatting; Styles and Formatting window</bookmark_value>
-<bookmark_value>paint can for applying styles</bookmark_value>
+         <bookmark_value>Styles and Formatting window</bookmark_value>
+         <bookmark_value>formats; Styles and Formatting window</bookmark_value>
+         <bookmark_value>formatting; Styles and Formatting window</bookmark_value>
+         <bookmark_value>paint can for applying styles</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/scalc/01/05100000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
-<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="CHG" oldref="2">Use the Styles and Formatting window to assign styles to objects and text sections. You can update Styles, modify existing Styles or create new Styles.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="CHG" oldref="30">The Styles and Formatting <link href="text/shared/00/00000005.xhp#andocken" name="dockable window">dockable window</link> can remain open while editing the document.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#gestalter"/>
-</section>
-<paragraph role="heading" id="hd_id3150012" xml-lang="en-US" level="2" l10n="U" oldref="36">How to apply a cell style:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3159155" xml-lang="en-US" l10n="U" oldref="37">Select the cell or cell range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145749" xml-lang="en-US" l10n="CHG" oldref="38">Double-click the style in the Styles and Formatting window.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="hd_id3150447" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/scalc/01/05100000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="CHG" oldref="2">Use the Styles and Formatting window to assign styles to objects and text sections. You can update Styles, modify existing Styles or create new Styles.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="CHG" oldref="30">The Styles and Formatting <link href="text/shared/00/00000005.xhp#andocken" name="dockable window">dockable window</link> can remain open while editing the document.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#gestalter"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3150012" role="heading" level="2" l10n="U"
+                 oldref="36">How to apply a cell style:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159155" role="listitem" l10n="U" oldref="37">Select the cell or cell range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145749" role="listitem" l10n="CHG" oldref="38">Double-click the style in the Styles and Formatting window.</paragraph>
+         </listitem>
+      </list>
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY2" id="bm_id5973914" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ParaStyle" id="bm_id3148456" localize="false"/>
-<paragraph role="heading" id="hd_id3153877" xml-lang="en-US" level="2" l10n="U" oldref="4">Cell Styles</paragraph>
-<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ParaStyle">Displays the list of the available Cell Styles for <link href="text/shared/00/00000005.xhp#formatierung" name="indirect cell formatting">indirect cell formatting</link>.</ahelp></paragraph>
-<table id="tbl_id3155602">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="E">
-<image id="img_id3153714" src="sc/res/sf01.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153714" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153877" role="heading" level="2" l10n="U" oldref="4">Cell Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145801" role="paragraph" l10n="U" oldref="6"><ahelp hid=".uno:ParaStyle">Displays the list of the available Cell Styles for <link href="text/shared/00/00000005.xhp#formatierung" name="indirect cell formatting">indirect cell formatting</link>.</ahelp></paragraph>
+      <table id="tbl_id3155602">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="E">
+<image id="img_id3153714" src="sc/res/sf01.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153714">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="5">Cell Styles</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="5">Cell Styles</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY4" id="bm_id3839136" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PageStyle" id="bm_id3155336" localize="false"/>
-<paragraph role="heading" id="hd_id3153963" xml-lang="en-US" level="2" l10n="U" oldref="7">Page Styles</paragraph>
-<paragraph role="paragraph" id="par_id3147003" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid=".uno:PageStyle">Displays the Page Styles available for indirect page formatting.</ahelp></paragraph>
-<table id="tbl_id3145791">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159100" xml-lang="en-US" l10n="E">
-<image id="img_id3149814" src="sw/imglst/sf04.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149814" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153963" role="heading" level="2" l10n="U" oldref="7">Page Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="CHG" oldref="9"><ahelp hid=".uno:PageStyle">Displays the Page Styles available for indirect page formatting.</ahelp></paragraph>
+      <table id="tbl_id3145791">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159100" role="paragraph" l10n="E">
+<image id="img_id3149814" src="sw/imglst/sf04.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149814">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150361" xml-lang="en-US" l10n="U" oldref="8">Page Styles</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150361" role="paragraph" l10n="U" oldref="8">Page Styles</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_WATERCAN" id="bm_id3150370" localize="false"/>
-<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="2" l10n="U" oldref="10">Fill Format Mode</paragraph>
-<paragraph role="paragraph" id="par_id3155531" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_TEMPLDLG_WATERCAN">Turns the Fill Format mode on and off. Use the paint can to assign the Style selected in the Styles and Formatting window.</ahelp></paragraph>
-<table id="tbl_id3156445">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155087" xml-lang="en-US" l10n="E">
-<image id="img_id3153068" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153068" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3150202" role="heading" level="2" l10n="U"
+                 oldref="10">Fill Format Mode</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155531" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="HID_TEMPLDLG_WATERCAN">Turns the Fill Format mode on and off. Use the paint can to assign the Style selected in the Styles and Formatting window.</ahelp></paragraph>
+      <table id="tbl_id3156445">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155087" role="paragraph" l10n="E">
+<image id="img_id3153068" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153068">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156198" xml-lang="en-US" l10n="U" oldref="11">Fill Format Mode</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156198" role="paragraph" l10n="U" oldref="11">Fill Format Mode</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3148870" xml-lang="en-US" level="3" l10n="U" oldref="13">How to apply a new style with the paint can:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145078" xml-lang="en-US" l10n="CHG" oldref="27">Select the desired style from the Styles and Formatting window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159098" xml-lang="en-US" l10n="U" oldref="28">Click the <emph>Fill Format Mode</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148609" xml-lang="en-US" l10n="U" oldref="15">Click a cell to format it, or drag your mouse over a certain range to format the whole range. Repeat this action for other cells and ranges.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149438" xml-lang="en-US" l10n="U" oldref="29">Click the <emph>Fill Format Mode</emph> again to exit this mode.</paragraph>
-</listitem>
-</list>
+      <paragraph xml-lang="en-US" id="hd_id3148870" role="heading" level="2" l10n="U"
+                 oldref="13">How to apply a new style with the paint can:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145078" role="listitem" l10n="CHG" oldref="27">Select the desired style from the Styles and Formatting window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159098" role="listitem" l10n="U" oldref="28">Click the <emph>Fill Format Mode</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148609" role="listitem" l10n="U" oldref="15">Click a cell to format it, or drag your mouse over a certain range to format the whole range. Repeat this action for other cells and ranges.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149438" role="listitem" l10n="U" oldref="29">Click the <emph>Fill Format Mode</emph> again to exit this mode.</paragraph>
+         </listitem>
+      </list>
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_NEWBYEXAMPLE" id="bm_id3150891" localize="false"/>
-<paragraph role="heading" id="hd_id3153975" xml-lang="en-US" level="2" l10n="U" oldref="16">New Style from Selection</paragraph>
-<paragraph role="paragraph" id="par_id3153248" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_TEMPLDLG_NEWBYEXAMPLE">Creates a new style based on the formatting of a selected object.</ahelp> Assign a name for the style in the <link href="text/shared/01/05140100.xhp" name="Create Style">Create Style</link> dialog.</paragraph>
-<table id="tbl_id3152873">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150050" xml-lang="en-US" l10n="E">
-<image id="img_id3154649" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154649" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153975" role="heading" level="2" l10n="U"
+                 oldref="16">New Style from Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149499" l10n="CHG" oldref="18"><ahelp hid="HID_TEMPLDLG_NEWBYEXAMPLE">Creates a new style based on the formatting of a selected object.</ahelp> Assign a name for the style in the <link href="text/shared/01/05140100.xhp" name="Create Style">Create Style</link> dialog.</paragraph>
+      <table id="tbl_id3152873">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150050" role="paragraph" l10n="E">
+<image id="img_id3154649" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154649">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="17">New Style from Selection</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146963" role="paragraph" l10n="U" oldref="17">New Style from Selection</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_UPDATEBYEXAMPLE" id="bm_id3153486" localize="false"/>
-<paragraph role="heading" id="hd_id3153813" xml-lang="en-US" level="2" l10n="U" oldref="19">Update Style</paragraph>
-<paragraph role="paragraph" id="par_id3154707" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="HID_TEMPLDLG_UPDATEBYEXAMPLE">Updates the Style selected in the Styles and Formatting window with the current formatting of the selected object.</ahelp></paragraph>
-<table id="tbl_id3149317">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145118" xml-lang="en-US" l10n="E">
-<image id="img_id3155754" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155754" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153813" role="heading" level="2" l10n="U"
+                 oldref="19">Update Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154707" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="HID_TEMPLDLG_UPDATEBYEXAMPLE">Updates the Style selected in the Styles and Formatting window with the current formatting of the selected object.</ahelp></paragraph>
+      <table id="tbl_id3149317">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph" l10n="E">
+<image id="img_id3155754" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155754">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147501" xml-lang="en-US" l10n="U" oldref="20">Update Style</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147501" role="paragraph" l10n="U" oldref="20">Update Style</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLATE_FMT" id="bm_id3147436" localize="false"/>
-<paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Style List</paragraph>
-<paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_TEMPLATE_FMT">Displays the list of the styles from the selected style category.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US" l10n="NEW">In the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link> you can choose commands to create a new style, delete a user-defined style, or change the selected style.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN109BE" role="heading" level="2" l10n="NEW">Style List</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN109C2" role="paragraph" l10n="NEW"><ahelp hid="HID_TEMPLATE_FMT">Displays the list of the styles from the selected style category.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN109D1" role="paragraph" l10n="NEW">In the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link> you can choose commands to create a new style, delete a user-defined style, or change the selected style.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLATE_FILTER" id="bm_id3151339" localize="false"/>
-<paragraph role="heading" id="hd_id3149053" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Style Groups<comment>UFI: use "groups" to be consistent with Writer</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="HID_TEMPLATE_FILTER">Lists the available style groups.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3149053" role="heading" level="2" l10n="CHG"
+                 oldref="24">Style Groups<comment>UFI: use "groups" to be consistent with Writer</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147299" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="HID_TEMPLATE_FILTER">Lists the available style groups.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/05110000.xhp b/helpcontent2/source/text/scalc/01/05110000.xhp
index 0e8560a7b4..4ea4a4c335 100755
--- a/helpcontent2/source/text/scalc/01/05110000.xhp
+++ b/helpcontent2/source/text/scalc/01/05110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,37 +47,37 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000405.xhp#foatfo"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AUTOFORMAT:LB_FORMAT" id="bm_id3145645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT" id="bm_id3145645" localize="false"/>
 <paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="3">Format</paragraph>
 <paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCDLG_AUTOFORMAT:LB_FORMAT">Choose a predefined AutoFormat to apply to a selected area in your sheet.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_ADD" id="bm_id3155600" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD" id="bm_id3155600" localize="false"/>
 <paragraph role="heading" id="hd_id3149410" xml-lang="en-US" level="2" l10n="U" oldref="5">Add</paragraph>
 <paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_ADD">Allows you to add the current formatting of a range of at least 4 x 4 cells to the list of predefined AutoFormats.</ahelp> The <link href="text/shared/01/05150101.xhp" name="Add AutoFormat">Add AutoFormat</link> dialog then appears.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_AUTOFMT_NAME" id="bm_id3153713" localize="false"/>
 <paragraph role="paragraph" id="par_id3153708" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SC_AUTOFMT_NAME">Enter a name and click <emph>OK</emph>. </ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_AUTOFORMAT:BTN_MORE" id="bm_id3154254" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE" id="bm_id3154254" localize="false"/>
 <paragraph role="heading" id="hd_id3150044" xml-lang="en-US" level="2" l10n="U" oldref="7">More</paragraph>
 <paragraph role="paragraph" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_AUTOFORMAT:BTN_MORE">Opens the <emph>Formatting</emph> section, which displays the formatting overrides that can be applied to the spreadsheet. Deselecting an option keeps the format of the current spreadsheet for that format type.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155961" xml-lang="en-US" level="3" l10n="U" oldref="9">Formatting</paragraph>
 <paragraph role="paragraph" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="10">In this section you can select or deselect the available formatting options. If you want to keep any of the settings currently in your spreadsheet, deselect the corresponding option.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT" id="bm_id3149210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT" id="bm_id3149210" localize="false"/>
 <paragraph role="heading" id="hd_id3154021" xml-lang="en-US" level="3" l10n="U" oldref="11">Number format</paragraph>
 <paragraph role="paragraph" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT">When marked, specifies that you want to retain the number format of the selected format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_BORDER" id="bm_id3150206" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_BORDER" id="bm_id3150206" localize="false"/>
 <paragraph role="heading" id="hd_id3149530" xml-lang="en-US" level="3" l10n="U" oldref="13">Borders</paragraph>
 <paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_BORDER">When marked, specifies that you want to retain the border of the selected format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_FONT" id="bm_id3150364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_FONT" id="bm_id3150364" localize="false"/>
 <paragraph role="heading" id="hd_id3154657" xml-lang="en-US" level="3" l10n="U" oldref="15">Font</paragraph>
 <paragraph role="paragraph" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_FONT">When marked, specifies that you want to retain the font of the selected format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_PATTERN" id="bm_id3150515" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_PATTERN" id="bm_id3150515" localize="false"/>
 <paragraph role="heading" id="hd_id3155379" xml-lang="en-US" level="3" l10n="U" oldref="17">Pattern</paragraph>
 <paragraph role="paragraph" id="par_id3150368" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_PATTERN">When marked, specifies that you want to retain the pattern of the selected format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT" id="bm_id3146978" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT" id="bm_id3146978" localize="false"/>
 <paragraph role="heading" id="hd_id3146115" xml-lang="en-US" level="3" l10n="U" oldref="19">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3156445" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT">When marked, specifies that you want to retain the alignment of the selected format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_ADJUST" id="bm_id3152892" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ADJUST" id="bm_id3152892" localize="false"/>
 <paragraph role="heading" id="hd_id3155811" xml-lang="en-US" level="3" l10n="U" oldref="21">AutoFit width and height</paragraph>
 <paragraph role="paragraph" id="par_id3148703" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SC:CHECKBOX:RID_SCDLG_AUTOFORMAT:BTN_ADJUST">When marked, specifies that you want to retain the width and height of the selected cells of the selected format.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_RENAME_AUTOFMT" id="bm_id3153309" localize="false"/>
diff --git a/helpcontent2/source/text/scalc/01/05120000.xhp b/helpcontent2/source/text/scalc/01/05120000.xhp
index a57f05498d..2de8eb0f53 100644
--- a/helpcontent2/source/text/scalc/01/05120000.xhp
+++ b/helpcontent2/source/text/scalc/01/05120000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.9.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,63 +29,70 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textscalc0105120000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Conditional Formatting</title>
-<filename>/text/scalc/01/05120000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0105120000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Conditional Formatting</title>
+         <filename>/text/scalc/01/05120000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_CONDFRMT" id="bm_id5008046" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id3147428" localize="false"/>
-<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="1" l10n="U" oldref="1">Conditional Formatting</paragraph>
-<paragraph role="paragraph" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="2"><variable id="bedingtetext"><ahelp hid=".uno:ConditionalFormatDialog">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1" l10n="U" oldref="1">Conditional Formatting</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="U" oldref="2"><variable id="bedingtetext"><ahelp hid=".uno:ConditionalFormatDialog">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
 </variable> If a style was already assigned to a cell, it remains unchanged. The style entered here is then evaluated. You can enter three conditions that query the contents of cell values or formulas. The conditions are evaluated from 1 to 3. If the condition 1 matches the condition, the defined style will be used. Otherwise, condition 2 is evaluated, and its defined style used. If this style does not match, condition 3 is evaluated.</paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000405.xhp#bedingte"/>
-</section>
-<paragraph role="warning" id="par_id2414014" xml-lang="en-US" l10n="NEW">To apply conditional formatting, AutoCalculate must be enabled. Choose Tools - Cell Contents - AutoCalculate (you see a check mark next to the command when AutoCalculate is enabled).</paragraph>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000405.xhp#bedingte"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id2414014" role="warning" l10n="NEW">To apply conditional formatting, AutoCalculate must be enabled. Choose Tools - Cell Contents - AutoCalculate (you see a check mark next to the command when AutoCalculate is enabled).</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153189"><bookmark_value>conditional formatting; conditions</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_CONDFORMAT:CBX_COND1" id="bm_id3152598" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_CONDFORMAT:CBX_COND2" id="bm_id3154490" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_CONDFORMAT:CBX_COND3" id="bm_id3155415" localize="false"/>
-<paragraph role="heading" id="hd_id3153189" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition 1/2/3</paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONDFORMAT:CBX_COND3">Mark the boxes corresponding to each condition and enter the corresponding condition.</ahelp> To close the dialog, click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND1_1" id="bm_id3149581" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND2_1" id="bm_id3153158" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_1" id="bm_id3149379" localize="false"/>
-<paragraph role="heading" id="hd_id3147394" xml-lang="en-US" level="2" l10n="U" oldref="5">Cell Value / Formula</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_1">Specifies if conditional formatting is dependent on a cell value or a formula.</ahelp> If you select a formula as a reference, the <emph>Cell Value Condition</emph> box is displayed to the right of the <emph>Cell value/Formula</emph> field. If the condition is "Formula is", enter a cell reference. If the cell reference is a value other than zero, the condition matches.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND1_2" id="bm_id3153712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND2_2" id="bm_id3145641" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_2" id="bm_id3154755" localize="false"/>
-<paragraph role="heading" id="hd_id3153709" xml-lang="en-US" level="2" l10n="U" oldref="7">Cell Value Condition</paragraph>
-<paragraph role="paragraph" id="par_id3153764" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_2">Choose a condition for the format to be applied to the selected cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE" id="bm_id3147345" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE" id="bm_id3146918" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE" id="bm_id3149257" localize="false"/>
-<paragraph role="heading" id="hd_id3156384" xml-lang="en-US" level="2" l10n="U" oldref="9">Cell Style</paragraph>
-<paragraph role="paragraph" id="par_id3145228" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE">Choose the style to be applied if the specified condition matches.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_2" id="bm_id3150298" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_1" id="bm_id3147001" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_2" id="bm_id3154020" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_1" id="bm_id3159236" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_1" id="bm_id3149207" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2" id="bm_id3158212" localize="false"/>
-<paragraph role="heading" id="hd_id3146316" xml-lang="en-US" level="2" l10n="U" oldref="11">Parameter field</paragraph>
-<paragraph role="paragraph" id="par_id3155114" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2" visibility="hidden">Enter a reference, value or formula.</ahelp> Enter a reference, value or formula in the parameter field, or in both parameter fields if you have selected a condition that requires two parameters. You can also enter formulas containing relative references.</paragraph>
-<paragraph role="paragraph" id="par_id3145257" xml-lang="en-US" l10n="U" oldref="13">Once the parameters have been defined, the condition is complete. It may appear as:</paragraph>
-<paragraph role="paragraph" id="par_id3150784" xml-lang="en-US" l10n="U" oldref="14">Cell value is equal 0: Cell style Null value (You must have already defined a cell style with this name before assigning it to a condition).</paragraph>
-<paragraph role="paragraph" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="15">Cell value is between $B$20 and $B$21: Cell style Result (The corresponding value limits must already exist in cells B20 and B21)</paragraph>
-<paragraph role="paragraph" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="16">Formula is SUM($A$1:$A$5)=10: Cell style Result (The selected cells are formatted with the Result style if the sum of the contents in cells A1 to A5 is equal to 10.</paragraph>
-<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN107E1" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
-</paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND1" id="bm_id3152598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND2" id="bm_id3154490" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND3" id="bm_id3155415" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153189" role="heading" level="2" l10n="U"
+                 oldref="18">Condition 1/2/3</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149413" role="paragraph" l10n="U" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONDFORMAT:CBX_COND3">Mark the boxes corresponding to each condition and enter the corresponding condition.</ahelp> To close the dialog, click <emph>OK</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_1" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_1" id="bm_id3153158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_1" id="bm_id3149379" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147394" role="heading" level="2" l10n="U" oldref="5">Cell Value / Formula</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_1">Specifies if conditional formatting is dependent on a cell value or a formula.</ahelp> If you select a formula as a reference, the <emph>Cell Value Condition</emph> box is displayed to the right of the <emph>Cell value/Formula</emph> field. If the condition is "Formula is", enter a cell reference. If the cell reference is a value other than zero, the condition matches.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_2" id="bm_id3153712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_2" id="bm_id3145641" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_2" id="bm_id3154755" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153709" role="heading" level="2" l10n="U" oldref="7">Cell Value Condition</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_2">Choose a condition for the format to be applied to the selected cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE" id="bm_id3147345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE" id="bm_id3146918" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE" id="bm_id3149257" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="9">Cell Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145228" role="paragraph" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE">Choose the style to be applied if the specified condition matches.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW" id="bm_id3149267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW" id="bm_id3149367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW" id="bm_id3249267" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0509200913175331" role="heading" level="2" l10n="NEW">New Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0509200913175368" role="paragraph" l10n="NEW"><ahelp hid=".">If you haven't already defined a style to be used, you can click New Style to open the Organizer tab page of the Cell Style dialog. Define a new style there and click OK.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_2" id="bm_id3150298" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_1" id="bm_id3147001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_2" id="bm_id3154020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_1" id="bm_id3159236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_1" id="bm_id3149207" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_2" id="bm_id3158212" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146316" role="heading" level="2" l10n="U"
+                 oldref="11">Parameter field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155114" role="paragraph" l10n="U" oldref="12"><ahelp hid="SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2" visibility="hidden">Enter a reference, value or formula.</ahelp> Enter a reference, value or formula in the parameter field, or in both parameter fields if you have selected a condition that requires two parameters. You can also enter formulas containing relative references.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145257" role="paragraph" l10n="U" oldref="13">Once the parameters have been defined, the condition is complete. It may appear as:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150784" role="paragraph" l10n="U" oldref="14">Cell value is equal 0: Cell style Null value (You must have already defined a cell style with this name before assigning it to a condition).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150365" role="paragraph" l10n="CHG" oldref="15">Cell value is between $B$20 and $B$21: Cell style Result (The corresponding value limits must already exist in cells B20 and B21).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152992" role="paragraph" l10n="CHG" oldref="16">Formula is SUM($A$1:$A$5)=10: Cell style Result (The selected cells are formatted with the Result style if the sum of the contents in cells A1 to A5 is equal to 10).</paragraph>
+      <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN107E1" role="paragraph" l10n="NEW">
+            <embedvar href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
+         </paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/06020000.xhp b/helpcontent2/source/text/scalc/01/06020000.xhp
index 33154a5cbc..ef4757b42e 100644
--- a/helpcontent2/source/text/scalc/01/06020000.xhp
+++ b/helpcontent2/source/text/scalc/01/06020000.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06020000.xhp,v $
- *
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030000.xhp b/helpcontent2/source/text/scalc/01/06030000.xhp
index 625d7d8159..754af7c701 100755
--- a/helpcontent2/source/text/scalc/01/06030000.xhp
+++ b/helpcontent2/source/text/scalc/01/06030000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,40 +29,38 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textscalc0106030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Detective</title>
-<filename>/text/scalc/01/06030000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T12:43:49">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="detektiv">
+      <topic id="textscalc0106030000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Detective</title>
+         <filename>/text/scalc/01/06030000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="detektiv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151245"><bookmark_value>cell links search</bookmark_value>
-<bookmark_value>searching; links in cells</bookmark_value>
-<bookmark_value>traces;precedents and dependents</bookmark_value>
-</bookmark><comment>mw made "searching..." a two level entry</comment>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06030000.xhp" name="Detective">Detective</link></paragraph>
-<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="2">This command activates the Spreadsheet Detective. With the Detective, you can trace the dependencies from the current formula cell to the cells in the spreadsheet.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000406.xhp#exdektv"/>
-</section>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="3">Once you have defined a trace, you can point with the mouse cursor to the trace. The mouse cursor will change its shape. Double-click the trace with this cursor to select the referenced cell at the end of the trace. <comment>If you define an icon in the spreadsheet, you can put your cursor on it. It will change into a magnifying glass with reference arrows. Double-click the visible icon to select the cell at the furthest end of the icon.</comment></paragraph>
-<embed href="text/scalc/01/06030100.xhp#spurzumvorgaenger"/>
-<embed href="text/scalc/01/06030200.xhp#spurzumvorgaengerentfernen"/>
-<embed href="text/scalc/01/06030300.xhp#spurzumnachfolger"/>
-<embed href="text/scalc/01/06030400.xhp#spurzumnachfolgerentfernen"/>
-<embed href="text/scalc/01/06030500.xhp#allespurenentfernen"/>
-<embed href="text/scalc/01/06030600.xhp#spurzumfehler"/>
-<embed href="text/scalc/01/06030800.xhp#dateneinkreisen"/>
-<embed href="text/scalc/01/06030900.xhp#spurenaktualisieren"/>
-<embed href="text/scalc/01/06031000.xhp#autoaktu"/>
-<embed href="text/scalc/01/06030700.xhp#fuellmodus"/>
-</body>
-</helpdocument>
+         <bookmark_value>searching; links in cells</bookmark_value>
+         <bookmark_value>traces;precedents and dependents</bookmark_value>
+         <bookmark_value>Formula Auditing,see Detective</bookmark_value>
+         <bookmark_value>Detective</bookmark_value>
+</bookmark><comment>MW added "Detective" and a cross-reference</comment>
+<paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06030000.xhp" name="Detective">Detective</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151211" role="paragraph" l10n="U" oldref="2">This command activates the Spreadsheet Detective. With the Detective, you can trace the dependencies from the current formula cell to the cells in the spreadsheet.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000406.xhp#exdektv"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150447" role="paragraph" l10n="U" oldref="3">Once you have defined a trace, you can point with the mouse cursor to the trace. The mouse cursor will change its shape. Double-click the trace with this cursor to select the referenced cell at the end of the trace. <comment>If you define an icon in the spreadsheet, you can put your cursor on it. It will change into a magnifying glass with reference arrows. Double-click the visible icon to select the cell at the furthest end of the icon.</comment></paragraph>
+      <embed href="text/scalc/01/06030100.xhp#spurzumvorgaenger"/>
+      <embed href="text/scalc/01/06030200.xhp#spurzumvorgaengerentfernen"/>
+      <embed href="text/scalc/01/06030300.xhp#spurzumnachfolger"/>
+      <embed href="text/scalc/01/06030400.xhp#spurzumnachfolgerentfernen"/>
+      <embed href="text/scalc/01/06030500.xhp#allespurenentfernen"/>
+      <embed href="text/scalc/01/06030600.xhp#spurzumfehler"/>
+      <embed href="text/scalc/01/06030800.xhp#dateneinkreisen"/>
+      <embed href="text/scalc/01/06030900.xhp#spurenaktualisieren"/>
+      <embed href="text/scalc/01/06031000.xhp#autoaktu"/>
+      <embed href="text/scalc/01/06030700.xhp#fuellmodus"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/06030100.xhp b/helpcontent2/source/text/scalc/01/06030100.xhp
index 5f0539ff7d..e53684a1ac 100644
--- a/helpcontent2/source/text/scalc/01/06030100.xhp
+++ b/helpcontent2/source/text/scalc/01/06030100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030200.xhp b/helpcontent2/source/text/scalc/01/06030200.xhp
index d00a7e0b23..e87302111c 100644
--- a/helpcontent2/source/text/scalc/01/06030200.xhp
+++ b/helpcontent2/source/text/scalc/01/06030200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030300.xhp b/helpcontent2/source/text/scalc/01/06030300.xhp
index 8b197aa55d..5bcbbbc830 100644
--- a/helpcontent2/source/text/scalc/01/06030300.xhp
+++ b/helpcontent2/source/text/scalc/01/06030300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030400.xhp b/helpcontent2/source/text/scalc/01/06030400.xhp
index dc4081653c..3145aa5f1b 100644
--- a/helpcontent2/source/text/scalc/01/06030400.xhp
+++ b/helpcontent2/source/text/scalc/01/06030400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030500.xhp b/helpcontent2/source/text/scalc/01/06030500.xhp
index 6a3da6bd0b..b54d5ee0ab 100644
--- a/helpcontent2/source/text/scalc/01/06030500.xhp
+++ b/helpcontent2/source/text/scalc/01/06030500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030600.xhp b/helpcontent2/source/text/scalc/01/06030600.xhp
index c7d57a76a9..b9d8036cf9 100644
--- a/helpcontent2/source/text/scalc/01/06030600.xhp
+++ b/helpcontent2/source/text/scalc/01/06030600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030700.xhp b/helpcontent2/source/text/scalc/01/06030700.xhp
index 65a0dfbef1..e3b662a2fd 100644
--- a/helpcontent2/source/text/scalc/01/06030700.xhp
+++ b/helpcontent2/source/text/scalc/01/06030700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030800.xhp b/helpcontent2/source/text/scalc/01/06030800.xhp
index 6b7cb0161b..be4c4378ac 100644
--- a/helpcontent2/source/text/scalc/01/06030800.xhp
+++ b/helpcontent2/source/text/scalc/01/06030800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030800.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06030900.xhp b/helpcontent2/source/text/scalc/01/06030900.xhp
index 658d127e8a..b03621d250 100644
--- a/helpcontent2/source/text/scalc/01/06030900.xhp
+++ b/helpcontent2/source/text/scalc/01/06030900.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030900.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06031000.xhp b/helpcontent2/source/text/scalc/01/06031000.xhp
index 54bb2e55de..80a16b229d 100644
--- a/helpcontent2/source/text/scalc/01/06031000.xhp
+++ b/helpcontent2/source/text/scalc/01/06031000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06031000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06040000.xhp b/helpcontent2/source/text/scalc/01/06040000.xhp
index 7d1993fffa..67bff56c46 100644
--- a/helpcontent2/source/text/scalc/01/06040000.xhp
+++ b/helpcontent2/source/text/scalc/01/06040000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,13 +48,13 @@
 </section>
 <paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="3">Default</paragraph>
 <paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="4">In this section, you can define the variables in your formula.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SOLVER:ED_FORMULACELL" id="bm_id3145171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL" id="bm_id3145171" localize="false"/>
 <paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="3" l10n="U" oldref="5">Formula cell</paragraph>
 <paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:EDIT:RID_SCDLG_SOLVER:ED_FORMULACELL">In the formula cell, enter the reference of the cell which contains the formula. It contains the current cell reference.</ahelp> Click another cell in the sheet to apply its reference to the text box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SOLVER:ED_TARGETVAL" id="bm_id3150441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL" id="bm_id3150441" localize="false"/>
 <paragraph role="heading" id="hd_id3154685" xml-lang="en-US" level="3" l10n="U" oldref="7">Target value</paragraph>
 <paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_SOLVER:ED_TARGETVAL">Specifies the value you want to achieve as a new result.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SOLVER:ED_VARCELL" id="bm_id3154013" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL" id="bm_id3154013" localize="false"/>
 <paragraph role="heading" id="hd_id3150012" xml-lang="en-US" level="3" l10n="U" oldref="9">Variable cell</paragraph>
 <paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_SOLVER:ED_VARCELL">Specifies the reference for the cell that contains the value you want to adjust in order to reach the target.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
diff --git a/helpcontent2/source/text/scalc/01/06050000.xhp b/helpcontent2/source/text/scalc/01/06050000.xhp
index e21672c52c..28329b0a84 100644
--- a/helpcontent2/source/text/scalc/01/06050000.xhp
+++ b/helpcontent2/source/text/scalc/01/06050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,24 +52,24 @@ dedr: reviewed</lastedited>
 <paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/scalc/guide/scenario.xhp#scenario"/>
 </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_NEWSCENARIO:ED_NAME" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_NEWSCENARIO:ED_NAME" id="bm_id3154123" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_SCENWIN_TOP" id="bm_id3153195" localize="false"/>
 <paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="3">Name of scenario</paragraph>
 <paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SC_SCENWIN_TOP">Defines the name for the scenario. Use a clear and unique name so you can easily identify the scenario.</ahelp> You can also modify a scenario name in the Navigator through the <emph>Properties </emph>context menu command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILINEEDIT:RID_SCDLG_NEWSCENARIO:ED_COMMENT" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:RID_SCDLG_NEWSCENARIO:ED_COMMENT" id="bm_id3152596" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_SCENWIN_BOTTOM" id="bm_id3156444" localize="false"/>
 <paragraph role="heading" id="hd_id3153954" xml-lang="en-US" level="2" l10n="U" oldref="14">Comment</paragraph>
 <paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_SC_SCENWIN_BOTTOM">Specifies additional information about the scenario. This information will be displayed in the <link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link> when you click the <emph>Scenarios</emph> icon and select the desired scenario.</ahelp> You can also modify this information in the Navigator through the <emph>Properties </emph>context menu command.</paragraph>
 <paragraph role="heading" id="hd_id3145273" xml-lang="en-US" level="2" l10n="U" oldref="16">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="17">This section is used to define some of the settings used in the scenario display.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME" id="bm_id3151119" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_NEWSCENARIO:LB_COLOR" id="bm_id3151118" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME" id="bm_id3151119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_NEWSCENARIO:LB_COLOR" id="bm_id3151118" localize="false"/>
 <paragraph role="heading" id="hd_id3145367" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Display border<comment>UFI: #i38688#</comment></paragraph>
 <paragraph role="paragraph" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCDLG_NEWSCENARIO:LB_COLOR">Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option.</ahelp> The border will have a title bar displaying the name of the last scenario. The button on the right of the scenario border offers you an overview of all the scenarios in this area, if several have been defined. You can choose any of the scenarios from this list without restrictions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_TWOWAY" id="bm_id3147124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_TWOWAY" id="bm_id3147124" localize="false"/>
 <paragraph role="heading" id="hd_id3149582" xml-lang="en-US" level="3" l10n="U" oldref="20">Copy back</paragraph>
 <paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_TWOWAY">Copies the values of cells that you change into the active scenario. If you do not select this option, the scenario is not changed when you change cell values. The behavior of the <emph>Copy back</emph> setting depends on the cell protection, the sheet protection, and the <emph>Prevent changes</emph> settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_COPYALL" id="bm_id3153418" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_COPYALL" id="bm_id3153418" localize="false"/>
 <paragraph role="heading" id="hd_id3149402" xml-lang="en-US" level="3" l10n="U" oldref="22">Copy entire sheet</paragraph>
 <paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_COPYALL">Copies the entire sheet into an additional scenario sheet. </ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_PROTECT" id="bm_id3014007" localize="false"/>
diff --git a/helpcontent2/source/text/scalc/01/06060000.xhp b/helpcontent2/source/text/scalc/01/06060000.xhp
index 800b622239..175fee51f7 100755
--- a/helpcontent2/source/text/scalc/01/06060000.xhp
+++ b/helpcontent2/source/text/scalc/01/06060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06060100.xhp b/helpcontent2/source/text/scalc/01/06060100.xhp
index 75a8f67735..ac2a61dd1b 100644
--- a/helpcontent2/source/text/scalc/01/06060100.xhp
+++ b/helpcontent2/source/text/scalc/01/06060100.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06060100.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0106060100xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Protecting Sheet</title>
 <filename>/text/scalc/01/06060100.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-05T13:57:21">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_SET_READ_ONLY_CELLS" id="bm_id5349783" localize="false"/><!-- HID added by script -->
@@ -57,7 +50,7 @@
 <paragraph role="tip" id="par_id3150329" xml-lang="en-US" l10n="U" oldref="17">Select <emph>Format - Cells - Cell Protection</emph>. Unmark the <emph>Protected</emph> box and click <emph>OK</emph>.</paragraph>
 <paragraph role="tip" id="par_id3156384" xml-lang="en-US" l10n="U" oldref="18">On the <emph>Tools - Protect Document - Sheet</emph> menu, activate protection for the sheet. Effective immediately, only the cell range you selected in step 1 can be edited.</paragraph>
 <paragraph role="tip" id="par_id3149566" xml-lang="en-US" l10n="U" oldref="9">To later change an unprotected area to a protected area, select the range. Next, on the <emph>Format - Cells - Cell Protection</emph> tab page, check the <emph>Protected</emph> box. Finally, choose the <emph>Tools - Protect Document - Sheet </emph>menu. The previously editable range is now protected.</paragraph>
-<paragraph role="tip" id="par_id3153964" xml-lang="en-US" l10n="U" oldref="10">Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The <emph>Delete</emph> and <emph>Move/Copy</emph> commands cannot be selected.</paragraph>
+<paragraph role="tip" id="par_id3153964" xml-lang="en-US" l10n="CHG" oldref="10">Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The <emph>Delete</emph> and <emph>Rename</emph> commands cannot be selected.</paragraph>
 <paragraph role="tip" id="par_id3150301" xml-lang="en-US" l10n="U" oldref="19">If a sheet is protected, you will not be able to modify or delete any Cell Styles.</paragraph>
 <paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="3">A protected sheet or cell range can no longer be modified until this protection is disabled. To disable the protection, choose the <emph>Tools - Protect Document - Sheet</emph> command. If no password was set, the sheet protection is immediately disabled. If the sheet was password protected, the <emph>Remove Protection</emph> dialog opens, where you must enter the password.</paragraph>
 <paragraph role="paragraph" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="11">Once saved, protected sheets can only be saved again by using the <emph>File - Save As</emph> command.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/06060200.xhp b/helpcontent2/source/text/scalc/01/06060200.xhp
index 755f34e1d4..8903828aff 100644
--- a/helpcontent2/source/text/scalc/01/06060200.xhp
+++ b/helpcontent2/source/text/scalc/01/06060200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06070000.xhp b/helpcontent2/source/text/scalc/01/06070000.xhp
index 12d728464b..73aa2a3693 100644
--- a/helpcontent2/source/text/scalc/01/06070000.xhp
+++ b/helpcontent2/source/text/scalc/01/06070000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06070000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +29,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0106070000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">AutoCalculate</title>
 <filename>/text/scalc/01/06070000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T12:59:56">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="automatisch">
diff --git a/helpcontent2/source/text/scalc/01/06080000.xhp b/helpcontent2/source/text/scalc/01/06080000.xhp
index 33e18158cf..60a45b752c 100644
--- a/helpcontent2/source/text/scalc/01/06080000.xhp
+++ b/helpcontent2/source/text/scalc/01/06080000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textscalc0106080000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Recalculate</title>
@@ -49,11 +46,16 @@
 <bookmark xml-lang="en-US" branch="hid/FID_RECALC" id="bm_id2661876" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Calculate" id="bm_id3156329" localize="false"/>
 <paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06080000.xhp" name="Recalculate">Recalculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates the current sheet. Use <item type="menuitem">Tools - Cell Contents - Recalculate</item> or press F9 to recalculate all changed formulas in the current sheet. </ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates all changed formulas. If AutoCalculate is enabled, the Recalculate command applies only to formulas like RAND or NOW.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/scalc/00/00000406.xhp#exnb"/>
 </section>
-<paragraph role="paragraph" id="par_id3150793" xml-lang="en-US" l10n="U" oldref="5">After the document has been recalculated, the display is refreshed. Any charts contained in the sheet are also refreshed.</paragraph>
+<paragraph role="paragraph" id="par_id315475899" xml-lang="en-US" l10n="NEW">Press F9 to recalculate. Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9 to recalculate all formulas in the document.</paragraph>
+
+<paragraph role="paragraph" id="par_id3150793" xml-lang="en-US" l10n="U" oldref="5">After the document has been recalculated, the display is refreshed. All charts are also refreshed.</paragraph>
+
+<paragraph role="paragraph" id="par_id315475855" xml-lang="en-US" l10n="NEW">The Add-In functions like RANDBETWEEN currently cannot respond to the Recalculate command or F9. Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9 to recalculate all formulas, including the Add-In functions.</paragraph>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/06130000.xhp b/helpcontent2/source/text/scalc/01/06130000.xhp
index baa204fafe..001d8f25a3 100644
--- a/helpcontent2/source/text/scalc/01/06130000.xhp
+++ b/helpcontent2/source/text/scalc/01/06130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/06990000.xhp b/helpcontent2/source/text/scalc/01/06990000.xhp
index a548cbbc5e..5e3bdd4d47 100755
--- a/helpcontent2/source/text/scalc/01/06990000.xhp
+++ b/helpcontent2/source/text/scalc/01/06990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06990000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/07080000.xhp b/helpcontent2/source/text/scalc/01/07080000.xhp
index 9bdf15a161..66a85500f0 100644
--- a/helpcontent2/source/text/scalc/01/07080000.xhp
+++ b/helpcontent2/source/text/scalc/01/07080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/07090000.xhp b/helpcontent2/source/text/scalc/01/07090000.xhp
index a3887f8ead..b30e7ab884 100644
--- a/helpcontent2/source/text/scalc/01/07090000.xhp
+++ b/helpcontent2/source/text/scalc/01/07090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07090000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12010000.xhp b/helpcontent2/source/text/scalc/01/12010000.xhp
index 90c05ed505..2b5221cdf8 100644
--- a/helpcontent2/source/text/scalc/01/12010000.xhp
+++ b/helpcontent2/source/text/scalc/01/12010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12010000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,18 +47,18 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dbrbf"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_DBNAMES:ED_NAME" id="bm_id3150868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_DBNAMES:ED_NAME" id="bm_id3150868" localize="false"/>
 <paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3150770" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:COMBOBOX:RID_SCDLG_DBNAMES:ED_NAME">Enter a name for the database range that you want to define, or select an existing name from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_DBNAMES:ED_DBAREA" id="bm_id3155133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_DBNAMES:ED_DBAREA" id="bm_id3155133" localize="false"/>
 <paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="6">Range</paragraph>
 <paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_DBNAMES:ED_DBAREA">Displays the selected cell range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD" id="bm_id3153951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD" id="bm_id3153951" localize="false"/>
 <paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="U" oldref="10">Add/Modify</paragraph>
 <paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE" id="bm_id3152596" localize="false"/>
 <paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">More &gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE">Shows additional <link href="text/scalc/01/12010100.xhp" name="options">options</link>.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12010100.xhp b/helpcontent2/source/text/scalc/01/12010100.xhp
index f212329415..4885ef34b1 100755
--- a/helpcontent2/source/text/scalc/01/12010100.xhp
+++ b/helpcontent2/source/text/scalc/01/12010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12010100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,13 +41,13 @@
   
   
   <paragraph role="heading" level="1" id="hd_id3154760" l10n="U" xml-lang="en-US" oldref="1">Options</paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_HEADER" xml-lang="en-US" id="bm_id3150399"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="3">Contains column labels</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER" xml-lang="en-US" id="bm_id3150399"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="3">Contains column labels</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3148798" xml-lang="en-US" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_HEADER" visibility="visible">Selected cell ranges contains labels.</ahelp></paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_SIZE" xml-lang="en-US" id="bm_id3156422"/><paragraph role="heading" level="3" id="hd_id3153970" l10n="U" xml-lang="en-US" oldref="5">Insert or delete cells</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_SIZE" xml-lang="en-US" id="bm_id3156422"/><paragraph role="heading" level="3" id="hd_id3153970" l10n="U" xml-lang="en-US" oldref="5">Insert or delete cells</paragraph>
   <paragraph l10n="U" xml-lang="en-US" oldref="6" role="paragraph" id="par_id3154684"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_SIZE" visibility="visible">Automatically inserts new rows and columns into the database range in your document when new records are added to the database.</ahelp> To manually update the database range, choose <emph>Data - Refresh</emph> <emph>Range</emph>.</paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_FORMAT" xml-lang="en-US" id="bm_id3151117"/><paragraph role="heading" level="3" id="hd_id3153768" l10n="U" xml-lang="en-US" oldref="7">Keep formatting</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_FORMAT" xml-lang="en-US" id="bm_id3151117"/><paragraph role="heading" level="3" id="hd_id3153768" l10n="U" xml-lang="en-US" oldref="7">Keep formatting</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147435" xml-lang="en-US" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_FORMAT" visibility="visible">Applies the existing cell format of headers and first data row to the whole database range.</ahelp></paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_STRIPDATA" xml-lang="en-US" id="bm_id3145748"/><paragraph role="heading" level="3" id="hd_id3155856" l10n="U" xml-lang="en-US" oldref="9">Don't save imported data</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_STRIPDATA" xml-lang="en-US" id="bm_id3145748"/><paragraph role="heading" level="3" id="hd_id3155856" l10n="U" xml-lang="en-US" oldref="9">Don't save imported data</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153363" xml-lang="en-US" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_STRIPDATA" visibility="visible">Only saves a reference to the database, and not the contents of the cells.</ahelp></paragraph>
   <paragraph role="heading" level="3" id="hd_id3147428" l10n="U" xml-lang="en-US" oldref="11">Source:</paragraph>
   <paragraph role="paragraph" id="par_id3148576" l10n="U" xml-lang="en-US" oldref="12">Displays information about the current database source and any existing operators.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12020000.xhp b/helpcontent2/source/text/scalc/01/12020000.xhp
index b4aeb8bffd..6944bc1ee6 100644
--- a/helpcontent2/source/text/scalc/01/12020000.xhp
+++ b/helpcontent2/source/text/scalc/01/12020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12030000.xhp b/helpcontent2/source/text/scalc/01/12030000.xhp
index 5c4c4e83f6..c46f89d29a 100644
--- a/helpcontent2/source/text/scalc/01/12030000.xhp
+++ b/helpcontent2/source/text/scalc/01/12030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12030100.xhp b/helpcontent2/source/text/scalc/01/12030100.xhp
index ba70970927..b8cbba2267 100644
--- a/helpcontent2/source/text/scalc/01/12030100.xhp
+++ b/helpcontent2/source/text/scalc/01/12030100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12030100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,30 +50,29 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#dnsosk"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="3">Sort by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="3">Sort by</paragraph>
 <paragraph role="paragraph" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1">Select the column that you want to use as the primary sort key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="3" l10n="U" oldref="5">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1" id="bm_id3149377" localize="false"/><paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="7">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2" id="bm_id3153876" localize="false"/><paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Then by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP1" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="3" l10n="U" oldref="5">Ascending</paragraph>
+<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1" id="bm_id3149377" localize="false"/><paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="7">Descending</paragraph>
+<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT2" id="bm_id3153876" localize="false"/><paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Then by</paragraph>
 <paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2">Select the column that you want to use as the secondary sort key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2" id="bm_id3150715" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="11">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2" id="bm_id3153709" localize="false"/><paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="3" l10n="U" oldref="13">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3" id="bm_id3156384" localize="false"/><paragraph role="heading" id="hd_id3154756" xml-lang="en-US" level="2" l10n="U" oldref="15">Then by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP2" id="bm_id3150715" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="11">Ascending</paragraph>
+<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2" id="bm_id3153709" localize="false"/><paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="3" l10n="U" oldref="13">Descending</paragraph>
+<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT3" id="bm_id3156384" localize="false"/><paragraph role="heading" id="hd_id3154756" xml-lang="en-US" level="2" l10n="U" oldref="15">Then by</paragraph>
 <paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3">Select the column that you want to use as the third sort key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3" id="bm_id3155960" localize="false"/><paragraph role="heading" id="hd_id3163808" xml-lang="en-US" level="3" l10n="U" oldref="17">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="19">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP3" id="bm_id3155960" localize="false"/><paragraph role="heading" id="hd_id3163808" xml-lang="en-US" level="3" l10n="U" oldref="17">Ascending</paragraph>
+<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="19">Descending</paragraph>
+<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SORT_ASCENDING" id="bm_id1196545" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SortAscending" id="bm_id3149207" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_SORT_DESCENDING" id="bm_id1104741" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SortDescending" id="bm_id3149211" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="2" l10n="U" oldref="21">Sort Ascending/Descending</paragraph>
-<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages. 
-</variable></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options.</variable></ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="CHG" oldref="25">Icons on the <emph>Standard</emph> toolbar</paragraph>
 <embed href="text/scalc/00/00000412.xhp#sysortieren"/>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12030200.xhp b/helpcontent2/source/text/scalc/01/12030200.xhp
index 58c4eecc8c..df02b3dc85 100755
--- a/helpcontent2/source/text/scalc/01/12030200.xhp
+++ b/helpcontent2/source/text/scalc/01/12030200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12030200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,43 +59,43 @@ YJ: checked again</lastedited>
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#dnstot"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE" id="bm_id3149664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE" id="bm_id3149664" localize="false"/>
 <paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2" l10n="U" oldref="3"> Case Sensitivity</paragraph>
 <paragraph role="paragraph" id="par_id3153091" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE"> Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies.</ahelp></paragraph>
 <paragraph role="note" id="par_idN10637" xml-lang="en-US" l10n="NEW"> Note for Asian languages: Check <emph>Case Sensitivity</emph> to apply multi-level collation. With multi-level collation, entries are first compared in their primitive forms with their cases and diacritics ignored. If they evaluate as the same, their diacritics are taken into account for the second-level comparison. If they still evaluate as the same, their cases, character widths, and Japanese Kana difference are considered for the third-level comparison.<comment>UFI: see #112590# and #112507#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL" id="bm_id3145271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL" id="bm_id3145271" localize="false"/>
 <paragraph role="heading" id="hd_id3155856" xml-lang="en-US" level="2" l10n="U" oldref="5"> Range contains column/row labels</paragraph>
 <paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL"> Omits the first row or the first column in the selection from the sort.</ahelp> The <emph>Direction</emph> setting at the bottom of the dialog defines the name and function of this check box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS" id="bm_id3149410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS" id="bm_id3149410" localize="false"/>
 <paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="2" l10n="U" oldref="7"> Include formats</paragraph>
 <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS"> Preserves the current cell formatting.</ahelp></paragraph><comment>&lt;BOOKMARK branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT" id="bm_id3149412" localize="false"/&gt;</comment><comment>Enable natural sort</comment><comment>&lt;AVIS hid="."&gt; Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number.&lt;/AVIS&gt;</comment><comment>When this option is not checked, a series of values such as Number1, Number2, Number3, ..., Number19, Number20, Number21 will be sorted as Number1, Number11, Number12, ..., Number19, Number2, Number20, Number21, Number3, and so on. With the natural sort feature enabled, the result will be Number1, Number2, Number3, ..., Number19, Number20, Number21.</comment>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT" id="bm_id3147124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT" id="bm_id3147124" localize="false"/>
 <paragraph role="heading" id="hd_id3153878" xml-lang="en-US" level="2" l10n="U" oldref="10"> Copy sort results to:</paragraph>
 <paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT"> Copies the sorted list to the cell range that you specify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA" id="bm_id3149403" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA" id="bm_id3149403" localize="false"/>
 <paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="3" l10n="U" oldref="12"> Sort results</paragraph>
 <paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA"> Select a named <link href="text/scalc/01/12010000.xhp" name="cell range"> cell range</link> where you want to display the sorted list, or enter a cell range in the input box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA" id="bm_id3153767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA" id="bm_id3153767" localize="false"/>
 <paragraph role="heading" id="hd_id3153707" xml-lang="en-US" level="3" l10n="U" oldref="14"> Sort results</paragraph>
 <paragraph role="paragraph" id="par_id3145642" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SC:EDIT:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA"> Enter the cell range where you want to display the sorted list, or select a named range from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER" id="bm_id3147339" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER" id="bm_id3147339" localize="false"/>
 <paragraph role="heading" id="hd_id3155445" xml-lang="en-US" level="2" l10n="CHG" oldref="16"> Custom sort order</paragraph>
 <paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"> Click here and then select the custom sort order that you want.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER" id="bm_id3146917" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER" id="bm_id3146917" localize="false"/>
 <paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="3" l10n="U" oldref="18"> Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <link href="text/shared/optionen/01060400.xhp" name="Tools - Options - %PRODUCTNAME Calc - Sort Lists"> Tools - Options - %PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060400.xhp" name="%PRODUCTNAME Calc - Sort Lists">%PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="2" l10n="U" oldref="28"> Language</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE" id="bm_id3150299" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE" id="bm_id3150299" localize="false"/>
 <paragraph role="heading" id="hd_id3147004" xml-lang="en-US" level="3" l10n="U" oldref="29"> Language</paragraph>
 <paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE"> Select the language for the sorting rules.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_ALGORITHM" id="bm_id3150304" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM" id="bm_id3150304" localize="false"/>
 <paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="3" l10n="U" oldref="30"> Options</paragraph>
 <paragraph role="paragraph" id="par_id3155113" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_ALGORITHM"> Select a sorting option for the language.</ahelp> For example, select the "phonebook" option for German to include the umlaut special character in the sorting.</paragraph>
 <paragraph role="heading" id="hd_id3152580" xml-lang="en-US" level="2" l10n="U" oldref="20"> Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN" id="bm_id3155507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN" id="bm_id3155507" localize="false"/>
 <paragraph role="heading" id="hd_id3154201" xml-lang="en-US" level="3" l10n="U" oldref="22"> Top to Bottom (Sort Rows)</paragraph>
 <paragraph role="paragraph" id="par_id3166430" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN"> Sorts rows by the values in the active columns of the selected range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT" id="bm_id3155529" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT" id="bm_id3155529" localize="false"/>
 <paragraph role="heading" id="hd_id3145588" xml-lang="en-US" level="3" l10n="U" oldref="24"> Left to Right (Sort Columns)</paragraph>
 <paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT"> Sorts columns by the values in the active rows of the selected range.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156290" xml-lang="en-US" level="2" l10n="U" oldref="26"> Data area</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12040000.xhp b/helpcontent2/source/text/scalc/01/12040000.xhp
index 493bb5201d..8dcc45e37f 100755
--- a/helpcontent2/source/text/scalc/01/12040000.xhp
+++ b/helpcontent2/source/text/scalc/01/12040000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12040100.xhp b/helpcontent2/source/text/scalc/01/12040100.xhp
index bee4f58e6f..217950d994 100644
--- a/helpcontent2/source/text/scalc/01/12040100.xhp
+++ b/helpcontent2/source/text/scalc/01/12040100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12040201.xhp b/helpcontent2/source/text/scalc/01/12040201.xhp
index dea806d13c..5f6284d5da 100755
--- a/helpcontent2/source/text/scalc/01/12040201.xhp
+++ b/helpcontent2/source/text/scalc/01/12040201.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040201.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,42 +39,42 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3148492" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_FILTER:BTN_MORE" id="bm_id3152350" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_SPEC_FILTER:BTN_MORE" id="bm_id3156023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE" id="bm_id3152350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE" id="bm_id3156023" localize="false"/>
 <paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="2"><variable id="zusaetzetext"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_SPEC_FILTER:BTN_MORE">Shows additional filter options.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#filterzus"/>
 </section>
 <paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_CASE" id="bm_id3151210" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_CASE" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE" id="bm_id3150871" localize="false"/>
 <paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="5">Case sensitive</paragraph>
 <paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_CASE">Distinguishes between uppercase and lowercase letters when filtering the data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_HEADER" id="bm_id3153968" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_HEADER" id="bm_id3145173" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER" id="bm_id3153968" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER" id="bm_id3145173" localize="false"/>
 <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="U" oldref="7">Range contains column labels</paragraph>
 <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_HEADER">Includes the column labels in the first row of a cell range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_COPY_RESULT" id="bm_id3147426" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT" id="bm_id3148576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COPY_AREA" id="bm_id3163713" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA" id="bm_id3147349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FILTER:ED_COPY_AREA" id="bm_id3147348" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA" id="bm_id3153093" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT" id="bm_id3147426" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT" id="bm_id3148576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA" id="bm_id3163713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA" id="bm_id3147349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA" id="bm_id3147348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA" id="bm_id3153093" localize="false"/>
 <paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="9">Copy results to</paragraph>
 <paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA">Select the check box, and then select the cell range where you want to display the filter results.</ahelp> You can also select a named range from the list.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_REGEXP" id="bm_id3153726" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_REGEXP" id="bm_id3153144" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP" id="bm_id3153726" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP" id="bm_id3153144" localize="false"/>
 <paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="11">Regular expression</paragraph>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_REGEXP">Allows you to use wildcards in the filter definition.</ahelp> For a list of the regular expressions that $[officename] supports, click <link href="text/shared/01/02100001.xhp" name="here">here</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="CHG" oldref="33">If the <emph>Regular Expressions</emph> check box is selected, you can use regular expressions in the Value field if the Condition list box is set to '=' EQUAL or '&lt;&gt;' UNEQUAL. This also applies to the respective cells that you reference for an advanced filter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_UNIQUE" id="bm_id3149410" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE" id="bm_id3147126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE" id="bm_id3149410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE" id="bm_id3147126" localize="false"/>
 <paragraph role="heading" id="hd_id3149958" xml-lang="en-US" level="3" l10n="U" oldref="34">No duplication</paragraph>
 <paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE">Excludes duplicate rows in the list of filtered data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS" id="bm_id3149403" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_DEST_PERS" id="bm_id3149402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS" id="bm_id3149403" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS" id="bm_id3149402" localize="false"/>
 <paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="3" l10n="U" oldref="40">Keep filter criteria</paragraph>
 <paragraph role="paragraph" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SC:CHECKBOX:RID_SCDLG_FILTER:BTN_DEST_PERS">Select the <emph>Copy results to</emph> check box, and then specify the destination range where you want to display the filtered data. If this box is checked, the destination range remains linked to the source range. You must have defined the source range under <emph>Data - Define range</emph> as a database range.</ahelp> Following this, you can reapply the defined filter at any time as follows: click into the source range, then choose <emph>Data - Refresh Range</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2" l10n="U" oldref="36">Data range</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12040300.xhp b/helpcontent2/source/text/scalc/01/12040300.xhp
index caa3965d50..d2127ef611 100644
--- a/helpcontent2/source/text/scalc/01/12040300.xhp
+++ b/helpcontent2/source/text/scalc/01/12040300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040300.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,8 +49,8 @@
 <paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/scalc/guide/filters.xhp#filters"/>
 </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA" id="bm_id3149664" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA" id="bm_id3151113" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA" id="bm_id3149664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA" id="bm_id3151113" localize="false"/>
 <paragraph role="heading" id="hd_id3153771" xml-lang="en-US" level="2" l10n="U" oldref="25">Read filter criteria from</paragraph>
 <paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
diff --git a/helpcontent2/source/text/scalc/01/12040400.xhp b/helpcontent2/source/text/scalc/01/12040400.xhp
index 2d7fcbc11c..0a9d7bbf90 100644
--- a/helpcontent2/source/text/scalc/01/12040400.xhp
+++ b/helpcontent2/source/text/scalc/01/12040400.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040400.xhp,v $
- *
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12040500.xhp b/helpcontent2/source/text/scalc/01/12040500.xhp
index 6fdf07d3a3..f2f70f5111 100644
--- a/helpcontent2/source/text/scalc/01/12040500.xhp
+++ b/helpcontent2/source/text/scalc/01/12040500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12050000.xhp b/helpcontent2/source/text/scalc/01/12050000.xhp
index 62b8160d0a..b2af37deb4 100644
--- a/helpcontent2/source/text/scalc/01/12050000.xhp
+++ b/helpcontent2/source/text/scalc/01/12050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12050100.xhp b/helpcontent2/source/text/scalc/01/12050100.xhp
index 0a916072d0..3683ee7310 100755
--- a/helpcontent2/source/text/scalc/01/12050100.xhp
+++ b/helpcontent2/source/text/scalc/01/12050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12050100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12050200.xhp b/helpcontent2/source/text/scalc/01/12050200.xhp
index eb6adb83f7..e425ee5659 100755
--- a/helpcontent2/source/text/scalc/01/12050200.xhp
+++ b/helpcontent2/source/text/scalc/01/12050200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12050200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,21 +49,21 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#dntopi"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK" id="bm_id3155131" localize="false"/><paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="2" l10n="U" oldref="3">Page break between groups</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK" id="bm_id3155131" localize="false"/><paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="2" l10n="U" oldref="3">Page break between groups</paragraph>
 <paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK">Inserts a new page after each group of subtotaled data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE" id="bm_id3151115" localize="false"/><paragraph role="heading" id="hd_id3146985" xml-lang="en-US" level="2" l10n="U" oldref="5">Case sensitive</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE" id="bm_id3151115" localize="false"/><paragraph role="heading" id="hd_id3146985" xml-lang="en-US" level="2" l10n="U" oldref="5">Case sensitive</paragraph>
 <paragraph role="paragraph" id="par_id3153190" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE">Recalculates subtotals when you change the case of a data label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT" id="bm_id3152596" localize="false"/><paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="2" l10n="U" oldref="7">Pre-sort area according to groups</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT" id="bm_id3152596" localize="false"/><paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="2" l10n="U" oldref="7">Pre-sort area according to groups</paragraph>
 <paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT">Sorts the area that you selected in the <emph>Group by</emph> box of the Group tabs according to the columns that you selected.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153951" xml-lang="en-US" level="2" l10n="U" oldref="9">Sort</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS" id="bm_id3147397" localize="false"/><paragraph role="heading" id="hd_id3145252" xml-lang="en-US" level="3" l10n="U" oldref="11">Include formats</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS" id="bm_id3147397" localize="false"/><paragraph role="heading" id="hd_id3145252" xml-lang="en-US" level="3" l10n="U" oldref="11">Include formats</paragraph>
 <paragraph role="paragraph" id="par_id3147125" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS">Considers formatting attributes when sorting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF" id="bm_id3154729" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF" id="bm_id3153877" localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="13">Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING" id="bm_id3150327" localize="false"/><paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="15">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING" id="bm_id3150324" localize="false"/><paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="17">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF" id="bm_id3153877" localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="13">Custom sort order</paragraph>
+<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined in the Options dialog box at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING" id="bm_id3150327" localize="false"/><paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="15">Ascending</paragraph>
+<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING" id="bm_id3150324" localize="false"/><paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="17">Descending</paragraph>
+<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12060000.xhp b/helpcontent2/source/text/scalc/01/12060000.xhp
index 8bff0c78ff..cf7ce3f670 100644
--- a/helpcontent2/source/text/scalc/01/12060000.xhp
+++ b/helpcontent2/source/text/scalc/01/12060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12060000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
 <paragraph role="note" id="par_id3152598" xml-lang="en-US" l10n="U" oldref="5">The <emph>Row</emph> or <emph>Column</emph> box must contain a reference to the first cell of the selected range.</paragraph>
 <paragraph role="note" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="16">If you export a spreadsheet containing multiple operations to Microsoft Excel, the location of the cells containing the formula must be fully defined relative to the data range.</paragraph>
 <paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="U" oldref="3">Defaults</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE" id="bm_id3149581" localize="false"/>
 <paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="3" l10n="U" oldref="6">Formulas</paragraph>
 <paragraph role="paragraph" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE">Enter the cell references for the cells containing the formulas that you want to use in the multiple operation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL" id="bm_id3156286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL" id="bm_id3156286" localize="false"/>
 <paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="8">Row</paragraph>
 <paragraph role="paragraph" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL">Enter the input cell reference that you want to use as a variable for the rows in the data table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL" id="bm_id3149123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_TABOP:ED_COLCELL" id="bm_id3149123" localize="false"/>
 <paragraph role="heading" id="hd_id3150718" xml-lang="en-US" level="3" l10n="U" oldref="14">Column</paragraph>
 <paragraph role="paragraph" id="par_id3150327" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL">Enter the input cell reference that you want to use as a variable for the columns in the data table.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
diff --git a/helpcontent2/source/text/scalc/01/12070000.xhp b/helpcontent2/source/text/scalc/01/12070000.xhp
index 7a8e2d9fce..19f579e5e3 100644
--- a/helpcontent2/source/text/scalc/01/12070000.xhp
+++ b/helpcontent2/source/text/scalc/01/12070000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,26 +46,26 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dnksd"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC" id="bm_id3149958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC" id="bm_id3149958" localize="false"/>
 <paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="8">Function</paragraph>
 <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC">Select the function that you want to use to consolidate the data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS" id="bm_id3144764" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS" id="bm_id3144764" localize="false"/>
 <paragraph role="heading" id="hd_id3147127" xml-lang="en-US" level="2" l10n="U" oldref="10">Consolidation ranges</paragraph>
 <paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS">Displays the cell ranges that you want to consolidate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA" id="bm_id3149400" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA" id="bm_id3154018" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA" id="bm_id3149400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA" id="bm_id3154018" localize="false"/>
 <paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="12">Source data range</paragraph>
 <paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA">Specifies the cell range that you want to consolidate with the cell ranges listed in the <emph>Consolidation ranges </emph>box. Select a cell range in a sheet, and then click <emph>Add</emph>. You can also select a the name of a predefined cell from the <emph>Source data range </emph>list.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA" id="bm_id3156383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA" id="bm_id3156383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA" id="bm_id3156382" localize="false"/>
 <paragraph role="heading" id="hd_id3155768" xml-lang="en-US" level="2" l10n="U" oldref="15">Copy results to</paragraph>
 <paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA">Displays the first cell in the range where the consolidation results will be displayed.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD" id="bm_id3145228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_ADD" id="bm_id3145228" localize="false"/>
 <paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph>
 <paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD">Adds the cell range specified in the <emph>Source data range</emph> box to the <emph>Consolidation ranges </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE" id="bm_id3159102" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE" id="bm_id3159102" localize="false"/>
 <paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="2" l10n="U" oldref="19">More &gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE">Shows additional <link href="text/scalc/01/12070100.xhp" name="options">options</link>.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12070100.xhp b/helpcontent2/source/text/scalc/01/12070100.xhp
index 382804fb2e..1206beb78d 100755
--- a/helpcontent2/source/text/scalc/01/12070100.xhp
+++ b/helpcontent2/source/text/scalc/01/12070100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,12 +43,12 @@
   <paragraph role="heading" level="1" id="hd_id3151210" l10n="U" xml-lang="en-US" oldref="1">Consolidate by</paragraph>
   <paragraph role="heading" level="2" id="hd_id3125864" l10n="U" xml-lang="en-US" oldref="2">Consolidate by</paragraph>
   <paragraph role="paragraph" id="par_id3154909" l10n="U" xml-lang="en-US" oldref="3">Use this section if the cell ranges that you want to consolidate contain labels. You only need to select these options if the consolidation ranges contain similar labels and the data arranged is arranged differently.</paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYROW" xml-lang="en-US" id="bm_id3154684"/><paragraph role="heading" level="3" id="hd_id3153968" l10n="U" xml-lang="en-US" oldref="4">Row labels</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYROW" xml-lang="en-US" id="bm_id3154684"/><paragraph role="heading" level="3" id="hd_id3153968" l10n="U" xml-lang="en-US" oldref="4">Row labels</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150441" xml-lang="en-US" oldref="5"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYROW" visibility="visible">Uses the row labels to arrange the consolidated data.</ahelp></paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYCOL" xml-lang="en-US" id="bm_id3149260"/><paragraph role="heading" level="3" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="6">Column labels</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYCOL" xml-lang="en-US" id="bm_id3149260"/><paragraph role="heading" level="3" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="6">Column labels</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155411" xml-lang="en-US" oldref="7"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYCOL" visibility="visible">Uses the column labels to arrange the consolidated data.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3153191" l10n="U" xml-lang="en-US" oldref="12">Options</paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_REFS" xml-lang="en-US" id="bm_id3153954"/><paragraph role="heading" level="3" id="hd_id3159154" l10n="U" xml-lang="en-US" oldref="8">Link to source data</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS" xml-lang="en-US" id="bm_id3153954"/><paragraph role="heading" level="3" id="hd_id3159154" l10n="U" xml-lang="en-US" oldref="8">Link to source data</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3146986" xml-lang="en-US" oldref="9"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_REFS" visibility="visible">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3163708" l10n="U" xml-lang="en-US" oldref="10">More &lt;&lt;</paragraph>
   <paragraph role="paragraph" id="par_id3151118" l10n="U" xml-lang="en-US" oldref="11">Hides the additional options.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12080000.xhp b/helpcontent2/source/text/scalc/01/12080000.xhp
index 083e1c9bd0..bcc563e715 100755
--- a/helpcontent2/source/text/scalc/01/12080000.xhp
+++ b/helpcontent2/source/text/scalc/01/12080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12080100.xhp b/helpcontent2/source/text/scalc/01/12080100.xhp
index b6a6262e93..b26a6db4f4 100644
--- a/helpcontent2/source/text/scalc/01/12080100.xhp
+++ b/helpcontent2/source/text/scalc/01/12080100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12080200.xhp b/helpcontent2/source/text/scalc/01/12080200.xhp
index 975d7de478..4e095cda57 100644
--- a/helpcontent2/source/text/scalc/01/12080200.xhp
+++ b/helpcontent2/source/text/scalc/01/12080200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:ShowDetail" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12080200.xhp" name="Show Details">Show Details</link></paragraph>
 <paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShowDetail">Shows the details of the grouped row or column that contains the cursor. To show the details of all of the grouped rows or columns, select the outlined table, and then choose this command.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="3">To hide a selected group, choose <emph>Data -Outline –</emph><link href="text/scalc/01/12080100.xhp" name="Hide Details"><emph>Hide Details</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="3">To hide a selected group, choose <emph>Data -Outline – </emph><link href="text/scalc/01/12080100.xhp" name="Hide Details"><emph>Hide Details</emph></link>.</paragraph>
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dngde"/>
 </section>
diff --git a/helpcontent2/source/text/scalc/01/12080300.xhp b/helpcontent2/source/text/scalc/01/12080300.xhp
index 71e95db7ad..b900695f31 100644
--- a/helpcontent2/source/text/scalc/01/12080300.xhp
+++ b/helpcontent2/source/text/scalc/01/12080300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
   
   
   <section id="gruppieren">
-  <bookmark branch="hid/SC:MODALDIALOG:RID_SCDLG_GROUP" xml-lang="en-US" id="bm_id3156329"/><bookmark xml-lang="en-US" branch="hid/SID_OUTLINE_MAKE" id="bm_id9177845" localize="false"/><!-- HID added by script -->
+  <bookmark branch="hid/sc:ModalDialog:RID_SCDLG_GROUP" xml-lang="en-US" id="bm_id3156329"/><bookmark xml-lang="en-US" branch="hid/SID_OUTLINE_MAKE" id="bm_id9177845" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:Group" xml-lang="en-US" id="bm_id3149786"/><paragraph id="hd_id3153088" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12080300.xhp" name="Group">Group</link></paragraph>
   </section>
   <paragraph l10n="U" role="paragraph" id="par_id3153821" xml-lang="en-US" oldref="2"><variable id="gruppierung"><ahelp hid=".uno:Group" visibility="visible">Defines the selected cell range as a group of rows or columns.</ahelp></variable></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12080400.xhp b/helpcontent2/source/text/scalc/01/12080400.xhp
index 4eca8ca4a9..b0786494de 100644
--- a/helpcontent2/source/text/scalc/01/12080400.xhp
+++ b/helpcontent2/source/text/scalc/01/12080400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12080500.xhp b/helpcontent2/source/text/scalc/01/12080500.xhp
index 46d3b85956..45d8cb4008 100644
--- a/helpcontent2/source/text/scalc/01/12080500.xhp
+++ b/helpcontent2/source/text/scalc/01/12080500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12080600.xhp b/helpcontent2/source/text/scalc/01/12080600.xhp
index fa8507e8e1..a354132203 100644
--- a/helpcontent2/source/text/scalc/01/12080600.xhp
+++ b/helpcontent2/source/text/scalc/01/12080600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12080700.xhp b/helpcontent2/source/text/scalc/01/12080700.xhp
index 301b586922..06a1436c1b 100644
--- a/helpcontent2/source/text/scalc/01/12080700.xhp
+++ b/helpcontent2/source/text/scalc/01/12080700.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 12080700.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,7 +46,6 @@
 </section>
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#dngdrill"/>
-</section><comment>see http://wiki.services.openoffice.org/wiki/Calc/Features/DataPilot_drill-down_on_data_field</comment><comment>For instance, when the data field function is selected to be SUM, then the number that is shown in the data field cell must be identical to the sum of all the data field values in the constituent rows displayed in the inserted sheet. 
-UFI: this text from spec doc looks like a remark to the developer who implements this feature rather than something for the user</comment><paragraph role="note" id="par_id7132480" xml-lang="en-US" l10n="NEW">Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for DataPilot tables that are based on cell ranges or database data.</paragraph>
+</section><paragraph role="note" id="par_id7132480" xml-lang="en-US" l10n="NEW">Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for DataPilot tables that are based on cell ranges or database data.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12090000.xhp b/helpcontent2/source/text/scalc/01/12090000.xhp
index 72c430e782..ef77f1c7d8 100755
--- a/helpcontent2/source/text/scalc/01/12090000.xhp
+++ b/helpcontent2/source/text/scalc/01/12090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12090100.xhp b/helpcontent2/source/text/scalc/01/12090100.xhp
index ae39206f3c..1cf06da8dd 100644
--- a/helpcontent2/source/text/scalc/01/12090100.xhp
+++ b/helpcontent2/source/text/scalc/01/12090100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,14 +51,14 @@
 </section>
 <paragraph role="heading" id="hd_id3154760" xml-lang="en-US" level="2" l10n="U" oldref="5">Selection</paragraph>
 <paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="6">Select a data source for the DataPilot table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_SELECTION" id="bm_id3154908" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION" id="bm_id3154908" localize="false"/>
 <paragraph role="heading" id="hd_id3148799" xml-lang="en-US" level="3" l10n="U" oldref="7">Current Selection</paragraph>
 <paragraph role="paragraph" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_SELECTION">Uses the selected cells as the data source for the DataPilot table.</ahelp></paragraph>
 <paragraph role="note" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="13">The data columns in the DataPilot table use the same number format as the first data row in the current selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_DATABASE" id="bm_id3149664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE" id="bm_id3149664" localize="false"/>
 <paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Data source registered in $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_DATABASE">Uses a table or query in a database that is registered in $[officename] as the data source for the DataPilot table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_EXTERNAL" id="bm_id3153876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL" id="bm_id3153876" localize="false"/>
 <paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="3" l10n="U" oldref="11">External source/interface</paragraph>
 <paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_DAPITYPE:BTN_EXTERNAL">Opens the <emph>External Source </emph>dialog where you can select the <link href="text/shared/00/00000005.xhp" name="OLAP">OLAP</link> data source for the DataPilot table.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10670" xml-lang="en-US" l10n="NEW"><link href="text/scalc/01/12090102.xhp" name="DataPilot dialog">DataPilot dialog</link></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12090101.xhp b/helpcontent2/source/text/scalc/01/12090101.xhp
index 4dcf167040..8855a6bf2c 100755
--- a/helpcontent2/source/text/scalc/01/12090101.xhp
+++ b/helpcontent2/source/text/scalc/01/12090101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090101.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,14 +48,14 @@
   <embed href="text/scalc/00/00000412.xhp#dndq"/>
 </section>
 <paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME. To register a data source, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE" id="bm_id3154684" localize="false"/>
+<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME.</ahelp> To register a data source, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE" id="bm_id3154684" localize="false"/>
 <paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Database</paragraph>
 <paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE">Select the database that contains the data source that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_DAPIDATA:CB_OBJECT" id="bm_id3151112" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT" id="bm_id3151112" localize="false"/>
 <paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="7">Data source</paragraph>
 <paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:COMBOBOX:RID_SCDLG_DAPIDATA:CB_OBJECT">Select the data source that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPE" id="bm_id3153726" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE" id="bm_id3153726" localize="false"/>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3" l10n="U" oldref="9">Type</paragraph>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPE">Click the source type of for the selected data source.</ahelp> You can choose from four source types: "Table", "Query" and "SQL" or SQL (Native).</paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/01/12090102.xhp b/helpcontent2/source/text/scalc/01/12090102.xhp
index 8aae0bc50a..8a7ceb0b91 100644
--- a/helpcontent2/source/text/scalc/01/12090102.xhp
+++ b/helpcontent2/source/text/scalc/01/12090102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090102.xhp,v $
- * $Revision: 1.10.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,87 +32,97 @@
  
 	
 <meta>
-<topic id="textscalc0112090102xml" indexer="include">
-<title id="tit" xml-lang="en-US">DataPilot</title>
-<filename>/text/scalc/01/12090102.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0112090102xml" indexer="include">
+         <title xml-lang="en-US" id="tit">DataPilot</title>
+         <filename>/text/scalc/01/12090102.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2306894"><bookmark_value>DataPilot function;show details</bookmark_value>
-<bookmark_value>DataPilot function;drill down</bookmark_value>
+      <bookmark_value>DataPilot function;drill down</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_PIVOT_TABLE" id="bm_id1491879" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DataPilotExec" id="bm_id3154514" localize="false"/>
-<paragraph role="heading" id="hd_id3149165" xml-lang="en-US" level="1" l10n="U" oldref="1">DataPilot</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid=".uno:DataPilotExec">Specify the layout of the table that is generated by the DataPilot.</ahelp></paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000412.xhp#dndpaz"/>
-</section>
-<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="34">The DataPilot displays data fields as buttons which you can drag and drop to define the DataPilot table.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149165" role="heading" level="1" l10n="U" oldref="1">DataPilot</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="CHG" oldref="13"><ahelp hid=".uno:DataPilotExec">Specify the layout of the table that is generated by the DataPilot.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000412.xhp#dndpaz"/>
+      </section>
+      <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
+      <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="34">The DataPilot displays data fields as buttons which you can drag and drop to define the DataPilot table.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_SELECT" id="bm_id3335062" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_COLUMN" id="bm_id9569689" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_ROW" id="bm_id7529526" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_DATA" id="bm_id2920621" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_PAGE" id="bm_id7411420" localize="false"/><comment>UFI: changed help id from 59001 to dply_page</comment>
-<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="18">Layout</paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="HID_SC_DPLAY_SELECT">To define the layout of a DataPilot table, drag and drop data field buttons onto the <emph>Page Fields, Row Fields, Column Fields, </emph>and<emph> Data Fields </emph>areas.</ahelp> You can also use drag and drop to rearrange the data fields on a DataPilot table.</paragraph>
-<paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="CHG" oldref="20">$[officename] automatically adds a caption to buttons that are dragged into the <emph>Data Fields </emph>area. The caption contains the name of the data field as well as the formula that created the data.</paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="CHG" oldref="21">To change the function that is used by a data field, double-click a button in the <emph>Data Fields</emph> area to open the <link href="text/scalc/01/12090105.xhp" name="Data Field">Data Field</link> dialog. You can also double-click buttons in the <emph>Row Fields</emph> or <emph>Column Fields</emph> areas.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE" id="bm_id1926938" localize="false"/>
-<paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="28">Remove</paragraph>
-<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE">Removes the selected data field from the table layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS" id="bm_id269783" localize="false"/>
-<paragraph role="heading" id="hd_id3145273" xml-lang="en-US" level="2" l10n="U" oldref="26">Options</paragraph>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS">Opens the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog where you can change the function that is associated with the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE" id="bm_id4284798" localize="false"/>
-<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2" l10n="U" oldref="22">More</paragraph>
-<paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE">Displays or hides additional options for defining the DataPilot table.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151073" xml-lang="en-US" level="2" l10n="U" oldref="2">Result</paragraph>
-<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="3">Specify the settings for displaying the results of the DataPilot table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA" id="bm_id7419660" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA" id="bm_id2334665" localize="false"/>
-<paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="4">Results to</paragraph>
-<paragraph role="paragraph" id="par_id3153838" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA">Select the area where you want to display the results of the DataPilot table.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<paragraph role="warning" id="par_id3155961" xml-lang="en-US" l10n="CHG" oldref="6">If the selected area contains data, the DataPilot overwrites the data. To prevent the loss of existing data, let the DataPilot automatically select the area to display the results.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS" id="bm_id7835016" localize="false"/>
-<paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="7">Ignore empty rows</paragraph>
-<paragraph role="paragraph" id="par_id3154022" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS">Ignores empty fields in the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT" id="bm_id5103305" localize="false"/>
-<paragraph role="heading" id="hd_id3155114" xml-lang="en-US" level="3" l10n="U" oldref="9">Identify categories</paragraph>
-<paragraph role="paragraph" id="par_id3145257" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT">Automatically assigns rows without labels to the category of the row above.</ahelp><comment>i93137</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL" id="bm_id2163457" localize="false"/>
-<paragraph role="heading" id="hd_id3149207" xml-lang="en-US" level="3" l10n="U" oldref="14">Total columns</paragraph>
-<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL">Calculates and displays the grand total of the column calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW" id="bm_id3748588" localize="false"/>
-<paragraph role="heading" id="hd_id3150364" xml-lang="en-US" level="3" l10n="U" oldref="16">Total rows</paragraph>
-<paragraph role="paragraph" id="par_id3152583" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW">Calculates and displays the grand total of the row calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER" id="bm_id6004516" localize="false"/>
-<paragraph role="heading" id="par_idN10897" xml-lang="en-US" level="3" l10n="NEW">Add filter</paragraph>
-<paragraph role="paragraph" id="par_idN1089B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a Filter button to DataPilot tables that are based on spreadsheet data.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="2" l10n="U"
+                 oldref="18">Layout</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="HID_SC_DPLAY_SELECT">To define the layout of a DataPilot table, drag and drop data field buttons onto the <emph>Page Fields, Row Fields, Column Fields, </emph>and<emph> Data Fields </emph>areas.</ahelp> You can also use drag and drop to rearrange the data fields on a DataPilot table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147229" role="paragraph" l10n="CHG" oldref="20">$[officename] automatically adds a caption to buttons that are dragged into the <emph>Data Fields </emph>area. The caption contains the name of the data field as well as the formula that created the data.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="CHG" oldref="21">To change the function that is used by a data field, double-click a button in the <emph>Data Fields</emph> area to open the <link href="text/scalc/01/12090105.xhp" name="Data Field">Data Field</link> dialog. You can also double-click buttons in the <emph>Row Fields</emph> or <emph>Column Fields</emph> areas.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE" id="bm_id1926938" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="2" l10n="U"
+                 oldref="28">Remove</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150010" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE">Removes the selected data field from the table layout.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS" id="bm_id269783" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145273" role="heading" level="2" l10n="U"
+                 oldref="26">Options</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146120" role="paragraph" l10n="U" oldref="25"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS">Opens the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog where you can change the function that is associated with the selected field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE" id="bm_id4284798" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="2" l10n="U"
+                 oldref="22">More</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145647" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE">Displays or hides additional options for defining the DataPilot table.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151073" role="heading" level="2" l10n="U" oldref="2">Result</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="3">Specify the settings for displaying the results of the DataPilot table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA" id="bm_id7418660" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA" id="bm_id7418760" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0509200913025625" role="heading" level="3" l10n="NEW">Selection from</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0509200913025615" role="paragraph" l10n="NEW"><ahelp hid=".">Select the area that contains the data for the current datapilot table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA" id="bm_id7419660" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA" id="bm_id2334665" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155603" role="heading" level="2" l10n="U" oldref="4">Results to</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153838" role="paragraph" l10n="U" oldref="5"><ahelp hid="SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA">Select the area where you want to display the results of the DataPilot table.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+      <paragraph xml-lang="en-US" id="par_id3155961" role="warning" l10n="CHG" oldref="6">If the selected area contains data, the DataPilot overwrites the data. To prevent the loss of existing data, let the DataPilot automatically select the area to display the results.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS" id="bm_id7835016" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147364" role="heading" level="2" l10n="U" oldref="7">Ignore empty rows</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154022" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS">Ignores empty fields in the data source.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT" id="bm_id5103305" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155114" role="heading" level="2" l10n="U" oldref="9">Identify categories</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145257" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT">Automatically assigns rows without labels to the category of the row above.</ahelp><comment>i93137</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL" id="bm_id2163457" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149207" role="heading" level="2" l10n="U"
+                 oldref="14">Total columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="15"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL">Calculates and displays the grand total of the column calculation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW" id="bm_id3748588" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150364" role="heading" level="2" l10n="U"
+                 oldref="16">Total rows</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152583" role="paragraph" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW">Calculates and displays the grand total of the row calculation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER" id="bm_id6004516" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10897" role="heading" level="2" l10n="NEW">Add filter</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1089B" role="paragraph" l10n="NEW"><ahelp hid=".">Adds a Filter button to DataPilot tables that are based on spreadsheet data.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_DP_FILTER" id="bm_id4442201" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DataPilotFilter" id="bm_id6278267" localize="false"/>
-<paragraph role="paragraph" id="par_idN108B2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Filter dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN" id="bm_id7366252" localize="false"/>
-<paragraph role="heading" id="par_idN108C9" xml-lang="en-US" level="3" l10n="NEW">Enable drill to details</paragraph>
-<paragraph role="paragraph" id="par_idN108CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this check box and double-click an item label in the table to show or hide details for the item. Clear this check box and double-click a cell in the table to edit the contents of the cell.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN108DC" xml-lang="en-US" level="3" l10n="NEW">To examine details inside a DataPilot table</paragraph>
-<paragraph role="paragraph" id="par_idN108E0" xml-lang="en-US" l10n="NEW">Do one of the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN108E6" xml-lang="en-US" l10n="CHG">Select a range of cells and choose <emph>Data - Group and Outline - Show Details</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN108EE" xml-lang="en-US" l10n="NEW">Double-click a field in the table.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN108F1" xml-lang="en-US" l10n="NEW">If you double-click a field which has adjacent fields at the same level, the <emph>Show Detail</emph> dialog opens:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS" id="bm_id9630726" localize="false"/>
-<paragraph role="heading" id="par_idN10900" xml-lang="en-US" level="3" l10n="NEW">Show Detail</paragraph>
-<paragraph role="paragraph" id="par_idN10904" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose the field that you want to view the details for.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149817" xml-lang="en-US" l10n="U" oldref="35"><link href="text/scalc/04/01020000.xhp" name="DataPilot shortcut keys">DataPilot shortcut keys</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN108B2" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Filter dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN" id="bm_id7366252" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN108C9" role="heading" level="2" l10n="NEW">Enable drill to details</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108CD" role="paragraph" l10n="NEW"><ahelp hid=".">Select this check box and double-click an item label in the table to show or hide details for the item. Clear this check box and double-click a cell in the table to edit the contents of the cell.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108DC" role="heading" level="2" l10n="NEW">To examine details inside a DataPilot table</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108E0" role="paragraph" l10n="NEW">Do one of the following:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108E6" role="paragraph" l10n="CHG">Select a range of cells and choose <emph>Data - Group and Outline - Show Details</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108EE" role="paragraph" l10n="NEW">Double-click a field in the table.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN108F1" role="paragraph" l10n="NEW">If you double-click a field which has adjacent fields at the same level, the <emph>Show Detail</emph> dialog opens:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSHOWDETAIL:LB_DIMS" id="bm_id9630726" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10900" role="heading" level="2" l10n="NEW">Show Detail</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10904" role="paragraph" l10n="NEW"><ahelp hid=".">Choose the field that you want to view the details for.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3149817" role="paragraph" l10n="U" oldref="35"><link href="text/scalc/04/01020000.xhp" name="DataPilot shortcut keys">DataPilot shortcut keys</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/12090103.xhp b/helpcontent2/source/text/scalc/01/12090103.xhp
index fee06503c0..08a6f34ebd 100755
--- a/helpcontent2/source/text/scalc/01/12090103.xhp
+++ b/helpcontent2/source/text/scalc/01/12090103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090103.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,11 +44,11 @@
   <paragraph role="paragraph" id="par_id3150448" l10n="U" xml-lang="en-US" oldref="2">Set the filtering options for the data.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3151043" l10n="U" xml-lang="en-US" oldref="3">Filter Criteria</paragraph>
   <paragraph role="paragraph" id="par_id3150440" l10n="U" xml-lang="en-US" oldref="4">You can define a default filter for the data by filtering, for example, field names, using a combination of logical expressions arguments.</paragraph>
-  <bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_OP1" xml-lang="en-US" id="bm_id3153142"/><bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_OP2" xml-lang="en-US" id="bm_id3155412"/><paragraph role="heading" level="3" id="hd_id3159153" l10n="U" xml-lang="en-US" oldref="5">Operator</paragraph>
+  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1" xml-lang="en-US" id="bm_id3153142"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2" xml-lang="en-US" id="bm_id3155412"/><paragraph role="heading" level="3" id="hd_id3159153" l10n="U" xml-lang="en-US" oldref="5">Operator</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153093" xml-lang="en-US" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_OP2" visibility="visible">Select a logical operator for the filter.</ahelp></paragraph>
-  <bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_FIELD1" xml-lang="en-US" id="bm_id3147317"/><bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_FIELD2" xml-lang="en-US" id="bm_id3148646"/><bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_FIELD3" xml-lang="en-US" id="bm_id3149667"/><paragraph role="heading" level="3" id="hd_id3152462" l10n="U" xml-lang="en-US" oldref="7">Field name</paragraph>
+  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1" xml-lang="en-US" id="bm_id3147317"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2" xml-lang="en-US" id="bm_id3148646"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3" xml-lang="en-US" id="bm_id3149667"/><paragraph role="heading" level="3" id="hd_id3152462" l10n="U" xml-lang="en-US" oldref="7">Field name</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155306" xml-lang="en-US" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_FIELD3" visibility="visible">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</ahelp></paragraph>
-  <bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_COND1" xml-lang="en-US" id="bm_id3147348"/><bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_COND2" xml-lang="en-US" id="bm_id3155855"/><bookmark branch="hid/SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_COND3" xml-lang="en-US" id="bm_id3156444"/><paragraph role="heading" level="3" id="hd_id3148575" l10n="U" xml-lang="en-US" oldref="9">Condition</paragraph>
+  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1" xml-lang="en-US" id="bm_id3147348"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2" xml-lang="en-US" id="bm_id3155855"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3" xml-lang="en-US" id="bm_id3156444"/><paragraph role="heading" level="3" id="hd_id3148575" l10n="U" xml-lang="en-US" oldref="9">Condition</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147394" xml-lang="en-US" oldref="10"><ahelp visibility="visible" hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_COND3">Select an operator to compare the <emph>Field name</emph> and <emph>Value</emph> entries.</ahelp></paragraph>
   <paragraph role="paragraph" id="par_id3144764" l10n="U" xml-lang="en-US" oldref="11">The following operators are available:</paragraph>
   <table id="tbl_id3149379">
@@ -116,9 +113,9 @@
     </tablecell>
    </tablerow>
   </table>
-  <bookmark branch="hid/SC:COMBOBOX:RID_SCDLG_PIVOTFILTER:ED_VAL1" xml-lang="en-US" id="bm_id3152990"/><bookmark branch="hid/SC:COMBOBOX:RID_SCDLG_PIVOTFILTER:ED_VAL2" xml-lang="en-US" id="bm_id3152994"/><bookmark branch="hid/SC:COMBOBOX:RID_SCDLG_PIVOTFILTER:ED_VAL3" xml-lang="en-US" id="bm_id3150370"/><paragraph role="heading" level="3" id="hd_id3150886" l10n="U" xml-lang="en-US" oldref="25">Value</paragraph>
+  <bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1" xml-lang="en-US" id="bm_id3152990"/><bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2" xml-lang="en-US" id="bm_id3152994"/><bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3" xml-lang="en-US" id="bm_id3150370"/><paragraph role="heading" level="3" id="hd_id3150886" l10n="U" xml-lang="en-US" oldref="25">Value</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155506" xml-lang="en-US" oldref="26"><ahelp hid="SC:COMBOBOX:RID_SCDLG_PIVOTFILTER:ED_VAL3" visibility="visible">Select the value that you want to compare to the selected field.</ahelp></paragraph>
-  <bookmark branch="hid/SC:MOREBUTTON:RID_SCDLG_PIVOTFILTER:BTN_MORE" xml-lang="en-US" id="bm_id3152987"/><paragraph id="hd_id3146980" role="heading" level="2" oldref="27" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="More&gt;&gt;">More&gt;&gt;</link></paragraph>
+  <bookmark branch="hid/sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE" xml-lang="en-US" id="bm_id3152987"/><paragraph id="hd_id3146980" role="heading" level="2" oldref="27" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="More&gt;&gt;">More&gt;&gt;</link></paragraph>
   <embed href="text/scalc/01/12090104.xhp#zusaetzetext"/>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12090104.xhp b/helpcontent2/source/text/scalc/01/12090104.xhp
index b179157087..8571f66f47 100755
--- a/helpcontent2/source/text/scalc/01/12090104.xhp
+++ b/helpcontent2/source/text/scalc/01/12090104.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090104.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,12 +44,12 @@
   <paragraph id="hd_id3149119" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="Options">Options</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147102" xml-lang="en-US" oldref="2"><variable id="zusaetzetext"><ahelp hid="" visibility="visible">Displays or hides additional filtering options.</ahelp></variable></paragraph>
   <paragraph role="heading" level="2" id="hd_id3147008" l10n="U" xml-lang="en-US" oldref="3">Options</paragraph>
-  <bookmark branch="hid/SC_CHECKBOX_RID_SCDLG_PIVOTFILTER_BTN_CASE" xml-lang="en-US" id="bm_id3153562"/><paragraph role="heading" level="3" id="hd_id3153662" l10n="U" xml-lang="en-US" oldref="5">Case sensitive</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE" xml-lang="en-US" id="bm_id3153562"/><paragraph role="heading" level="3" id="hd_id3153662" l10n="U" xml-lang="en-US" oldref="5">Case sensitive</paragraph>
   <paragraph role="paragraph" id="par_id3145673" l10n="U" xml-lang="en-US" oldref="6">Distinguishes between uppercase and lowercase letters.</paragraph>
-  <bookmark branch="hid/SC_CHECKBOX_RID_SCDLG_PIVOTFILTER_BTN_REGEXP" xml-lang="en-US" id="bm_id3153881"/><paragraph role="heading" level="3" id="hd_id3156327" l10n="U" xml-lang="en-US" oldref="7">Regular Expression</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP" xml-lang="en-US" id="bm_id3153881"/><paragraph role="heading" level="3" id="hd_id3156327" l10n="U" xml-lang="en-US" oldref="7">Regular Expression</paragraph>
   <paragraph role="paragraph" id="par_id3151245" l10n="U" xml-lang="en-US" oldref="8">Allows you to use wildcards in the filter definition.</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3147264" l10n="U" oldref="29">If the <emph>Regular Expression</emph> check box is selected, you can use EQUAL (=) and NOT EQUAL (&lt;&gt;) also in comparisons. You can also use the following functions: DCOUNTA, DGET, MATCH, COUNTIF, SUMIF, LOOKUP, VLOOKUP and HLOOKUP.</paragraph>
-  <bookmark branch="hid/SC_CHECKBOX_RID_SCDLG_PIVOTFILTER_BTN_UNIQUE" xml-lang="en-US" id="bm_id3150541"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="30">Unique records only</paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE" xml-lang="en-US" id="bm_id3150541"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="30">Unique records only</paragraph>
   <paragraph role="paragraph" id="par_id3154138" l10n="U" xml-lang="en-US" oldref="31">Excludes duplicate rows in the list of filtered data.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3156282" l10n="U" xml-lang="en-US" oldref="32">Data area</paragraph>
   <paragraph role="paragraph" id="par_id3150768" l10n="U" xml-lang="en-US" oldref="33">Displays the name of the filtered data area in the table.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12090105.xhp b/helpcontent2/source/text/scalc/01/12090105.xhp
index fbb2ded83f..8e113d5622 100755
--- a/helpcontent2/source/text/scalc/01/12090105.xhp
+++ b/helpcontent2/source/text/scalc/01/12090105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090105.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,34 +48,34 @@ YJ: checked</lastedited>
 <paragraph role="paragraph" id="par_id3154124" xml-lang="en-US" l10n="U" oldref="16">The contents of this dialog is different for data fields in the <emph>Data</emph> area, and data fields in the<emph> Row</emph> or<emph> Column</emph> area of the <link href="text/scalc/01/12090102.xhp" name="DataPilot">DataPilot</link> dialog.</paragraph>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="2">Subtotals</paragraph>
 <paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_SC_PIVOTSUBT">Specify the subtotals that you want to calculate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_NONE" id="bm_id3149260" localize="false"/>
+<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_NONE -->
 <paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="U" oldref="4">None</paragraph>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_NONE">Does not calculate subtotals.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_AUTO" id="bm_id3147428" localize="false"/>
+<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_AUTO -->
 <paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="3" l10n="U" oldref="6">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3155856" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_AUTO">Automatically calculates subtotals.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_USER" id="bm_id3152460" localize="false"/>
+<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_USER -->
 <paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="8">User-defined</paragraph>
 <paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_USER">Select this option, and then click the type of subtotal that you want to calculate in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILISTBOX:RID_SCDLG_PIVOTSUBT:LB_FUNC" id="bm_id3145799" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC" id="bm_id1523789" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC" id="bm_id3145799" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC" id="bm_id1523789" localize="false"/>
 <paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="3" l10n="U" oldref="10">Function</paragraph>
 <paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_PIVOTSUBT:LB_FUNC">Click the type of subtotal that you want to calculate. This option is only available if the <emph>User-defined</emph> option is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_PIVOTSUBT:CB_SHOWALL" id="bm_id3154015" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL" id="bm_id3154015" localize="false"/>
 <paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2" l10n="U" oldref="14">Show elements without data</paragraph>
 <paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOTSUBT:CB_SHOWALL">Includes empty columns and rows in the results table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="2" l10n="U" oldref="12">Name:</paragraph>
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="13">Lists the name of the selected data field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE" id="bm_id4281746" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_DPDATAFIELD:BTN_MORE" id="bm_id4281746" localize="false"/>
 <paragraph role="heading" id="par_idN106EC" xml-lang="en-US" level="2" l10n="NEW">More</paragraph>
 <paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Expands or reduces the dialog. The <emph>More</emph> button is visible for data fields only.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS" id="bm_id2855922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS" id="bm_id2855922" localize="false"/>
 <paragraph role="heading" id="par_idN106F3" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
 <paragraph role="paragraph" id="par_idN106F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/scalc/01/12090106.xhp">Data Field Options</link> dialog. The <emph>Options</emph> button is visible for column, row, or page fields only.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10708" xml-lang="en-US" l10n="NEW">If the dialog is expanded by the <emph>More</emph> button, the following items are added to the dialog:</paragraph>
 <paragraph role="heading" id="par_idN1070B" xml-lang="en-US" level="2" l10n="NEW">Displayed value</paragraph>
 <paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For each data field, you can select the type of display.</ahelp> For some types you can select additional information for a base field and a base item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_TYPE" id="bm_id3325907" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_TYPE" id="bm_id3325907" localize="false"/>
 <paragraph role="heading" id="par_idN10712" xml-lang="en-US" level="3" l10n="NEW">Type</paragraph>
 <paragraph role="paragraph" id="par_idN10716" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371266">Select the type of calculating of the displayed value for the data field.</ahelp></paragraph>
 <table id="">
@@ -174,10 +171,10 @@ YJ: checked</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEFIELD" id="bm_id7005523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEFIELD" id="bm_id7005523" localize="false"/>
 <paragraph role="heading" id="par_idN107BA" xml-lang="en-US" level="3" l10n="NEW">Base field</paragraph>
 <paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371267">Select the field from which the respective value is taken as base for the calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEITEM" id="bm_id8070925" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEITEM" id="bm_id8070925" localize="false"/>
 <paragraph role="heading" id="par_idN107C1" xml-lang="en-US" level="3" l10n="NEW">Base item</paragraph>
 <paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371268">Select the item of the base field from which the respective value is taken as base for the calculation.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12090106.xhp b/helpcontent2/source/text/scalc/01/12090106.xhp
index 236b99b568..f72fa9080b 100755
--- a/helpcontent2/source/text/scalc/01/12090106.xhp
+++ b/helpcontent2/source/text/scalc/01/12090106.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090106.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,33 +46,33 @@
 <bookmark_value>data field options for Data Pilot</bookmark_value>
 </bookmark><comment>mw changed "hiding..." entry</comment><paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Data Field Options</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW">You can specify additional options for column, row, and page data fields in the <link href="text/scalc/01/12090105.xhp">DataPilot</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY" id="bm_id6588335" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Sort by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY" id="bm_id6588335" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Sort by</paragraph>
 <paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US" l10n="NEW"><ahelp hid="1495387653">Select the data field that you want to sort columns or rows by.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_ASC" id="bm_id6422009" localize="false"/><paragraph role="heading" id="par_idN1055E" xml-lang="en-US" level="3" l10n="NEW">Ascending</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC" id="bm_id6422009" localize="false"/><paragraph role="heading" id="par_idN1055E" xml-lang="en-US" level="3" l10n="NEW">Ascending</paragraph>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="CHG"><ahelp hid="1495384580">Sorts the values from the lowest value to the highest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_DESC" id="bm_id1683706" localize="false"/><paragraph role="heading" id="par_idN10565" xml-lang="en-US" level="3" l10n="NEW">Descending</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_DESC" id="bm_id1683706" localize="false"/><paragraph role="heading" id="par_idN10565" xml-lang="en-US" level="3" l10n="NEW">Descending</paragraph>
 <paragraph role="paragraph" id="par_idN10569" xml-lang="en-US" l10n="CHG"><ahelp hid="1495384581">Sorts the values descending from the highest value to the lowest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_MAN" id="bm_id9101840" localize="false"/><paragraph role="heading" id="par_idN1056C" xml-lang="en-US" level="3" l10n="NEW">Manual</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_MAN" id="bm_id9101840" localize="false"/><paragraph role="heading" id="par_idN1056C" xml-lang="en-US" level="3" l10n="NEW">Manual</paragraph>
 <paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="CHG"><ahelp hid="1495384582">Sorts values alphabetically.</ahelp><comment>UFI: see spec doc. Currently set to alphabetically.</comment></paragraph>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Display options</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">You can specify the display options for all row fields except for the last, innermost row field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT" id="bm_id113223" localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="3" l10n="NEW">Layout</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_LAYOUT" id="bm_id113223" localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="3" l10n="NEW">Layout</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid="1495387654">Select the layout mode for the field in the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY" id="bm_id2646870" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Empty line after each item</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_LAYOUT_EMPTY" id="bm_id2646870" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Empty line after each item</paragraph>
 <paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid="1495385090">Adds an empty row after the data for each item in the DataPilot table.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Show automatically</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW">Displays the top or bottom nn items when you sort by a specified field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW" id="bm_id4634540" localize="false"/><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="3" l10n="NEW">Show</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_SHOW" id="bm_id4634540" localize="false"/><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="3" l10n="NEW">Show</paragraph>
 <paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US" l10n="NEW"><ahelp hid="1495385091">Turns on the automatic show feature.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW" id="bm_id6690878" localize="false"/><paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="4" l10n="NEW">items</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_DPSUBTOTAL_OPT:NF_SHOW" id="bm_id6690878" localize="false"/><paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="4" l10n="NEW">items</paragraph>
 <paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US" l10n="NEW"><ahelp hid="1495390209">Enter the maximum number of items that you want to show automatically.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_FROM" id="bm_id9420148" localize="false"/><paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="4" l10n="NEW">From</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_FROM" id="bm_id9420148" localize="false"/><paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="4" l10n="NEW">From</paragraph>
 <paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid="1495387655">Shows the top or bottom items in the specified sort order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_USING" id="bm_id923184" localize="false"/><paragraph role="heading" id="par_idN105B6" xml-lang="en-US" level="4" l10n="NEW">Using field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_USING" id="bm_id923184" localize="false"/><paragraph role="heading" id="par_idN105B6" xml-lang="en-US" level="4" l10n="NEW">Using field</paragraph>
 <paragraph role="paragraph" id="par_idN105BA" xml-lang="en-US" l10n="NEW"><ahelp hid="1495387656">Select the data field that you want to sort the data by.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_DPSUBT_HIDE" id="bm_id2068849" localize="false"/><paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2" l10n="NEW">Hide items</paragraph>
 <paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US" l10n="NEW"><ahelp hid="59010">Select the items that you want to hide from the calculations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_HIERARCHY" id="bm_id6507461" localize="false"/><paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="3" l10n="NEW">Hierarchy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY" id="bm_id6507461" localize="false"/><paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="3" l10n="NEW">Hierarchy</paragraph>
 <paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid="1495387657">Select the hierarchy that you want to use. The DataPilot must be based on an external source data that contains data hierarchies.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12090200.xhp b/helpcontent2/source/text/scalc/01/12090200.xhp
index c180e10939..c8716a0608 100644
--- a/helpcontent2/source/text/scalc/01/12090200.xhp
+++ b/helpcontent2/source/text/scalc/01/12090200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12090300.xhp b/helpcontent2/source/text/scalc/01/12090300.xhp
index 9c6940ba9d..88014e6b86 100644
--- a/helpcontent2/source/text/scalc/01/12090300.xhp
+++ b/helpcontent2/source/text/scalc/01/12090300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12090400.xhp b/helpcontent2/source/text/scalc/01/12090400.xhp
index eb521a1690..0b8deac477 100755
--- a/helpcontent2/source/text/scalc/01/12090400.xhp
+++ b/helpcontent2/source/text/scalc/01/12090400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12100000.xhp b/helpcontent2/source/text/scalc/01/12100000.xhp
index 15a30e32bb..69a9cf1261 100644
--- a/helpcontent2/source/text/scalc/01/12100000.xhp
+++ b/helpcontent2/source/text/scalc/01/12100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12100000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12120000.xhp b/helpcontent2/source/text/scalc/01/12120000.xhp
index e1c187f4b2..6c0c9e8464 100644
--- a/helpcontent2/source/text/scalc/01/12120000.xhp
+++ b/helpcontent2/source/text/scalc/01/12120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12120000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/12120100.xhp b/helpcontent2/source/text/scalc/01/12120100.xhp
index 657f9ddd7a..a35994c324 100755
--- a/helpcontent2/source/text/scalc/01/12120100.xhp
+++ b/helpcontent2/source/text/scalc/01/12120100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12120100.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@ YJ: checked</lastedited>
 <section id="werte">
 <bookmark xml-lang="en-US" branch="index" id="bm_id1464278"><bookmark_value>selection lists;validity</bookmark_value>
 </bookmark><comment>UFI added index entry for new list feature. Guide needed. MW changed index entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SC:TABPAGE:TP_VALIDATION_VALUES" id="bm_id3145673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TabPage:TP_VALIDATION_VALUES" id="bm_id3145673" localize="false"/>
 <paragraph role="heading" id="hd_id3153032" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12120100.xhp" name="Criteria">Criteria</link></paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC:TABPAGE:TP_VALIDATION_VALUES">Specify the validation rules for the selected cell(s).</ahelp></paragraph>
 </section>
@@ -57,7 +54,7 @@ YJ: checked</lastedited>
   <embed href="text/scalc/00/00000412.xhp#datengueltigwerte"/>
 </section>
 <paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="4">For example, you can define criteria such as: "Numbers between 1 and 10" or "Texts that are no more than 20 characters".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOW" id="bm_id3148663" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:TP_VALIDATION_VALUES:LB_ALLOW" id="bm_id3148663" localize="false"/>
 <paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="2" l10n="U" oldref="5">Allow</paragraph>
 <paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOW">Click a validation option for the selected cell(s).</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="17">The following conditions are available:</paragraph>
@@ -136,7 +133,7 @@ YJ: checked</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS" id="bm_id3155960" localize="false"/>
+<!-- removed HID SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS -->
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS" id="bm_id263985" localize="false"/>
 <paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="2" l10n="CHG" oldref="7">Allow blank cells</paragraph>
 <paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS">In conjunction with <emph>Tools - Detective - Mark invalid Data</emph>, this defines that blank cells are shown as invalid data (disabled) or not (enabled).</ahelp></paragraph>
@@ -151,15 +148,15 @@ YJ: checked</lastedited>
 <bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST" id="bm_id5921506" localize="false"/>
 <paragraph role="heading" id="par_idN1075A" xml-lang="en-US" level="2" l10n="NEW">Entries</paragraph>
 <paragraph role="paragraph" id="par_idN1075E" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST">Enter the entries that will be valid values or text strings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:TP_VALIDATION_VALUES:LB_VALUE" id="bm_id3147344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:TP_VALIDATION_VALUES:LB_VALUE" id="bm_id3147344" localize="false"/>
 <paragraph role="heading" id="hd_id3163807" xml-lang="en-US" level="2" l10n="U" oldref="9">Data</paragraph>
 <paragraph role="paragraph" id="par_id3144502" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:TP_VALIDATION_VALUES:LB_VALUE">Select the comparative operator that you want to use.</ahelp> The available operators depend on what you selected in the <emph>Allow </emph>box. If you select "between" or "not between", the <emph>Minimum</emph> and <emph>Maximum</emph> input boxes appear. Otherwise, only the <emph>Minimum</emph>, the <emph>Maximum, or the Value</emph> input boxes appear.</paragraph>
 <paragraph role="heading" id="hd_id3153782" xml-lang="en-US" level="2" l10n="U" oldref="11">Value</paragraph>
 <paragraph role="paragraph" id="par_id3153266" xml-lang="en-US" l10n="CHG" oldref="12">Enter the value for the data validation option that you selected in the <emph>Allow </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN" id="bm_id3149528" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:TP_VALIDATION_VALUES:EDT_MIN" id="bm_id3149528" localize="false"/>
 <paragraph role="heading" id="hd_id3149814" xml-lang="en-US" level="2" l10n="U" oldref="13">Minimum</paragraph>
 <paragraph role="paragraph" id="par_id3153199" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN">Enter the minimum value for the data validation option that you selected in the <emph>Allow </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:TP_VALIDATION_VALUES:EDT_MAX" id="bm_id3150206" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:TP_VALIDATION_VALUES:EDT_MAX" id="bm_id3150206" localize="false"/>
 <paragraph role="heading" id="hd_id3149035" xml-lang="en-US" level="2" l10n="U" oldref="15">Maximum</paragraph>
 <paragraph role="paragraph" id="par_id3150089" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:EDIT:TP_VALIDATION_VALUES:EDT_MAX">Enter the maximum value for the data validation option that you selected in the <emph>Allow </emph>box.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12120200.xhp b/helpcontent2/source/text/scalc/01/12120200.xhp
index 1282c7a6cc..13ecf89d42 100644
--- a/helpcontent2/source/text/scalc/01/12120200.xhp
+++ b/helpcontent2/source/text/scalc/01/12120200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12120200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,22 +41,22 @@
 </meta>
 <body>
 <section id="eingabehilfe">
-<bookmark xml-lang="en-US" branch="hid/SC:TABPAGE:TP_VALIDATION_INPUTHELP" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TabPage:TP_VALIDATION_INPUTHELP" id="bm_id3150871" localize="false"/>
 <paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12120200.xhp" name="Input Help">Input Help</link></paragraph>
 <paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC:TABPAGE:TP_VALIDATION_INPUTHELP">Enter the message that you want to display when the cell or cell range is selected in the sheet.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#datengueltigeingabe"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP" id="bm_id3149260" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:TP_VALIDATION_INPUTHELP:TSB_HELP" id="bm_id3149260" localize="false"/>
 <paragraph role="heading" id="hd_id3146986" xml-lang="en-US" level="2" l10n="U" oldref="3">Show input help when cell is selected</paragraph>
 <paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP">Displays the message that you enter in the <emph>Contents</emph> box when the cell or cell range is selected in the sheet.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3154730" xml-lang="en-US" l10n="U" oldref="5">If you enter text in the <emph>Contents</emph> box of this dialog, and then select and clear this check box, the text will be lost.</paragraph>
 <paragraph role="heading" id="hd_id3147394" xml-lang="en-US" level="2" l10n="U" oldref="6">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE" id="bm_id3149377" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:TP_VALIDATION_INPUTHELP:EDT_TITLE" id="bm_id3149377" localize="false"/>
 <paragraph role="heading" id="hd_id3149582" xml-lang="en-US" level="3" l10n="U" oldref="8">Title</paragraph>
 <paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE">Enter the title that you want to display when the cell or cell range is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP" id="bm_id3156275" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP" id="bm_id3156275" localize="false"/>
 <paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="10">Input help</paragraph>
 <paragraph role="paragraph" id="par_id3150752" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP">Enter the message that you want to display when the cell or cell range is selected.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/scalc/01/12120300.xhp b/helpcontent2/source/text/scalc/01/12120300.xhp
index 12e0229a76..bb3e3d652c 100755
--- a/helpcontent2/source/text/scalc/01/12120300.xhp
+++ b/helpcontent2/source/text/scalc/01/12120300.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 12120300.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0112120300xml" indexer="include" status="PUBLISH">
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="fehlermeldung">
-<bookmark xml-lang="en-US" branch="hid/SC:TABPAGE:TP_VALIDATION_ERROR" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TabPage:TP_VALIDATION_ERROR" id="bm_id3156024" localize="false"/>
 <paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12120300.xhp" name="Error Alert">Error Alert</link></paragraph>
 <paragraph role="paragraph" id="par_id3153379" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC:TABPAGE:TP_VALIDATION_ERROR">Define the error message that is displayed when invalid data is entered in a cell.</ahelp></paragraph>
 </section>
@@ -52,21 +49,21 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#datengueltigfehler"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW" id="bm_id3154908" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:TP_VALIDATION_ERROR:TSB_SHOW" id="bm_id3154908" localize="false"/>
 <paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="3">Show error message when invalid values are entered.</paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW">Displays the error message that you enter in the <emph>Contents</emph> area when invalid data is entered in a cell.</ahelp> If unchecked, the message is displayed to prevent an invalid entry.</paragraph>
+<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">Displays the error message that you enter in the <emph>Contents</emph> area when invalid data is entered in a cell.</ahelp> If enabled, the message is displayed to prevent an invalid entry.</paragraph>
 <paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="5">In both cases, if you select "Stop", the invalid entry is deleted and the previous value is reentered in the cell. The same applies if you close the "Warning" and "Information" dialogs by clicking the <emph>Cancel </emph>button. If you close the dialogs with the <emph>OK</emph> button, the invalid entry is not deleted.</paragraph>
 <paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="2" l10n="U" oldref="6">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:TP_VALIDATION_ERROR:LB_ACTION" id="bm_id3154014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:TP_VALIDATION_ERROR:LB_ACTION" id="bm_id3154014" localize="false"/>
 <paragraph role="heading" id="hd_id3148646" xml-lang="en-US" level="3" l10n="U" oldref="8">Action</paragraph>
 <paragraph role="paragraph" id="par_id3151115" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:LISTBOX:TP_VALIDATION_ERROR:LB_ACTION">Select the action that you want to occur when invalid data is entered in a cell.</ahelp> The "Stop" action rejects the invalid entry and displays a dialog that you have to close by clicking <emph>OK</emph>. The "Warning" and "Information" actions display a dialog that can be closed by clicking <emph>OK</emph> or <emph>Cancel</emph>. The invalid entry is only rejected when you click <emph>Cancel</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:TP_VALIDATION_ERROR:BTN_SEARCH" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:TP_VALIDATION_ERROR:BTN_SEARCH" id="bm_id3154729" localize="false"/>
 <paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="3" l10n="U" oldref="10">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3153160" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:PUSHBUTTON:TP_VALIDATION_ERROR:BTN_SEARCH">Opens the <link href="text/shared/01/06130000.xhp" name="Macro">Macro</link> dialog where you can select the macro that is executed when invalid data is entered in a cell. The macro is executed after the error message is displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:TP_VALIDATION_ERROR:EDT_TITLE" id="bm_id3149958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:TP_VALIDATION_ERROR:EDT_TITLE" id="bm_id3149958" localize="false"/>
 <paragraph role="heading" id="hd_id3153876" xml-lang="en-US" level="3" l10n="U" oldref="12">Title</paragraph>
 <paragraph role="paragraph" id="par_id3149410" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:EDIT:TP_VALIDATION_ERROR:EDT_TITLE">Enter the title of the macro or the error message that you want to display when invalid data is entered in a cell.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILINEEDIT:TP_VALIDATION_ERROR:EDT_ERROR" id="bm_id3153836" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:TP_VALIDATION_ERROR:EDT_ERROR" id="bm_id3153836" localize="false"/>
 <paragraph role="heading" id="hd_id3154510" xml-lang="en-US" level="3" l10n="U" oldref="14">Error message</paragraph>
 <paragraph role="paragraph" id="par_id3149122" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:MULTILINEEDIT:TP_VALIDATION_ERROR:EDT_ERROR">Enter the message that you want to display when invalid data is entered in a cell.</ahelp></paragraph>
 <section id="examplemakro">
diff --git a/helpcontent2/source/text/scalc/01/format_graphic.xhp b/helpcontent2/source/text/scalc/01/format_graphic.xhp
index a217d9e828..5076e1b00a 100755
--- a/helpcontent2/source/text/scalc/01/format_graphic.xhp
+++ b/helpcontent2/source/text/scalc/01/format_graphic.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: format_graphic.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_date.xhp b/helpcontent2/source/text/scalc/01/func_date.xhp
index 96f41f517d..e49c2fa4d1 100644
--- a/helpcontent2/source/text/scalc/01/func_date.xhp
+++ b/helpcontent2/source/text/scalc/01/func_date.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_date.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <paragraph role="code" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="6">DATE(Year; Month; Day)</paragraph>
 <paragraph role="paragraph" id="par_id3152815" xml-lang="en-US" l10n="CHG" oldref="7">
 <emph>Year</emph> is an integer between 1583 and 9957 or between 0 and 99.</paragraph>
-<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <item type="menuitem">Tools - Options - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
+<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
 <paragraph role="paragraph" id="par_id3155817" xml-lang="en-US" l10n="CHG" oldref="8">
 <emph>Month</emph> is an integer indicating the month.</paragraph>
 <paragraph role="paragraph" id="par_id3153183" xml-lang="en-US" l10n="CHG" oldref="9">
diff --git a/helpcontent2/source/text/scalc/01/func_datevalue.xhp b/helpcontent2/source/text/scalc/01/func_datevalue.xhp
index 3fc44c72a8..590506b53f 100644
--- a/helpcontent2/source/text/scalc/01/func_datevalue.xhp
+++ b/helpcontent2/source/text/scalc/01/func_datevalue.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_datevalue.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,28 +29,32 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalc01func_datevaluexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">DATEVALUE </title>
-<filename>/text/scalc/01/func_datevalue.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc01func_datevaluexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">DATEVALUE </title>
+         <filename>/text/scalc/01/func_datevalue.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145621"><bookmark_value>DATEVALUE function</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DATWERT" id="bm_id3163820" localize="false"/><paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="2" l10n="U" oldref="18"><variable id="datevalue"><link href="text/scalc/01/func_datevalue.xhp">DATEVALUE</link>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DATWERT" id="bm_id3163820" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145621" role="heading" level="2" l10n="U"
+                 oldref="18"><variable id="datevalue"><link href="text/scalc/01/func_datevalue.xhp">DATEVALUE</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145087" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_FUNC_DATWERT">Returns the internal date number for text in quotes.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149281" xml-lang="en-US" l10n="CHG" oldref="20">The internal date number is returned as a number. The number is determined by the date system that is used by $[officename] to calculate dates.</paragraph>
-<paragraph role="heading" id="hd_id3156294" xml-lang="en-US" level="3" l10n="U" oldref="21">Syntax</paragraph>
-<paragraph role="code" id="par_id3149268" xml-lang="en-US" l10n="U" oldref="22">DATEVALUE("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3154819" xml-lang="en-US" l10n="U" oldref="23">
-<emph>Text</emph> is a valid date expression and must be entered with quotation marks.</paragraph>
-<paragraph role="heading" id="hd_id3156309" xml-lang="en-US" level="3" l10n="U" oldref="24">Example</paragraph>
-<paragraph role="paragraph" id="par_id3155841" xml-lang="en-US" l10n="CHG" oldref="25">
-<emph>=DATEVALUE("1954-07-20")</emph> yields 19925.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145087" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_FUNC_DATWERT">Returns the internal date number for text in quotes.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149281" role="paragraph" l10n="CHG" oldref="20">The internal date number is returned as a number. The number is determined by the date system that is used by $[officename] to calculate dates.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0119200903491982" role="paragraph" l10n="NEW">If the text string also includes a time value, DATEVALUE only returns the integer part of the conversion.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156294" role="heading" level="3" l10n="U"
+                 oldref="21">Syntax</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149268" role="code" l10n="U" oldref="22">DATEVALUE("Text")</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154819" role="paragraph" l10n="U" oldref="23">
+         <emph>Text</emph> is a valid date expression and must be entered with quotation marks.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156309" role="heading" level="3" l10n="U"
+                 oldref="24">Example</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155841" role="paragraph" l10n="CHG" oldref="25">
+         <emph>=DATEVALUE("1954-07-20")</emph> yields 19925.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/func_day.xhp b/helpcontent2/source/text/scalc/01/func_day.xhp
index 8d11cb8293..f6605fd88e 100644
--- a/helpcontent2/source/text/scalc/01/func_day.xhp
+++ b/helpcontent2/source/text/scalc/01/func_day.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_day.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_days.xhp b/helpcontent2/source/text/scalc/01/func_days.xhp
index 960892de8e..8d13345d9a 100644
--- a/helpcontent2/source/text/scalc/01/func_days.xhp
+++ b/helpcontent2/source/text/scalc/01/func_days.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_days.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_days360.xhp b/helpcontent2/source/text/scalc/01/func_days360.xhp
index d7015b4fcb..368844b569 100644
--- a/helpcontent2/source/text/scalc/01/func_days360.xhp
+++ b/helpcontent2/source/text/scalc/01/func_days360.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_days360.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_eastersunday.xhp b/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
index b4680da106..be45404fa9 100644
--- a/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
+++ b/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_eastersunday.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_edate.xhp b/helpcontent2/source/text/scalc/01/func_edate.xhp
index 0ef90dec25..5063438319 100644
--- a/helpcontent2/source/text/scalc/01/func_edate.xhp
+++ b/helpcontent2/source/text/scalc/01/func_edate.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_edate.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_eomonth.xhp b/helpcontent2/source/text/scalc/01/func_eomonth.xhp
index bcbb83d362..fc9bae1156 100644
--- a/helpcontent2/source/text/scalc/01/func_eomonth.xhp
+++ b/helpcontent2/source/text/scalc/01/func_eomonth.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: func_eomonth.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -56,7 +53,9 @@
 <emph>Months</emph> is the number of months before (negative) or after (positive) the start date.</paragraph>
 <paragraph role="heading" id="hd_id3156335" xml-lang="en-US" level="3" l10n="U" oldref="237">Example</paragraph>
 <paragraph role="paragraph" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="238">What is the last day of the month that falls 6 months after September 14 2001?</paragraph>
-<paragraph role="paragraph" id="par_id3156143" xml-lang="en-US" l10n="U" oldref="239">
-<item type="input">=EOMONTH(9.14.2001;6)</item> returns 3.31.2002.</paragraph>
+
+<paragraph role="paragraph" id="par_id3156143" xml-lang="en-US" l10n="U" oldref="239"><item type="input">=EOMONTH(DATE(2001;9;14);6)</item> returns the serial number 37346. Formatted as a date, this is 2002-03-31.</paragraph>
+<paragraph role="paragraph" id="par_id3156144" xml-lang="en-US" l10n="U" oldref="239"><item type="input">=EOMONTH("2001-09-14";6)</item> works as well. If the date is given as string, it has to be in ISO format.</paragraph>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/func_hour.xhp b/helpcontent2/source/text/scalc/01/func_hour.xhp
index 25bae61fe5..1b4192e89b 100644
--- a/helpcontent2/source/text/scalc/01/func_hour.xhp
+++ b/helpcontent2/source/text/scalc/01/func_hour.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_hour.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_minute.xhp b/helpcontent2/source/text/scalc/01/func_minute.xhp
index ba3957343d..fc3c5be4ea 100644
--- a/helpcontent2/source/text/scalc/01/func_minute.xhp
+++ b/helpcontent2/source/text/scalc/01/func_minute.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: func_minute.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,7 +44,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_MINUTE" id="bm_id3148616" localize="false"/><paragraph role="heading" id="hd_id3149803" xml-lang="en-US" level="2" l10n="U" oldref="66"><variable id="minute"><link href="text/scalc/01/func_minute.xhp">MINUTE</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_FUNC_MINUTE">Calculates the minute for an internal time value</ahelp> The minute is returned as a number between 0 and 59.</paragraph>
+<paragraph role="paragraph" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_FUNC_MINUTE">Calculates the minute for an internal time value.</ahelp> The minute is returned as a number between 0 and 59.</paragraph>
 <paragraph role="heading" id="hd_id3154343" xml-lang="en-US" level="3" l10n="U" oldref="68">Syntax</paragraph>
 <paragraph role="code" id="par_id3148660" xml-lang="en-US" l10n="U" oldref="69">MINUTE(Number)</paragraph>
 <paragraph role="paragraph" id="par_id3154611" xml-lang="en-US" l10n="U" oldref="70">
diff --git a/helpcontent2/source/text/scalc/01/func_month.xhp b/helpcontent2/source/text/scalc/01/func_month.xhp
index ad7cfe36d1..9cf54b045f 100644
--- a/helpcontent2/source/text/scalc/01/func_month.xhp
+++ b/helpcontent2/source/text/scalc/01/func_month.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_month.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_networkdays.xhp b/helpcontent2/source/text/scalc/01/func_networkdays.xhp
index 2324423725..0aa71817c3 100644
--- a/helpcontent2/source/text/scalc/01/func_networkdays.xhp
+++ b/helpcontent2/source/text/scalc/01/func_networkdays.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_networkdays.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_now.xhp b/helpcontent2/source/text/scalc/01/func_now.xhp
index 47a9960636..bc042cb27d 100644
--- a/helpcontent2/source/text/scalc/01/func_now.xhp
+++ b/helpcontent2/source/text/scalc/01/func_now.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_now.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_second.xhp b/helpcontent2/source/text/scalc/01/func_second.xhp
index f5e0033202..204beaacf0 100644
--- a/helpcontent2/source/text/scalc/01/func_second.xhp
+++ b/helpcontent2/source/text/scalc/01/func_second.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_second.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_time.xhp b/helpcontent2/source/text/scalc/01/func_time.xhp
index 07f95dfed6..e2deeea089 100644
--- a/helpcontent2/source/text/scalc/01/func_time.xhp
+++ b/helpcontent2/source/text/scalc/01/func_time.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_time.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_timevalue.xhp b/helpcontent2/source/text/scalc/01/func_timevalue.xhp
index 36d17c5661..7fa117ac63 100644
--- a/helpcontent2/source/text/scalc/01/func_timevalue.xhp
+++ b/helpcontent2/source/text/scalc/01/func_timevalue.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_timevalue.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,30 +29,34 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalc01func_timevaluexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">TIMEVALUE </title>
-<filename>/text/scalc/01/func_timevalue.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc01func_timevaluexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">TIMEVALUE </title>
+         <filename>/text/scalc/01/func_timevalue.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146755"><bookmark_value>TIMEVALUE function</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEITWERT" id="bm_id3146767" localize="false"/><paragraph role="heading" id="hd_id3146755" xml-lang="en-US" level="2" l10n="U" oldref="160"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEITWERT" id="bm_id3146767" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146755" role="heading" level="2" l10n="U"
+                 oldref="160"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148502" xml-lang="en-US" l10n="U" oldref="161"><ahelp hid="HID_FUNC_ZEITWERT">TIMEVALUE returns the internal time number from a text enclosed by quotes and which may show a possible time entry format.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="U" oldref="162">The internal number indicated as a decimal is the result of the date system used under $[officename] to calculate date entries.</paragraph>
-<paragraph role="heading" id="hd_id3150810" xml-lang="en-US" level="3" l10n="U" oldref="163">Syntax</paragraph>
-<paragraph role="code" id="par_id3150823" xml-lang="en-US" l10n="U" oldref="164">TIMEVALUE("Text")</paragraph>
-<paragraph role="paragraph" id="par_id3152556" xml-lang="en-US" l10n="U" oldref="165">
-<emph>Text</emph> is a valid time expression and must be entered in quotation marks.</paragraph>
-<paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="3" l10n="U" oldref="166">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3146829" xml-lang="en-US" l10n="U" oldref="167">
-<item type="input">=TIMEVALUE("4PM")</item> returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph>
-<paragraph role="paragraph" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="168">
-<item type="input">=TIMEVALUE("24:00")</item> returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3148502" role="paragraph" l10n="U" oldref="161"><ahelp hid="HID_FUNC_ZEITWERT">TIMEVALUE returns the internal time number from a text enclosed by quotes and which may show a possible time entry format.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150794" role="paragraph" l10n="U" oldref="162">The internal number indicated as a decimal is the result of the date system used under $[officename] to calculate date entries.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id011920090347118" role="paragraph" l10n="NEW">If the text string also includes a year, month, or day, TIMEVALUE only returns the fractional part of the conversion.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150810" role="heading" level="3" l10n="U"
+                 oldref="163">Syntax</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150823" role="code" l10n="U" oldref="164">TIMEVALUE("Text")</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152556" role="paragraph" l10n="U" oldref="165">
+         <emph>Text</emph> is a valid time expression and must be entered in quotation marks.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146815" role="heading" level="3" l10n="U"
+                 oldref="166">Examples</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146829" role="paragraph" l10n="U" oldref="167">
+         <item type="input">=TIMEVALUE("4PM")</item> returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="168">
+         <item type="input">=TIMEVALUE("24:00")</item> returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/func_today.xhp b/helpcontent2/source/text/scalc/01/func_today.xhp
index 3cee2e43c0..04f83fd07c 100644
--- a/helpcontent2/source/text/scalc/01/func_today.xhp
+++ b/helpcontent2/source/text/scalc/01/func_today.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_today.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_weekday.xhp b/helpcontent2/source/text/scalc/01/func_weekday.xhp
index 494d2fcb00..b8f81ccfef 100644
--- a/helpcontent2/source/text/scalc/01/func_weekday.xhp
+++ b/helpcontent2/source/text/scalc/01/func_weekday.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_weekday.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <emph>Number</emph>, as a date value, is a decimal for which the weekday is to be returned.</paragraph>
 <paragraph role="paragraph" id="par_id3154394" xml-lang="en-US" l10n="U" oldref="141">
 <emph>Type</emph> determines the type of calculation. For Type=1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type=2, the weekdays are counted starting from Monday=1. For Type=3, the weekdays are counted starting from Monday=0.</paragraph>
-<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>.</paragraph>
+<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3153836" xml-lang="en-US" level="3" l10n="U" oldref="143">Examples</paragraph>
 <paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="CHG" oldref="144">=WEEKDAY("2000-06-14") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph>
 <paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="CHG" oldref="145">=WEEKDAY("1996-07-24";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/func_weeknum.xhp b/helpcontent2/source/text/scalc/01/func_weeknum.xhp
index 284f873c60..133b958a42 100644
--- a/helpcontent2/source/text/scalc/01/func_weeknum.xhp
+++ b/helpcontent2/source/text/scalc/01/func_weeknum.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: func_weeknum.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,7 +45,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KALENDERWOCHE" id="bm_id3158403" localize="false"/><paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U" oldref="54"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149770" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for the internal date value.</ahelp></paragraph>
-<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.<comment>UFI: see http://www.openoffice.org/issues/show_bug.cgi?id=33709</comment></paragraph>
+<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.</paragraph>
 <paragraph role="heading" id="hd_id3153055" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph>
 <paragraph role="code" id="par_id3147236" xml-lang="en-US" l10n="U" oldref="57">WEEKNUM(Number; Mode)</paragraph>
 <paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="58">
diff --git a/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp b/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp
index 73a8723516..7109c8de6d 100644
--- a/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp
+++ b/helpcontent2/source/text/scalc/01/func_weeknumadd.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_weeknumadd.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_workday.xhp b/helpcontent2/source/text/scalc/01/func_workday.xhp
index 92923da320..ff9c203b67 100644
--- a/helpcontent2/source/text/scalc/01/func_workday.xhp
+++ b/helpcontent2/source/text/scalc/01/func_workday.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_workday.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_year.xhp b/helpcontent2/source/text/scalc/01/func_year.xhp
index 6b28817003..09129cdc42 100644
--- a/helpcontent2/source/text/scalc/01/func_year.xhp
+++ b/helpcontent2/source/text/scalc/01/func_year.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_year.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/func_yearfrac.xhp b/helpcontent2/source/text/scalc/01/func_yearfrac.xhp
index 8ac5ddc490..6bc6090873 100644
--- a/helpcontent2/source/text/scalc/01/func_yearfrac.xhp
+++ b/helpcontent2/source/text/scalc/01/func_yearfrac.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: func_yearfrac.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/makefile.mk b/helpcontent2/source/text/scalc/01/makefile.mk
index 268654dd3f..85dc5a9863 100644
--- a/helpcontent2/source/text/scalc/01/makefile.mk
+++ b/helpcontent2/source/text/scalc/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -229,4 +225,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/01/solver.xhp b/helpcontent2/source/text/scalc/01/solver.xhp
index d23ccb310a..c824d589b4 100644
--- a/helpcontent2/source/text/scalc/01/solver.xhp
+++ b/helpcontent2/source/text/scalc/01/solver.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solver.xhp,v $
- *
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/solver_options.xhp b/helpcontent2/source/text/scalc/01/solver_options.xhp
index f7f0a54927..984b8cffe5 100644
--- a/helpcontent2/source/text/scalc/01/solver_options.xhp
+++ b/helpcontent2/source/text/scalc/01/solver_options.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solver_options.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/01/text2columns.xhp b/helpcontent2/source/text/scalc/01/text2columns.xhp
index 1155bdfbf7..8c94c6b963 100644
--- a/helpcontent2/source/text/scalc/01/text2columns.xhp
+++ b/helpcontent2/source/text/scalc/01/text2columns.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text2columns.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,42 +32,42 @@
  
 	
 <meta>
-<topic id="textscalc01text2columnsxml" indexer="include">
-<title id="tit" xml-lang="en-US">Text to Columns</title>
-<filename>/text/scalc/01/text2columns.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc01text2columnsxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Text to Columns</title>
+         <filename>/text/scalc/01/text2columns.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id8004394"><bookmark_value>text to columns</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:TextToColumns" id="bm_id1029200802260951" localize="false"/>
-<paragraph role="heading" id="hd_id2300180" xml-lang="en-US" level="1" l10n="NEW"><link href="text/scalc/01/text2columns.xhp">Text to Columns</link></paragraph>
-<paragraph role="paragraph" id="par_id655232" xml-lang="en-US" l10n="NEW"><variable id="text2columns">Opens the Text to Columns dialog, where you enter settings to expand the contents of selected cells to multiple cells. 
+<paragraph xml-lang="en-US" id="hd_id2300180" role="heading" level="1" l10n="NEW"><link href="text/scalc/01/text2columns.xhp">Text to Columns</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id655232" role="paragraph" l10n="NEW"><variable id="text2columns">Opens the Text to Columns dialog, where you enter settings to expand the contents of selected cells to multiple cells. 
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/scalc/00/00000412.xhp#text2columns"/>
-</section>
-<paragraph role="heading" id="hd_id9599597" xml-lang="en-US" level="2" l10n="NEW">To expand cell contents to multiple cells</paragraph>
-<paragraph role="paragraph" id="par_id2021546" xml-lang="en-US" l10n="NEW">You can expand cells that contain comma separated values (CSV) into multiple cells in the same row. </paragraph>
-<paragraph role="paragraph" id="par_id2623981" xml-lang="en-US" l10n="NEW">For example, cell A1 contains the comma separated values <item type="literal">1,2,3,4</item>, and cell A2 contains the text <item type="literal">A,B,C,D</item>. </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7242042" xml-lang="en-US" l10n="NEW">Select the cell or cells that you want to expand.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6999420" xml-lang="en-US" l10n="NEW">Choose <emph>Data - Text to Columns</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id6334116" xml-lang="en-US" l10n="NEW">You see the Text to Columns dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9276406" xml-lang="en-US" l10n="NEW">Select the separator options. The preview shows how the current cell contents will be transformed into multiple cells.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8523819" xml-lang="en-US" l10n="NEW">You can select a fixed width and then click the ruler on the preview to set cell breakup positions.</paragraph>
-<paragraph role="paragraph" id="par_id1517380" xml-lang="en-US" l10n="NEW">You can select or enter separator characters to define the positions of breaking points. The separator characters are removed from the resulting cell contents.</paragraph>
-<paragraph role="paragraph" id="par_id7110812" xml-lang="en-US" l10n="NEW">In the example, you select the comma as a delimiter character. Cells A1 and B1 will be expanded to four columns. A1 contains 1, A2 contains 2, and so on.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
-<embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
-</section>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/scalc/00/00000412.xhp#text2columns"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id9599597" role="heading" level="2" l10n="NEW">To expand cell contents to multiple cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW">You can expand cells that contain comma separated values (CSV) into multiple cells in the same row. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2623981" role="paragraph" l10n="NEW">For example, cell A1 contains the comma separated values <item type="literal">1,2,3,4</item>, and cell A2 contains the text <item type="literal">A,B,C,D</item>. </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW">Select the cell or cells that you want to expand.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6999420" role="paragraph" l10n="NEW">Choose <emph>Data - Text to Columns</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6334116" role="paragraph" l10n="NEW">You see the Text to Columns dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9276406" role="paragraph" l10n="NEW">Select the separator options. The preview shows how the current cell contents will be transformed into multiple cells.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8523819" role="paragraph" l10n="NEW">You can select a fixed width and then click the ruler on the preview to set cell breakup positions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1517380" role="paragraph" l10n="NEW">You can select or enter separator characters to define the positions of breaking points. The separator characters are removed from the resulting cell contents.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7110812" role="paragraph" l10n="CHG">In the example, you select the comma as a delimiter character. Cells A1 and A2 will be expanded to four columns each. A1 contains 1, B1 contains 2, and so on.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
+         <embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/02/02130000.xhp b/helpcontent2/source/text/scalc/02/02130000.xhp
index 41d11e5184..459359d760 100644
--- a/helpcontent2/source/text/scalc/02/02130000.xhp
+++ b/helpcontent2/source/text/scalc/02/02130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02130000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/02140000.xhp b/helpcontent2/source/text/scalc/02/02140000.xhp
index 6dffb136e7..a6b80d04fd 100644
--- a/helpcontent2/source/text/scalc/02/02140000.xhp
+++ b/helpcontent2/source/text/scalc/02/02140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/02150000.xhp b/helpcontent2/source/text/scalc/02/02150000.xhp
index d91d34f5bc..8d3ce848f1 100644
--- a/helpcontent2/source/text/scalc/02/02150000.xhp
+++ b/helpcontent2/source/text/scalc/02/02150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02150000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/02160000.xhp b/helpcontent2/source/text/scalc/02/02160000.xhp
index 9e8859ca3c..4e952a668b 100644
--- a/helpcontent2/source/text/scalc/02/02160000.xhp
+++ b/helpcontent2/source/text/scalc/02/02160000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/02170000.xhp b/helpcontent2/source/text/scalc/02/02170000.xhp
index ac6a4a6e32..8bd2e5a7f2 100644
--- a/helpcontent2/source/text/scalc/02/02170000.xhp
+++ b/helpcontent2/source/text/scalc/02/02170000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02170000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06010000.xhp b/helpcontent2/source/text/scalc/02/06010000.xhp
index a9ab24c468..7312f45e6f 100644
--- a/helpcontent2/source/text/scalc/02/06010000.xhp
+++ b/helpcontent2/source/text/scalc/02/06010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06030000.xhp b/helpcontent2/source/text/scalc/02/06030000.xhp
index 169b590001..7cdccc8ae9 100644
--- a/helpcontent2/source/text/scalc/02/06030000.xhp
+++ b/helpcontent2/source/text/scalc/02/06030000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,49 +31,39 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textscalc0206030000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Sum</title>
-<filename>/text/scalc/02/06030000.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  <section id="summe">
-   
-   
+      <topic id="textscalc0206030000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Sum</title>
+         <filename>/text/scalc/02/06030000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="summe">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3157909"><bookmark_value>functions;sum function icon</bookmark_value>
-<bookmark_value>formula bar;sum function</bookmark_value>
-<bookmark_value>sum icon</bookmark_value>
+         <bookmark_value>formula bar;sum function</bookmark_value>
+         <bookmark_value>sum icon</bookmark_value>
+         <bookmark_value>AutoSum button, see sum icon</bookmark_value>
 </bookmark>
-   
-<bookmark xml-lang="en-US" branch="hid/HID_INSWIN_SUMME" id="bm_id3151384" localize="false"/>
-   <comment>mw deleted "sum function..."</comment>
-   <paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/02/06030000.xhp" name="Sum">Sum</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="CHG" oldref="2"><ahelp hid="HID_INSWIN_SUMME">Inserts the sum of a cell range into the current cell, or inserts sum values into selected cells. Click in a cell, click this icon, and optionally adjust the cell range. Or select some cells into which the sum values will be inserted, then click the icon.</ahelp></paragraph>
-   
-  </section>
-  <section id="sysumme">
-   
-   <table id="tbl_id3150868">
-    
-    
-    <tablerow>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="E"> 
-<image id="img_id3147434" src="res/commandimagelist/sc_autosum.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
+<bookmark xml-lang="en-US" branch="hid/HID_INSWIN_SUMME" id="bm_id3151384" localize="false"/><comment>MW inserted a cross-reference</comment>
+<paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/02/06030000.xhp" name="Sum">Sum</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="CHG" oldref="2"><ahelp hid="HID_INSWIN_SUMME">Inserts the sum of a cell range into the current cell, or inserts sum values into selected cells. Click in a cell, click this icon, and optionally adjust the cell range. Or select some cells into which the sum values will be inserted, then click the icon.</ahelp></paragraph>
+      </section>
+      <section id="sysumme">
+         <table id="tbl_id3150868">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="E">
+<image id="img_id3147434" src="res/commandimagelist/sc_autosum.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
 	</image></paragraph>
-     </tablecell>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="15">Sum</paragraph>
-     </tablecell>
-    </tablerow>
-   </table>
-   
-  </section>
-  <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="U" oldref="16">$[officename] automatically suggests a cell range, provided that the spreadsheet contains data. If the cell range already contains a sum function, you can combine it with the new one to yield the total sum of the range. If the range contains filters, the Subtotal function is inserted instead of the Sum function.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153189" role="paragraph" l10n="U" oldref="3">Click the <emph>Accept</emph> icon (green check mark) to use the formula displayed in the input line.</paragraph>
- </body>
-</helpdocument>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="15">Sum</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="U" oldref="16">$[officename] automatically suggests a cell range, provided that the spreadsheet contains data. If the cell range already contains a sum function, you can combine it with the new one to yield the total sum of the range. If the range contains filters, the Subtotal function is inserted instead of the Sum function.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153189" role="paragraph" l10n="U" oldref="3">Click the <emph>Accept</emph> icon (green check mark) to use the formula displayed in the input line.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp
index ed1a5bd8fe..506114fc4f 100644
--- a/helpcontent2/source/text/scalc/02/06040000.xhp
+++ b/helpcontent2/source/text/scalc/02/06040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06050000.xhp b/helpcontent2/source/text/scalc/02/06050000.xhp
index b970eb06ec..e88371d2e5 100644
--- a/helpcontent2/source/text/scalc/02/06050000.xhp
+++ b/helpcontent2/source/text/scalc/02/06050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06060000.xhp b/helpcontent2/source/text/scalc/02/06060000.xhp
index 26c86d4f93..365314ef4b 100644
--- a/helpcontent2/source/text/scalc/02/06060000.xhp
+++ b/helpcontent2/source/text/scalc/02/06060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06070000.xhp b/helpcontent2/source/text/scalc/02/06070000.xhp
index ce65722db8..f060491742 100644
--- a/helpcontent2/source/text/scalc/02/06070000.xhp
+++ b/helpcontent2/source/text/scalc/02/06070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06070000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/06080000.xhp b/helpcontent2/source/text/scalc/02/06080000.xhp
index 25a1791998..85f4c2cac9 100644
--- a/helpcontent2/source/text/scalc/02/06080000.xhp
+++ b/helpcontent2/source/text/scalc/02/06080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/08010000.xhp b/helpcontent2/source/text/scalc/02/08010000.xhp
index cb40dc0393..d55eeaa0f2 100644
--- a/helpcontent2/source/text/scalc/02/08010000.xhp
+++ b/helpcontent2/source/text/scalc/02/08010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/08080000.xhp b/helpcontent2/source/text/scalc/02/08080000.xhp
index 6456c07d81..ea37f31094 100644
--- a/helpcontent2/source/text/scalc/02/08080000.xhp
+++ b/helpcontent2/source/text/scalc/02/08080000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08080000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/10050000.xhp b/helpcontent2/source/text/scalc/02/10050000.xhp
index 7acbf18ccd..4d0a302204 100644
--- a/helpcontent2/source/text/scalc/02/10050000.xhp
+++ b/helpcontent2/source/text/scalc/02/10050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/10060000.xhp b/helpcontent2/source/text/scalc/02/10060000.xhp
index 7a828d8c3c..ff67f03b6e 100644
--- a/helpcontent2/source/text/scalc/02/10060000.xhp
+++ b/helpcontent2/source/text/scalc/02/10060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10060000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/18010000.xhp b/helpcontent2/source/text/scalc/02/18010000.xhp
index 6e5e449d9a..c0340e8918 100644
--- a/helpcontent2/source/text/scalc/02/18010000.xhp
+++ b/helpcontent2/source/text/scalc/02/18010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18010000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/18020000.xhp b/helpcontent2/source/text/scalc/02/18020000.xhp
index b7fc6c0e84..835826de9f 100644
--- a/helpcontent2/source/text/scalc/02/18020000.xhp
+++ b/helpcontent2/source/text/scalc/02/18020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/02/makefile.mk b/helpcontent2/source/text/scalc/02/makefile.mk
index de57389899..00d35e7958 100644
--- a/helpcontent2/source/text/scalc/02/makefile.mk
+++ b/helpcontent2/source/text/scalc/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,4 +66,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 37f9a79860..7e312d217f 100755
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,11 +48,11 @@
 </variable></paragraph>
 <embed href="text/shared/00/00000099.xhp#keys"/>
 </section>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="3">To fill a selected cell range with the formula that you entered on the <emph>Input line</emph>, press <switchinline select="sys"><caseinline select="MAC">Option 
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter. Hold down <switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="3">To fill a selected cell range with the formula that you entered on the <emph>Input line</emph>, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter. Hold down <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter+Shift to apply the cell format of the input cell to the entire cell range.</paragraph>
 <paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="U" oldref="84">To create a matrix in which all the cells contain the same information as what you entered on the <emph>Input line</emph>, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. You cannot edit the components of the matrix.</paragraph>
-<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="4">To select multiple cells in different areas of a sheet, hold down <switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="4">To select multiple cells in different areas of a sheet, hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag in the different areas.</paragraph>
 <paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="127">To select multiple sheets in a spreadsheet, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then click the name tabs at the lower edge of the workspace. To select only one sheet in a selection, hold down Shift, and then click the name tab of the sheet.</paragraph>
 <paragraph role="paragraph" id="par_id3166432" xml-lang="en-US" l10n="U" oldref="129">To insert a manual line break in a cell, click in the cell, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
@@ -164,7 +161,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146885" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3146885" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Page Up</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -173,7 +170,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149013" xml-lang="en-US" l10n="U" oldref="115"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3149013" xml-lang="en-US" l10n="U" oldref="115"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Page Down</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -235,7 +232,7 @@
 <paragraph role="tablecontent" id="hd_id3155825" xml-lang="en-US" l10n="CHG" oldref="99">Enter (in a selected range)<comment>see i80051</comment></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="100">Moves the cursor down one cell in a selected range. To specify the direction that the cursor moves, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>.</paragraph>
+<paragraph role="tablecontent" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="100">Moves the cursor down one cell in a selected range. To specify the direction that the cursor moves, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -265,7 +262,7 @@
 <paragraph role="tablecontent" id="hd_id3154809" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F1</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145140" xml-lang="en-US" l10n="U" oldref="138">Displays the note that is attached to the current cell</paragraph>
+<paragraph role="tablecontent" id="par_id3145140" xml-lang="en-US" l10n="U" oldref="138">Displays the comment that is attached to the current cell</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -335,7 +332,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5</paragraph>
+<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27">Shift+F7</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3153179" xml-lang="en-US" l10n="U" oldref="28">Traces precedents.</paragraph>
@@ -407,7 +404,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149279" xml-lang="en-US" l10n="U" oldref="46">F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3149279" xml-lang="en-US" l10n="U" oldref="46"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3150967" xml-lang="en-US" l10n="U" oldref="47">Opens the <emph>Styles and Formatting</emph> window where you can apply a formatting style to the contents of the cell or to the current sheet.</paragraph>
@@ -447,7 +444,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151264" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3151264" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Down Arrow</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -456,7 +453,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151297" xml-lang="en-US" l10n="U" oldref="119"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3151297" xml-lang="en-US" l10n="U" oldref="119"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Up Arrow</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -465,7 +462,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155997" xml-lang="en-US" l10n="U" oldref="121"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3155997" xml-lang="en-US" l10n="U" oldref="121"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Right Arrow</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -474,7 +471,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154046" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Option 
+<paragraph role="tablecontent" id="hd_id3154046" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> + Left Arrow</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/04/makefile.mk b/helpcontent2/source/text/scalc/04/makefile.mk
index 549da6624b..34b25675dd 100644
--- a/helpcontent2/source/text/scalc/04/makefile.mk
+++ b/helpcontent2/source/text/scalc/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/05/02140000.xhp b/helpcontent2/source/text/scalc/05/02140000.xhp
index 3fe2f24654..b08e14dd0f 100755
--- a/helpcontent2/source/text/scalc/05/02140000.xhp
+++ b/helpcontent2/source/text/scalc/05/02140000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,308 +31,324 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textscalc0502140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Error Codes in %PRODUCTNAME Calc</title>
-<filename>/text/scalc/05/02140000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalc0502140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Error Codes in %PRODUCTNAME Calc</title>
+         <filename>/text/scalc/05/02140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146797"><bookmark_value>error codes;list of</bookmark_value>
-</bookmark><comment>mw deleted "%PRODUCTNAME Calc;error codes"</comment><paragraph role="heading" id="hd_id3146797" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/05/02140000.xhp" name="Error Codes in %PRODUCTNAME Calc">Error Codes in <item type="productname">%PRODUCTNAME</item> Calc</link></paragraph>
-<paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="2">The following table is an overview of the error messages for <item type="productname">%PRODUCTNAME</item> Calc. If the error occurs in the cell that contains the cursor, the error message is displayed on the <emph>Status Bar</emph>.</paragraph>
-<table id="tbl_id3147559">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="3">Error Code</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="4">Message</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3151112" xml-lang="en-US" l10n="U" oldref="5">Explanation</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="6">501</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="7">Invalid character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="8">Character in a formula is not valid, for example, "=1Eq" instead of "=1E2".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="9">502</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147397" xml-lang="en-US" l10n="U" oldref="10">Invalid argument</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153160" xml-lang="en-US" l10n="U" oldref="11">Function argument is not valid, for example, a negative number for the root function.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154015" xml-lang="en-US" l10n="U" oldref="12">503</paragraph>
-<paragraph role="tablecontent" id="par_id1628467" xml-lang="en-US" l10n="NEW">#NUM!</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="13">Invalid floating point operation</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159266" xml-lang="en-US" l10n="CHG" oldref="14">A calculation results in an overflow of the defined value range.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149258" xml-lang="en-US" l10n="U" oldref="15">504</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="16">Parameter list error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147003" xml-lang="en-US" l10n="U" oldref="17">Function parameter is not valid, for example, text instead of a number, or a domain reference instead of cell reference.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154532" xml-lang="en-US" l10n="U" oldref="27">508</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150107" xml-lang="en-US" l10n="U" oldref="28">Error: Pair missing</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="29">Missing bracket, for example, closing brackets, but no opening brackets</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149895" xml-lang="en-US" l10n="U" oldref="30">509</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155097" xml-lang="en-US" l10n="U" oldref="31">Missing operator</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154649" xml-lang="en-US" l10n="U" oldref="32">Operator is missing, for example, "=2(3+4) * ", where the operator between "2" and "(" is missing.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153813" xml-lang="en-US" l10n="U" oldref="33">510</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153483" xml-lang="en-US" l10n="U" oldref="34">Missing variable</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154710" xml-lang="en-US" l10n="U" oldref="35">Variable is missing, for example when two operators are together "=1+*2".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154739" xml-lang="en-US" l10n="U" oldref="36">511</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145112" xml-lang="en-US" l10n="U" oldref="37">Missing variable</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145319" xml-lang="en-US" l10n="U" oldref="38">Function requires more variables than are provided, for example, AND() and OR().</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149050" xml-lang="en-US" l10n="U" oldref="39">512</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="40">Formula overflow</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159259" xml-lang="en-US" l10n="U" oldref="41">
-<emph>Compiler:</emph> the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 512.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="42">513</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="43">String overflow</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145635" xml-lang="en-US" l10n="U" oldref="44">
-<emph>Compiler:</emph> an identifier in the formula exceeds 64 KB in size. <emph>Interpreter:</emph> a result of a string operation exceeds 64 KB in size.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149147" xml-lang="en-US" l10n="U" oldref="45">514</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157904" xml-lang="en-US" l10n="U" oldref="46">Internal overflow</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149352" xml-lang="en-US" l10n="U" oldref="47">Sort operation attempted on too much numerical data (max. 100000) or a calculation stack overflow.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="51">516</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147423" xml-lang="en-US" l10n="U" oldref="52">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="53">Matrix is expected on the calculation stack, but is not available.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155261" xml-lang="en-US" l10n="U" oldref="54">517</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153934" xml-lang="en-US" l10n="U" oldref="55">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149507" xml-lang="en-US" l10n="U" oldref="56">Unknown code, for example, a document with a newer function is loaded in an older version that does not contain the function.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148585" xml-lang="en-US" l10n="U" oldref="57">518</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149189" xml-lang="en-US" l10n="U" oldref="58">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149545" xml-lang="en-US" l10n="U" oldref="59">Variable is not available</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146142" xml-lang="en-US" l10n="U" oldref="60">519</paragraph>
-<paragraph role="tablecontent" id="par_id8169499" xml-lang="en-US" l10n="NEW">#VALUE</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155954" xml-lang="en-US" l10n="U" oldref="61">No result (#VALUE is in the cell rather than Err:519!)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153108" xml-lang="en-US" l10n="CHG" oldref="62">The formula yields a value that does not correspond to the definition; or a cell that is referenced in the formula contains text instead of a number.<comment>i63264</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150338" xml-lang="en-US" l10n="U" oldref="63">520</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="64">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148758" xml-lang="en-US" l10n="U" oldref="65">Compiler creates an unknown compiler code.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154324" xml-lang="en-US" l10n="U" oldref="66">521</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153737" xml-lang="en-US" l10n="U" oldref="67">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155436" xml-lang="en-US" l10n="U" oldref="68">No result.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153045" xml-lang="en-US" l10n="U" oldref="69">522</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149008" xml-lang="en-US" l10n="U" oldref="70">Circular reference</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157972" xml-lang="en-US" l10n="CHG" oldref="71">Formula refers directly or indirectly to itself and the <emph>Iterations</emph> option is not set under Tools - Options - %PRODUCTNAME Calc - Calculate.<comment>UFI: fixes #i23854#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="72">523</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="73">The calculation procedure does not converge</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150272" xml-lang="en-US" l10n="CHG" oldref="74">Function missed a targeted value, or <link href="text/shared/optionen/01060500.xhp">iterative references</link> do not reach the minimum change within the maximum steps that are set.<comment>UFI: see #33769#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153544" xml-lang="en-US" l10n="U" oldref="75">524</paragraph>
-<paragraph role="tablecontent" id="par_id2129886" xml-lang="en-US" l10n="NEW">#REF</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+</bookmark><comment>mw deleted "%PRODUCTNAME Calc;error codes"</comment>
+<paragraph xml-lang="en-US" id="hd_id3146797" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/05/02140000.xhp" name="Error Codes in %PRODUCTNAME Calc">Error Codes in <item type="productname">%PRODUCTNAME</item> Calc</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150275" role="paragraph" l10n="U" oldref="2">The following table is an overview of the error messages for <item type="productname">%PRODUCTNAME</item> Calc. If the error occurs in the cell that contains the cursor, the error message is displayed on the <emph>Status Bar</emph>.</paragraph>
+      <table id="tbl_id3147559">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153968" role="tablehead" l10n="U" oldref="3">Error Code</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3125863" role="tablehead" l10n="U" oldref="4">Message</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151112" role="tablehead" l10n="U" oldref="5">Explanation</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1668467" role="tablecontent" l10n="NEW">###</paragraph>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0202201010205429"><bookmark_value>### error message</bookmark_value>
+</bookmark><comment>mw added "...error message" entry</comment>
+<paragraph xml-lang="en-US" id="par_id3165766" role="tablecontent" l10n="U" oldref="13">none</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3169266" role="tablecontent" l10n="CHG" oldref="14">The cell is not wide enough to display the contents.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153188" role="tablecontent" l10n="U" oldref="6">501</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148645" role="tablecontent" l10n="U" oldref="7">Invalid character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155854" role="tablecontent" l10n="U" oldref="8">Character in a formula is not valid.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145253" role="tablecontent" l10n="U" oldref="9">502</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147397" role="tablecontent" l10n="U" oldref="10">Invalid argument</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153160" role="tablecontent" l10n="U" oldref="11">Function argument is not valid, for example, a negative number for the root function.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154015" role="tablecontent" l10n="U" oldref="12">503</paragraph>
+               <paragraph xml-lang="en-US" id="par_id1628467" role="tablecontent" l10n="NEW">#NUM!</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155766" role="tablecontent" l10n="U" oldref="13">Invalid floating point operation</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159266" role="tablecontent" l10n="CHG" oldref="14">A calculation results in an overflow of the defined value range.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149258" role="tablecontent" l10n="U" oldref="15">504</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147344" role="tablecontent" l10n="U" oldref="16">Parameter list error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147003" role="tablecontent" l10n="U" oldref="17">Function parameter is not valid, for example, text instead of a number, or a domain reference instead of cell reference.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154532" role="tablecontent" l10n="U" oldref="27">508</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150107" role="tablecontent" l10n="U" oldref="28">Error: Pair missing</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149129" role="tablecontent" l10n="U" oldref="29">Missing bracket, for example, closing brackets, but no opening brackets</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149895" role="tablecontent" l10n="U" oldref="30">509</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155097" role="tablecontent" l10n="U" oldref="31">Missing operator</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154649" role="tablecontent" l10n="U" oldref="32">Operator is missing, for example, "=2(3+4) * ", where the operator between "2" and "(" is missing.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153813" role="tablecontent" l10n="U" oldref="33">510</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153483" role="tablecontent" l10n="U" oldref="34">Missing variable</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154710" role="tablecontent" l10n="U" oldref="35">Variable is missing, for example when two operators are together "=1+*2".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154739" role="tablecontent" l10n="U" oldref="36">511</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145112" role="tablecontent" l10n="U" oldref="37">Missing variable</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145319" role="tablecontent" l10n="U" oldref="38">Function requires more variables than are provided, for example, AND() and OR().</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149050" role="tablecontent" l10n="U" oldref="39">512</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150393" role="tablecontent" l10n="U" oldref="40">Formula overflow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159259" role="tablecontent" l10n="U" oldref="41">
+                  <emph>Compiler:</emph> the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 512.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150537" role="tablecontent" l10n="U" oldref="42">513</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147412" role="tablecontent" l10n="U" oldref="43">String overflow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145635" role="tablecontent" l10n="U" oldref="44">
+                  <emph>Compiler:</emph> an identifier in the formula exceeds 64 KB in size. <emph>Interpreter:</emph> a result of a string operation exceeds 64 KB in size.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149147" role="tablecontent" l10n="U" oldref="45">514</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157904" role="tablecontent" l10n="U" oldref="46">Internal overflow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149352" role="tablecontent" l10n="U" oldref="47">Sort operation attempted on too much numerical data (max. 100000) or a calculation stack overflow.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154841" role="tablecontent" l10n="U" oldref="51">516</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147423" role="tablecontent" l10n="U" oldref="52">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148437" role="tablecontent" l10n="U" oldref="53">Matrix is expected on the calculation stack, but is not available.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155261" role="tablecontent" l10n="U" oldref="54">517</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153934" role="tablecontent" l10n="U" oldref="55">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149507" role="tablecontent" l10n="U" oldref="56">Unknown code, for example, a document with a newer function is loaded in an older version that does not contain the function.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148585" role="tablecontent" l10n="U" oldref="57">518</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149189" role="tablecontent" l10n="U" oldref="58">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149545" role="tablecontent" l10n="U" oldref="59">Variable is not available</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146142" role="tablecontent" l10n="U" oldref="60">519</paragraph>
+               <paragraph xml-lang="en-US" id="par_id8169499" role="tablecontent" l10n="NEW">#VALUE</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155954" role="tablecontent" l10n="U" oldref="61">No result (#VALUE is in the cell rather than Err:519!)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153108" role="tablecontent" l10n="CHG" oldref="62">The formula yields a value that does not correspond to the definition; or a cell that is referenced in the formula contains text instead of a number.<comment>i63264</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150338" role="tablecontent" l10n="U" oldref="63">520</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150017" role="tablecontent" l10n="U" oldref="64">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148758" role="tablecontent" l10n="U" oldref="65">Compiler creates an unknown compiler code.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154324" role="tablecontent" l10n="U" oldref="66">521</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153737" role="tablecontent" l10n="U" oldref="67">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155436" role="tablecontent" l10n="U" oldref="68">No result.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153045" role="tablecontent" l10n="U" oldref="69">522</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149008" role="tablecontent" l10n="U" oldref="70">Circular reference</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157972" role="tablecontent" l10n="CHG" oldref="71">Formula refers directly or indirectly to itself and the <emph>Iterations</emph> option is not set under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences
+</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate.<comment>UFI: fixes #i23854#</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149538" role="tablecontent" l10n="U" oldref="72">523</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150930" role="tablecontent" l10n="U" oldref="73">The calculation procedure does not converge</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150272" role="tablecontent" l10n="CHG" oldref="74">Function missed a targeted value, or <link href="text/shared/optionen/01060500.xhp">iterative references</link> do not reach the minimum change within the maximum steps that are set.<comment>UFI: see #33769#</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153544" role="tablecontent" l10n="U" oldref="75">524</paragraph>
+               <paragraph xml-lang="en-US" id="par_id2129886" role="tablecontent" l10n="NEW">#REF</paragraph>
+            </tablecell>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154634"><bookmark_value>invalid references; error messages</bookmark_value>
-<bookmark_value>error messages;invalid references</bookmark_value>
-<bookmark_value>#REF error message</bookmark_value>
-</bookmark><comment>mw inserted "error..." entry</comment><paragraph role="tablecontent" id="par_id3154634" xml-lang="en-US" l10n="U" oldref="76">invalid references (instead of Err:524 cell contains #REF)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147539" xml-lang="en-US" l10n="U" oldref="77">
-<emph>Compiler:</emph> a column or row description name could not be resolved. <emph>Interpreter:</emph> in a formula, the column, row, or sheet that contains a referenced cell is missing.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155984" xml-lang="en-US" l10n="U" oldref="78">525</paragraph>
-<paragraph role="tablecontent" id="par_id4737083" xml-lang="en-US" l10n="NEW">#NAME?</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+               <bookmark_value>error messages;invalid references</bookmark_value>
+               <bookmark_value>#REF error message</bookmark_value>
+</bookmark><comment>mw inserted "error..." entry</comment>
+<paragraph xml-lang="en-US" id="par_id3154634" role="tablecontent" l10n="U" oldref="76">invalid references (instead of Err:524 cell contains #REF)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147539" role="tablecontent" l10n="U" oldref="77">
+                  <emph>Compiler:</emph> a column or row description name could not be resolved. <emph>Interpreter:</emph> in a formula, the column, row, or sheet that contains a referenced cell is missing.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155984" role="tablecontent" l10n="U" oldref="78">525</paragraph>
+               <paragraph xml-lang="en-US" id="par_id4737083" role="tablecontent" l10n="NEW">#NAME?</paragraph>
+            </tablecell>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148428"><bookmark_value>invalid names; error messages</bookmark_value>
-<bookmark_value>#NAME error message</bookmark_value>
+               <bookmark_value>#NAME error message</bookmark_value>
 </bookmark>
-<paragraph role="tablecontent" id="par_id3148428" xml-lang="en-US" l10n="U" oldref="79">invalid names (instead of Err:525 cell contains #NAME?)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156259" xml-lang="en-US" l10n="U" oldref="80">An identifier could not be evaluated, for example, no valid reference, no valid domain name, no column/row label, no macro, incorrect decimal divider, add-in not found.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153720" xml-lang="en-US" l10n="U" oldref="81">526</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154315" xml-lang="en-US" l10n="U" oldref="82">Internal syntax error</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3083286" xml-lang="en-US" l10n="U" oldref="83">Obsolete, no longer used, but could come from old documents if the result is a formula from a domain.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152483" xml-lang="en-US" l10n="U" oldref="84">527</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152966" xml-lang="en-US" l10n="U" oldref="85">Internal overflow</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149709" xml-lang="en-US" l10n="U" oldref="86">
-<emph>Interpreter: </emph>References, such as when a cell references a cell, are too encapsulated.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5324564" xml-lang="en-US" l10n="NEW">532</paragraph>
-<paragraph role="tablecontent" id="par_id3623462" xml-lang="en-US" l10n="NEW">#DIV/0!</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7941831" xml-lang="en-US" l10n="NEW">Division by zero</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5844294" xml-lang="en-US" l10n="NEW">Division operator / if the denominator is 0<br/>Some more functions return this error, for example:<br/>VARP with less than 1 argument<br/>STDEVP with less than 1 argument<br/>VAR with less than 2 arguments<br/>STDEV with less than 2 arguments<br/>STANDARDIZE with stdev=0<br/>NORMDIST with stdev=0</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3148428" role="tablecontent" l10n="U" oldref="79">invalid names (instead of Err:525 cell contains #NAME?)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156259" role="tablecontent" l10n="U" oldref="80">An identifier could not be evaluated, for example, no valid reference, no valid domain name, no column/row label, no macro, incorrect decimal divider, add-in not found.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153720" role="tablecontent" l10n="U" oldref="81">526</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154315" role="tablecontent" l10n="U" oldref="82">Internal syntax error</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3083286" role="tablecontent" l10n="U" oldref="83">Obsolete, no longer used, but could come from old documents if the result is a formula from a domain.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152483" role="tablecontent" l10n="U" oldref="84">527</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152966" role="tablecontent" l10n="U" oldref="85">Internal overflow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149709" role="tablecontent" l10n="U" oldref="86">
+                  <emph>Interpreter: </emph>References, such as when a cell references a cell, are too encapsulated.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5324564" role="tablecontent" l10n="NEW">532</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3623462" role="tablecontent" l10n="NEW">#DIV/0!</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7941831" role="tablecontent" l10n="NEW">Division by zero</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5844294" role="tablecontent" l10n="NEW">Division operator / if the denominator is 0<br/>Some more functions return this error, for example:<br/>VARP with less than 1 argument<br/>STDEVP with less than 1 argument<br/>VAR with less than 2 arguments<br/>STDEV with less than 2 arguments<br/>STANDARDIZE with stdev=0<br/>NORMDIST with stdev=0</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/05/empty_cells.xhp b/helpcontent2/source/text/scalc/05/empty_cells.xhp
index 0141b2ecd5..774afb4bc9 100644
--- a/helpcontent2/source/text/scalc/05/empty_cells.xhp
+++ b/helpcontent2/source/text/scalc/05/empty_cells.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: empty_cells.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,8 +43,8 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146799"><bookmark_value>empty cells;handling of</bookmark_value>
 </bookmark><comment>i86303</comment><paragraph role="heading" id="hd_id1502121" xml-lang="en-US" level="1" l10n="NEW"><variable id="empty_cells"><link href="text/scalc/05/empty_cells.xhp">Handling of Empty Cells</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id2871181" xml-lang="en-US" l10n="NEW">Starting with OpenOffice.org 3.0 and StarOffice 9, the handling of empty cells got changed.</paragraph>
-<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">Previously, empty cells were forced to numeric 0 in some contexts and to empty string in others, except in direct comparison where =A1=0 and =A1="" both resulted in TRUE if A1 was empty. Emptiness now is inherited until used, so both =VLOOKUP(...)=0 and =VLOOKUP(...)="" give TRUE if the lookup resulted in an empty cell being returned. </paragraph>
+
+<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">In older versions of the software, empty cells were forced to numeric 0 in some contexts and to empty string in others, except in direct comparison where =A1=0 and =A1="" both resulted in TRUE if A1 was empty. Emptiness now is inherited until used, so both =VLOOKUP(...)=0 and =VLOOKUP(...)="" give TRUE if the lookup resulted in an empty cell being returned. </paragraph>
 <paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">A simple reference to an empty cell is still displayed as numeric 0 but is not necessarily of type numeric anymore, so also comparisons with the referencing cell work as expected. </paragraph>
 <paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW">For the following examples, A1 contains a number, B1 is empty, C1 contains the reference to B1:</paragraph>
 <paragraph role="code" id="par_id8277230" xml-lang="en-US" l10n="NEW">A1: 1 B1: &lt;empty&gt; C1: =B1 (displays 0)</paragraph>
diff --git a/helpcontent2/source/text/scalc/05/makefile.mk b/helpcontent2/source/text/scalc/05/makefile.mk
index 891c629076..f981e686ac 100644
--- a/helpcontent2/source/text/scalc/05/makefile.mk
+++ b/helpcontent2/source/text/scalc/05/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,4 +50,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/guide/address_auto.xhp b/helpcontent2/source/text/scalc/guide/address_auto.xhp
index 64d1e7437d..ad849e2731 100644
--- a/helpcontent2/source/text/scalc/guide/address_auto.xhp
+++ b/helpcontent2/source/text/scalc/guide/address_auto.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: address_auto.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,44 +31,41 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguideaddress_autoxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recognizing Names as Addressing</title>
-<filename>/text/scalc/guide/address_auto.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideaddress_autoxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Recognizing Names as Addressing</title>
+         <filename>/text/scalc/guide/address_auto.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148797"><bookmark_value>automatic addressing in tables</bookmark_value>
-<bookmark_value>natural language addressing</bookmark_value>
-<bookmark_value>formulas; using row/column labels</bookmark_value>
-<bookmark_value>text in cells; as addressing</bookmark_value>
-<bookmark_value>addressing; automatic</bookmark_value>
-<bookmark_value>name recognition on/off</bookmark_value>
-<bookmark_value>row headers;using in formulas</bookmark_value>
-<bookmark_value>column headers;using in formulas</bookmark_value>
-<bookmark_value>columns; finding labels automatically</bookmark_value>
-<bookmark_value>rows; finding labels automatically</bookmark_value>
-<bookmark_value>recognizing; column and row labels</bookmark_value>
-</bookmark><comment>mw changes "names;..." entry to "text in cells;..."</comment><comment>mw inserted three index entries from text/shared/optionen/01060500.xhp. Changed "finding;..." entry to "recognizing;..." entry. Adding (Calc) is no longer necessary in this file.</comment><paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="address_auto"><link href="text/scalc/guide/address_auto.xhp" name="Recognizing Names as Addressing">Recognizing Names as Addressing</link>
+      <bookmark_value>natural language addressing</bookmark_value>
+      <bookmark_value>formulas; using row/column labels</bookmark_value>
+      <bookmark_value>text in cells; as addressing</bookmark_value>
+      <bookmark_value>addressing; automatic</bookmark_value>
+      <bookmark_value>name recognition on/off</bookmark_value>
+      <bookmark_value>row headers;using in formulas</bookmark_value>
+      <bookmark_value>column headers;using in formulas</bookmark_value>
+      <bookmark_value>columns; finding labels automatically</bookmark_value>
+      <bookmark_value>rows; finding labels automatically</bookmark_value>
+      <bookmark_value>recognizing; column and row labels</bookmark_value>
+</bookmark><comment>mw changes "names;..." entry to "text in cells;..."</comment><comment>mw inserted three index entries from text/shared/optionen/01060500.xhp. Changed "finding;..." entry to "recognizing;..." entry. Adding (Calc) is no longer necessary in this file.</comment>
+<paragraph xml-lang="en-US" id="hd_id3148797" role="heading" level="1" l10n="U"
+                 oldref="20"><variable id="address_auto"><link href="text/scalc/guide/address_auto.xhp" name="Recognizing Names as Addressing">Recognizing Names as Addressing</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152597" xml-lang="en-US" l10n="CHG" oldref="21">You can use cells with text to refer to the rows or to the columns that contain the cells.</paragraph>
-<table id="tbl_id3152577">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="E">
-<image id="img_id3154942" src="res/helpimg/names_as_addressing.png" width="4.2898inch" height="1.6854inch" localize="true"><alt id="alt_id3154942" xml-lang="en-US">Example spreadsheet</alt>
+      <paragraph xml-lang="en-US" id="par_id3152597" role="paragraph" l10n="CHG" oldref="21">You can use cells with text to refer to the rows or to the columns that contain the cells.</paragraph>
+<comment>removed table as a workaround for issue 108715</comment>
+               <paragraph xml-lang="en-US" id="par_id3156283" role="paragraph" l10n="E">
+<image id="img_id3154942" src="res/helpimg/names_as_addressing.png" width="2.1291in" height="0.8709in" localize="true"><alt xml-lang="en-US" id="alt_id3154942">Example spreadsheet</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="22">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
-<paragraph role="paragraph" id="par_id3155443" xml-lang="en-US" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
-<paragraph role="tip" id="par_id3149210" xml-lang="en-US" l10n="CHG" oldref="37">If you want a name to be automatically recognized by Calc, the name must start with a letter and be composed of alphanumeric characters. If you enter the name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must enter a backslash in front of the quotation mark, for example, <item type="literal">'Harry\'s Bar'.</item>
+
+      <paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="22">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155443" role="paragraph" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149210" role="tip" l10n="CHG" oldref="37">If you want a name to be automatically recognized by Calc, the name must start with a letter and be composed of alphanumeric characters. If you enter the name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must enter a backslash in front of the quotation mark, for example, <item type="literal">'Harry\'s Bar'.</item>
 </paragraph>
-<section id="relatedtopics"><comment>mw changed reference to deleted Calc guide address_byname.xhp to refer to Calc guide value_with_name.xhp</comment><comment>UFI: changed embedvar links to embed links</comment><embed href="text/scalc/guide/value_with_name.xhp#value_with_name"/>
-<embed href="text/scalc/01/04070400.xhp#define_label_range"/>
-<embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics"><comment>mw changed reference to deleted Calc guide address_byname.xhp to refer to Calc guide value_with_name.xhp</comment><comment>UFI: changed embedvar links to embed links</comment><embed href="text/scalc/guide/value_with_name.xhp#value_with_name"/>
+         <embed href="text/scalc/01/04070400.xhp#define_label_range"/>
+         <embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/auto_off.xhp b/helpcontent2/source/text/scalc/guide/auto_off.xhp
index cb183bab62..f1cf074dbc 100755
--- a/helpcontent2/source/text/scalc/guide/auto_off.xhp
+++ b/helpcontent2/source/text/scalc/guide/auto_off.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,56 +29,54 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textscalcguideauto_offxml" indexer="include">
-<title id="tit" xml-lang="en-US">Deactivating Automatic Changes</title>
-<filename>/text/scalc/guide/auto_off.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideauto_offxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Deactivating Automatic Changes</title>
+         <filename>/text/scalc/guide/auto_off.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149456"><bookmark_value>deactivating; automatic changes</bookmark_value>
-<bookmark_value>tables; deactivating automatic changes in</bookmark_value>
-<bookmark_value>AutoInput function on/off</bookmark_value>
-<bookmark_value>text in cells;AutoInput function</bookmark_value>
-<bookmark_value>cells; AutoInput function of text</bookmark_value>
-<bookmark_value>input support in spreadsheets</bookmark_value>
-<bookmark_value>changing; input in cells</bookmark_value>
-<bookmark_value>AutoCorrect function;cell contents</bookmark_value>
-<bookmark_value>cell input;AutoInput function</bookmark_value>
-<bookmark_value>lowercase letters;AutoInput function (in cells)</bookmark_value>
-<bookmark_value>capital letters;AutoInput function (in cells)</bookmark_value>
-<bookmark_value>date formats;avoiding conversion to</bookmark_value>
-<bookmark_value>number completion on/off</bookmark_value>
-<bookmark_value>text completion on/off</bookmark_value>
-<bookmark_value>word completion on/off</bookmark_value>
+      <bookmark_value>tables; deactivating automatic changes in</bookmark_value>
+      <bookmark_value>AutoInput function on/off</bookmark_value>
+      <bookmark_value>text in cells;AutoInput function</bookmark_value>
+      <bookmark_value>cells; AutoInput function of text</bookmark_value>
+      <bookmark_value>input support in spreadsheets</bookmark_value>
+      <bookmark_value>changing; input in cells</bookmark_value>
+      <bookmark_value>AutoCorrect function;cell contents</bookmark_value>
+      <bookmark_value>cell input;AutoInput function</bookmark_value>
+      <bookmark_value>lowercase letters;AutoInput function (in cells)</bookmark_value>
+      <bookmark_value>capital letters;AutoInput function (in cells)</bookmark_value>
+      <bookmark_value>date formats;avoiding conversion to</bookmark_value>
+      <bookmark_value>number completion on/off</bookmark_value>
+      <bookmark_value>text completion on/off</bookmark_value>
+      <bookmark_value>word completion on/off</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
-<paragraph role="heading" id="hd_id3149456" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="auto_off"><link href="text/scalc/guide/auto_off.xhp" name="Deactivating Automatic Changes">Deactivating Automatic Changes</link>
+<paragraph xml-lang="en-US" id="hd_id3149456" role="heading" level="1" l10n="U" oldref="1"><variable id="auto_off"><link href="text/scalc/guide/auto_off.xhp" name="Deactivating Automatic Changes">Deactivating Automatic Changes</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156442" xml-lang="en-US" l10n="U" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. You can immediately undo any automatic changes with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z.</paragraph>
-<paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="3">The following shows you how to deactivate and reactivate the automatic changes in $[officename] Calc:</paragraph>
-<paragraph role="heading" id="hd_id3145748" xml-lang="en-US" level="2" l10n="U" oldref="4">Automatic text or number completion</paragraph>
-<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="U" oldref="5">When making an entry in a cell, $[officename] Calc automatically suggests matching input found in the same column. This function is known as <emph>AutoInput</emph>.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="6">To turn the AutoInput on and off, set or remove the check mark in front of <link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput"><emph>Tools - Cell Contents - AutoInput</emph></link>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="2" l10n="U" oldref="21">Automatic conversion to date format</paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="22">$[officename] Calc automatically converts certain entries to dates. For example, the entry <emph>1.1</emph> may be interpreted as January 1 of the current year, according to the locale settings of your operating system, and then displayed according to the date format applied to the cell.<comment>for sure 1.1 will not be interpreted as a date in the USofA !!</comment></paragraph>
-<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="23">To ensure that an entry is interpreted as text, add an apostrophe at the beginning of the entry. The apostrophe is not displayed in the cell.</paragraph>
-<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="2" l10n="U" oldref="7">Quotation marks replaced by custom quotes</paragraph>
-<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Tools - AutoCorrect Options</emph>. Go to the <emph>Custom Quotes</emph> tab and unmark <emph>Replace</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="11">Cell content always begins with uppercase</paragraph>
-<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>. Go to the <emph>Options</emph> tab. Unmark <emph>Capitalize first letter of every sentence</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3150345" xml-lang="en-US" level="2" l10n="U" oldref="15">Replace word with another word</paragraph>
-<paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>. Go to the <emph>Replace</emph> tab. Select the word pair and click <emph>Delete</emph>.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="19"><link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput">Tools - Cell Contents - AutoInput</link></paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect">Tools - AutoCorrect Options</link></paragraph>
-</section>
-</body>
+      <paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. You can immediately undo any automatic changes with <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145273" role="paragraph" l10n="U" oldref="3">The following shows you how to deactivate and reactivate the automatic changes in $[officename] Calc:</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145748" role="heading" level="2" l10n="U" oldref="4">Automatic Text or Number Completion</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154730" role="paragraph" l10n="U" oldref="5">When making an entry in a cell, $[officename] Calc automatically suggests matching input found in the same column. This function is known as <emph>AutoInput</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153878" role="paragraph" l10n="U" oldref="6">To turn the AutoInput on and off, set or remove the check mark in front of <link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput"><emph>Tools - Cell Contents - AutoInput</emph></link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146972" role="heading" level="2" l10n="U"
+                 oldref="21">Automatic Conversion to Date Format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="22">$[officename] Calc automatically converts certain entries to dates. For example, the entry <emph>1.1</emph> may be interpreted as January 1 of the current year, according to the locale settings of your operating system, and then displayed according to the date format applied to the cell.<comment>for sure 1.1 will not be interpreted as a date in the USofA !!</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159267" role="paragraph" l10n="U" oldref="23">To ensure that an entry is interpreted as text, add an apostrophe at the beginning of the entry. The apostrophe is not displayed in the cell.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150043" role="heading" level="2" l10n="U" oldref="7">Quotation Marks Replaced by Custom Quotes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="9">Choose <emph>Tools - AutoCorrect Options</emph>. Go to the <emph>Localized Options</emph> tab and unmark <emph>Replace</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149565" role="heading" level="2" l10n="U"
+                 oldref="11">Cell Content Always Begins With Uppercase</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147001" role="paragraph" l10n="U" oldref="13">Choose <item type="menuitem">Tools - AutoCorrect Options</item>. Go to the <item type="menuitem">Options</item> tab. Unmark <item type="menuitem">Capitalize first letter of every sentence</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150345" role="heading" level="2" l10n="U"
+                 oldref="15">Replace Word With Another Word</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166425" role="paragraph" l10n="U" oldref="17">Choose <item type="menuitem">Tools - AutoCorrect Options</item>. Go to the <item type="menuitem">Replace</item> tab. Select the word pair and click <item type="menuitem">Delete</item>.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3152992" role="paragraph" l10n="U" oldref="19"><link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput">Tools - Cell Contents - AutoInput</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="20"><link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect">Tools - AutoCorrect Options</link></paragraph>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/autofilter.xhp b/helpcontent2/source/text/scalc/guide/autofilter.xhp
index 02d0a2fb6a..e40c34691d 100755
--- a/helpcontent2/source/text/scalc/guide/autofilter.xhp
+++ b/helpcontent2/source/text/scalc/guide/autofilter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autofilter.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,51 +29,51 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideautofilterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying AutoFilter</title>
-<filename>/text/scalc/guide/autofilter.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideautofilterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying AutoFilter</title>
+         <filename>/text/scalc/guide/autofilter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156423"><bookmark_value>filters, see also AutoFilter function</bookmark_value>
-<bookmark_value>AutoFilter function;applying</bookmark_value>
-<bookmark_value>sheets; filter values</bookmark_value>
-<bookmark_value>numbers; filter sheets</bookmark_value>
-<bookmark_value>columns; AutoFilter function</bookmark_value>
-<bookmark_value>drop-down menus in sheet columns</bookmark_value>
-<bookmark_value>database ranges; AutoFilter function</bookmark_value>
-</bookmark><comment>mw made "drop-down..." a one level entry and added a "see also" reference</comment><paragraph role="heading" id="hd_id3156423" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="autofilter"><link href="text/scalc/guide/autofilter.xhp" name="Applying AutoFilter">Applying AutoFilter</link>
+      <bookmark_value>AutoFilter function;applying</bookmark_value>
+      <bookmark_value>sheets; filter values</bookmark_value>
+      <bookmark_value>numbers; filter sheets</bookmark_value>
+      <bookmark_value>columns; AutoFilter function</bookmark_value>
+      <bookmark_value>drop-down menus in sheet columns</bookmark_value>
+      <bookmark_value>database ranges; AutoFilter function</bookmark_value>
+</bookmark><comment>mw made "drop-down..." a one level entry and added a "see also" reference</comment>
+<paragraph xml-lang="en-US" id="hd_id3156423" role="heading" level="1" l10n="U" oldref="6"><variable id="autofilter"><link href="text/scalc/guide/autofilter.xhp" name="Applying AutoFilter">Applying AutoFilter</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="7">The <emph>AutoFilter</emph> function inserts a combo box on one or more data columns that lets you select the records (rows) to be displayed.</paragraph>
-<section id="autofiltertext">
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="9">Select the columns you want to use AutoFilter on.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153157" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Data - Filter - AutoFilter</emph>. The combo box arrows are visible in the first row of the range selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="11">Run the filter by clicking the drop-down arrow in the column heading and choosing an item.</paragraph>
-<paragraph role="listitem" id="par_id3155064" xml-lang="en-US" l10n="CHG" oldref="13">Only those rows whose contents meet the filter criteria are displayed. The other rows are filtered<comment>UFI: we must distinguish manually hidden cells from filtered cells, because they behave differently. So don't use the word "hidden" when a filter is applied.</comment>. You can see if rows have been filtered from the discontinuous row numbers. The column that has been used for the filter is identified by a different color for the arrow button.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9216589" xml-lang="en-US" l10n="NEW">When you apply an additional AutoFilter on another column of a filtered data range, then the other combo boxes list only the filtered data.</paragraph>
-<paragraph role="paragraph" id="par_id3153714" xml-lang="en-US" l10n="U" oldref="12">To display all records again, select the <emph>-all-</emph> entry in the AutoFilter combo box. If you choose <emph>-Standard-</emph>, the <emph>Standard Filter</emph> dialog appears, allowing you to set up a standard filter. Choose <emph>-Top 10-</emph> to display the highest 10 values only. </paragraph>
-<paragraph role="paragraph" id="par_id3147340" xml-lang="en-US" l10n="CHG" oldref="19">To stop using AutoFilter, reselect all cells selected in step 1 and once again choose <emph>Data - Filter - AutoFilter</emph>.</paragraph>
-<paragraph role="tip" id="par_id4303415" xml-lang="en-US" l10n="NEW">To assign different AutoFilters to different sheets, you must first define a database range on each sheet.</paragraph>
-<paragraph role="warning" id="par_id3159236" xml-lang="en-US" l10n="CHG" oldref="14">The arithmetic functions also take account of the cells that are not visible due to an applied filter. For example, a sum of an entire column will also total the values in the filtered cells. Apply the <link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link> function if only the cells visible after the application of a filter are to be taken into account.</paragraph>
-</section>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/filters.xhp#filters"/>
-<embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
-<embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
-<paragraph role="paragraph" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="16"><link href="text/scalc/01/12040100.xhp" name="Data - Filter - AutoFilter">Data - Filter - AutoFilter</link></paragraph>
-<paragraph role="paragraph" id="par_id3154484" xml-lang="en-US" l10n="U" oldref="17"><link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3147427" role="paragraph" l10n="U" oldref="7">The <emph>AutoFilter</emph> function inserts a combo box on one or more data columns that lets you select the records (rows) to be displayed.</paragraph>
+      <section id="autofiltertext">
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3152576" role="listitem" l10n="U" oldref="9">Select the columns you want to use AutoFilter on.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153157" role="listitem" l10n="CHG" oldref="10">Choose <emph>Data - Filter - AutoFilter</emph>. The combo box arrows are visible in the first row of the range selected.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="11">Run the filter by clicking the drop-down arrow in the column heading and choosing an item.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155064" role="listitem" l10n="CHG" oldref="13">Only those rows whose contents meet the filter criteria are displayed. The other rows are filtered<comment>UFI: we must distinguish manually hidden cells from filtered cells, because they behave differently. So don't use the word "hidden" when a filter is applied.</comment>. You can see if rows have been filtered from the discontinuous row numbers. The column that has been used for the filter is identified by a different color for the arrow button.</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id9216589" role="paragraph" l10n="NEW">When you apply an additional AutoFilter on another column of a filtered data range, then the other combo boxes list only the filtered data.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153714" role="paragraph" l10n="U" oldref="12">To display all records again, select the "all<emph>"</emph> entry in the AutoFilter combo box. If you choose "Standard<emph>"</emph>, the <item type="menuitem">Standard Filter</item> dialog appears, allowing you to set up a standard filter. Choose "Top 10" to display the highest 10 values only. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147340" role="paragraph" l10n="CHG" oldref="19">To stop using AutoFilter, reselect all cells selected in step 1 and once again choose <emph>Data - Filter - AutoFilter</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4303415" role="tip" l10n="NEW">To assign different AutoFilters to different sheets, you must first define a database range on each sheet.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159236" role="warning" l10n="CHG" oldref="14">The arithmetic functions also take account of the cells that are not visible due to an applied filter. For example, a sum of an entire column will also total the values in the filtered cells. Apply the <link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link> function if only the cells visible after the application of a filter are to be taken into account.</paragraph>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/filters.xhp#filters"/>
+         <embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
+         <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
+         <paragraph xml-lang="en-US" id="par_id3152985" role="paragraph" l10n="U" oldref="16"><link href="text/scalc/01/12040100.xhp" name="Data - Filter - AutoFilter">Data - Filter - AutoFilter</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154484" role="paragraph" l10n="U" oldref="17"><link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/autoformat.xhp b/helpcontent2/source/text/scalc/guide/autoformat.xhp
index 1a0ff937f2..098de25ffa 100755
--- a/helpcontent2/source/text/scalc/guide/autoformat.xhp
+++ b/helpcontent2/source/text/scalc/guide/autoformat.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.
  * 
@@ -11,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autoformat.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,71 +32,68 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideautoformatxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Using AutoFormat for Tables</title>
-<filename>/text/scalc/guide/autoformat.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textscalcguideautoformatxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using AutoFormat for Tables</title>
+         <filename>/text/scalc/guide/autoformat.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>tables; AutoFormat function</bookmark_value>
-<bookmark_value>defining;AutoFormat function for tables</bookmark_value>
-<bookmark_value>AutoFormat function;defining and applying formats</bookmark_value>
-<bookmark_value>formats; automatically formatting spreadsheets</bookmark_value>
-<bookmark_value>automatic formatting in spreadsheets</bookmark_value>
-<bookmark_value>sheets;AutoFormat function</bookmark_value>
-</bookmark>
-  <comment>MW deleted "applying;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1" l10n="U" oldref="11"><variable id="autoformat"><link href="text/scalc/guide/autoformat.xhp" name="Using AutoFormat for Tables">Applying Automatic Formatting to a Selected Cell Range</link> 
+      <bookmark_value>defining;AutoFormat function for tables</bookmark_value>
+      <bookmark_value>AutoFormat function</bookmark_value>
+      <bookmark_value>formats; automatically formatting spreadsheets</bookmark_value>
+      <bookmark_value>automatic formatting in spreadsheets</bookmark_value>
+      <bookmark_value>sheets;AutoFormat function</bookmark_value>
+</bookmark><comment>MW deleted "applying;"</comment><comment>MW made "AutoFormat function;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="autoformat"><link href="text/scalc/guide/autoformat.xhp" name="Using AutoFormat for Tables">Applying Automatic Formatting to a Selected Cell Range</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149401" xml-lang="en-US" l10n="CHG" oldref="12">You can use the AutoFormat feature to quickly apply a format to a sheet or a selected cell range.</paragraph>
-<paragraph role="heading" id="par_idN10702" xml-lang="en-US" level="2" l10n="NEW">To apply an AutoFormat to a sheet or selected cell range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Select the cells, including the column and row headers, that you want to format.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106D5" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Format - AutoFormat</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="CHG" oldref="27">To select which properties to include in an AutoFormat, click <emph>More</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10715" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN1075D" xml-lang="en-US" l10n="NEW">The format is applied to the selected range of cells.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="14">If you do not see any change in color of the cell contents, choose <item type="menuitem">View - Value Highlighting</item>.</paragraph>
-<paragraph role="heading" id="par_id3155379" xml-lang="en-US" level="2" l10n="U" oldref="22">To define an AutoFormat for spreadsheets</paragraph>
-<paragraph role="paragraph" id="par_id3148868" xml-lang="en-US" l10n="U" oldref="26">You can define a new AutoFormat that is available to all spreadsheets.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152985" xml-lang="en-US" l10n="CHG" oldref="23">Format a sheet.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145384" xml-lang="en-US" l10n="CHG" oldref="24">Choose <item type="menuitem">Edit - Select All</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="25">Choose <item type="menuitem">Format - AutoFormat</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN107A9" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Name</emph> box of the <emph>Add AutoFormat</emph> dialog, enter a name for the format.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN107C3" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3159203" xml-lang="en-US" l10n="U" oldref="28"><link href="text/scalc/01/05110000.xhp" name="Format - AutoFormat">Format - AutoFormat</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149401" role="paragraph" l10n="CHG" oldref="12">You can use the AutoFormat feature to quickly apply a format to a sheet or a selected cell range.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10702" role="heading" level="2" l10n="NEW">To Apply an AutoFormat to a Sheet or Selected Cell Range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106CE" role="listitem" l10n="NEW">Select the cells, including the column and row headers, that you want to format.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D5" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - AutoFormat</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151242" role="listitem" l10n="CHG" oldref="27">To select which properties to include in an AutoFormat, click <emph>More</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10715" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1075D" role="listitem" l10n="NEW">The format is applied to the selected range of cells.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149210" role="note" l10n="U" oldref="14">If you do not see any change in color of the cell contents, choose <item type="menuitem">View - Value Highlighting</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155379" role="heading" level="2" l10n="U"
+                 oldref="22">To Define an AutoFormat for Spreadsheets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148868" role="paragraph" l10n="U" oldref="26">You can define a new AutoFormat that is available to all spreadsheets.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152985" role="listitem" l10n="CHG" oldref="23">Format a sheet.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145384" role="listitem" l10n="CHG" oldref="24">Choose <item type="menuitem">Edit - Select All</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153815" role="listitem" l10n="U" oldref="25">Choose <item type="menuitem">Format - AutoFormat</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107A9" role="listitem" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10760" role="listitem" l10n="NEW">In the <emph>Name</emph> box of the <emph>Add AutoFormat</emph> dialog, enter a name for the format.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107C3" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3159203" role="paragraph" l10n="U" oldref="28"><link href="text/scalc/01/05110000.xhp" name="Format - AutoFormat">Format - AutoFormat</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/background.xhp b/helpcontent2/source/text/scalc/guide/background.xhp
index 502569fc6e..e4b68358f3 100644
--- a/helpcontent2/source/text/scalc/guide/background.xhp
+++ b/helpcontent2/source/text/scalc/guide/background.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: background.xhp,v $
- * $Revision: 1.4.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,49 +32,51 @@
  
 	
 <meta>
-<topic id="textscalcguidebackgroundxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Defining Background Colors or Background Graphics</title>
-<filename>/text/scalc/guide/background.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidebackgroundxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Defining Background Colors or Background Graphics</title>
+         <filename>/text/scalc/guide/background.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>spreadsheets; backgrounds</bookmark_value>
-<bookmark_value>backgrounds;cell ranges</bookmark_value>
-<bookmark_value>tables; backgrounds</bookmark_value>
-<bookmark_value>cells; backgrounds</bookmark_value>
-<bookmark_value>rows, see also cells</bookmark_value>
-<bookmark_value>columns, see also cells</bookmark_value>
-</bookmark><comment>** Expression is faulty **</comment>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/scalc/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
+      <bookmark_value>backgrounds;cell ranges</bookmark_value>
+      <bookmark_value>tables; backgrounds</bookmark_value>
+      <bookmark_value>cells; backgrounds</bookmark_value>
+      <bookmark_value>rows, see also cells</bookmark_value>
+      <bookmark_value>columns, see also cells</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/scalc/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
 </variable></paragraph><comment>MW created this file from splitting shared/guide/background.xhp</comment>
-<paragraph role="paragraph" id="par_id9520249" xml-lang="en-US" l10n="NEW">You can define a background color or use a graphic as a background for cell ranges in $[officename] Calc.</paragraph>
-<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="2" l10n="U" oldref="16">Applying a Background Color to a $[officename] Calc Spreadsheet</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="17">Select the cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Format - Cells</emph> (or <emph>Format Cells</emph> from the context menu).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="19">On the <emph>Background</emph> tab page, select the background color.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="2" l10n="U" oldref="20">Graphics in the Background of Cells</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155414" xml-lang="en-US" l10n="CHG" oldref="21">Choose <emph>Insert - Picture - From File</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="22">Select the graphic and click <emph>Open</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153575" xml-lang="en-US" l10n="U" oldref="23">The graphic is inserted anchored to the current cell. You can move and scale the graphic as you want. In your context menu you can use the <emph>Arrange - To Background</emph> command to place this in the background. To select a graphic that has been placed in the background, use the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
+<paragraph xml-lang="en-US" id="par_id9520249" role="paragraph" l10n="NEW">You can define a background color or use a graphic as a background for cell ranges in $[officename] Calc.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3144760" role="heading" level="2" l10n="U"
+                 oldref="16">Applying a Background Color to a $[officename] Calc Spreadsheet</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155429" role="listitem" l10n="U" oldref="17">Select the cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="18">Choose <emph>Format - Cells</emph> (or <emph>Format Cells</emph> from the context menu).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152938" role="listitem" l10n="U" oldref="19">On the <emph>Background</emph> tab page, select the background color.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2" l10n="U"
+                 oldref="20">Graphics in the Background of Cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155414" role="listitem" l10n="CHG" oldref="21">Choose <emph>Insert - Picture - From File</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="22">Select the graphic and click <emph>Open</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153575" role="listitem" l10n="U" oldref="23">The graphic is inserted anchored to the current cell. You can move and scale the graphic as you want. In your context menu you can use the <emph>Arrange - To Background</emph> command to place this in the background. To select a graphic that has been placed in the background, use the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
 </caseinline><defaultinline>Navigator</defaultinline></switchinline>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id51576" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
-<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
-<paragraph role="paragraph" id="par_id7601245" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/format_table.xhp">Formatting Spreadsheets</link></paragraph>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id51576" role="paragraph" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id7601245" role="paragraph" l10n="NEW"><link href="text/scalc/guide/format_table.xhp">Formatting Spreadsheets</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/borders.xhp b/helpcontent2/source/text/scalc/guide/borders.xhp
index 43cb208a0c..f1b32ec60c 100755
--- a/helpcontent2/source/text/scalc/guide/borders.xhp
+++ b/helpcontent2/source/text/scalc/guide/borders.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: borders.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,209 +29,200 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidebordersxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">User Defined Borders in Cells </title>
-<filename>text/scalc/guide/borders.xhp</filename>
-</topic>
-<history>
-<created date="2005-11-01T15:03:17">Cell Borders</created>
-<lastedited date="2006-06-13T14:09:32"/>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidebordersxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">User Defined Borders in Cells </title>
+         <filename>text/scalc/guide/borders.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3457441"><bookmark_value>cells;borders</bookmark_value>
-<bookmark_value>line arrangement;cells</bookmark_value>
-<bookmark_value>borders;cells</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id4544816" xml-lang="en-US" level="1" l10n="NEW"><variable id="borders"><link href="text/scalc/guide/borders.xhp">User Defined Borders in Cells</link>
+      <bookmark_value>line arrangements with cells</bookmark_value>
+      <bookmark_value>borders;cells</bookmark_value>
+</bookmark><comment>MW made "line arrangement;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id4544816" role="heading" level="1" l10n="NEW"><variable id="borders"><link href="text/scalc/guide/borders.xhp">User Defined Borders in Cells</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id2320017" xml-lang="en-US" l10n="NEW">You can apply a variety of different lines to selected cells.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8055665" xml-lang="en-US" l10n="NEW">Select the cell or a block of cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9181188" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Format - Cells</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9947508" xml-lang="en-US" l10n="NEW">In the dialog, click the <emph>Borders</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7907956" xml-lang="en-US" l10n="NEW">Choose the border options you want to apply and click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id1342204" xml-lang="en-US" l10n="NEW">The options in the <emph>Line arrangement</emph> area can be used to apply multiple border styles.</paragraph>
-<paragraph role="heading" id="hd_id4454481" xml-lang="en-US" level="2" l10n="NEW">Selection of cells</paragraph>
-<paragraph role="paragraph" id="par_id7251503" xml-lang="en-US" l10n="NEW">Depending on the selection of cells, the area looks different.</paragraph>
-<table id="tbl_id4423352">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id8716696" xml-lang="en-US" l10n="NEW">Selection</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id4677877" xml-lang="en-US" l10n="NEW">Line arrangement area</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id807824" xml-lang="en-US" l10n="NEW">One cell</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8473464" xml-lang="en-US" l10n="NEW">
-<image id="img_id1737113" src="res/helpimg/border_ca_1.png" width="1.2709inch" height="1.6146inch"><alt id="alt_id1737113" xml-lang="en-US">borders with one cell selected</alt>
+      <paragraph xml-lang="en-US" id="par_id2320017" role="paragraph" l10n="NEW">You can apply a variety of different lines to selected cells.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8055665" role="paragraph" l10n="NEW">Select the cell or a block of cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9181188" role="paragraph" l10n="NEW">Choose <item type="menuitem">Format - Cells</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9947508" role="paragraph" l10n="NEW">In the dialog, click the <emph>Borders</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7907956" role="paragraph" l10n="NEW">Choose the border options you want to apply and click OK.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id1342204" role="paragraph" l10n="NEW">The options in the <emph>Line arrangement</emph> area can be used to apply multiple border styles.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4454481" role="heading" level="2" l10n="NEW">Selection of cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7251503" role="paragraph" l10n="NEW">Depending on the selection of cells, the area looks different.</paragraph>
+      <table id="tbl_id4423352">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8716696" role="tablehead" l10n="NEW">Selection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4677877" role="tablehead" l10n="NEW">Line arrangement area</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id807824" role="tablecontent" l10n="NEW">One cell</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8473464" role="tablecontent" l10n="NEW">
+<image id="img_id1737113" src="res/helpimg/border_ca_1.png" width="1.2602in" height="1.5937in"><alt xml-lang="en-US" id="alt_id1737113">borders with one cell selected</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3509933" xml-lang="en-US" l10n="NEW">Cells in a column</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6635639" xml-lang="en-US" l10n="NEW">
-<image id="img_id1680959" src="res/helpimg/border_ca_2.png" width="1.2917inch" height="1.6146inch"><alt id="alt_id1680959" xml-lang="en-US">borders with a column selected</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3509933" role="tablecontent" l10n="NEW">Cells in a column</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6635639" role="tablecontent" l10n="NEW">
+<image id="img_id1680959" src="res/helpimg/border_ca_2.png" width="1.2602in" height="1.5937in"><alt xml-lang="en-US" id="alt_id1680959">borders with a column selected</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8073366" xml-lang="en-US" l10n="NEW">Cells in a row</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6054567" xml-lang="en-US" l10n="NEW">
-<image id="img_id9623096" src="res/helpimg/border_ca_3.png" width="1.2811inch" height="1.6146inch"><alt id="alt_id9623096" xml-lang="en-US">borders with a row selected</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8073366" role="tablecontent" l10n="NEW">Cells in a row</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6054567" role="tablecontent" l10n="NEW">
+<image id="img_id9623096" src="res/helpimg/border_ca_3.png" width="1.2602in" height="1.5937in"><alt xml-lang="en-US" id="alt_id9623096">borders with a row selected</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id466322" xml-lang="en-US" l10n="NEW">Cells in a block of 2x2 or more</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4511551" xml-lang="en-US" l10n="NEW">
-<image id="img_id8139591" src="res/helpimg/border_ca_4.png" width="1.2917inch" height="1.6252inch"><alt id="alt_id8139591" xml-lang="en-US">borders with a block selected</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id466322" role="tablecontent" l10n="NEW">Cells in a block of 2x2 or more</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4511551" role="tablecontent" l10n="NEW">
+<image id="img_id8139591" src="res/helpimg/border_ca_4.png" width="1.2602in" height="1.5937in"><alt xml-lang="en-US" id="alt_id8139591">borders with a block selected</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id5383465" xml-lang="en-US" l10n="NEW">You cannot apply borders to multiple selections.</paragraph>
-<paragraph role="heading" id="hd_id7790154" xml-lang="en-US" level="2" l10n="NEW">Default settings</paragraph>
-<paragraph role="paragraph" id="par_id2918485" xml-lang="en-US" l10n="NEW">Click one of the <emph>Default</emph> icons to set or reset multiple borders.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1836909" xml-lang="en-US" l10n="NEW">The thin gray lines inside an icon show the borders that will be reset or cleared.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5212561" xml-lang="en-US" l10n="NEW">The dark lines inside an icon show the lines that will be set using the selected line style and color.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4818872" xml-lang="en-US" l10n="NEW">The thick gray lines inside an icon show the lines that will not be changed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id8989226" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
-<paragraph role="paragraph" id="par_id622577" xml-lang="en-US" l10n="NEW">Select a block of about 8x8 cells, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id8119754" xml-lang="en-US" l10n="NEW">
-<image id="img_id7261268" src="res/helpimg/border_ca_5.png" width="1.1354inch" height="0.25inch"><alt id="alt_id7261268" xml-lang="en-US">default icon row of Borders tab page</alt>
+      <paragraph xml-lang="en-US" id="par_id5383465" role="note" l10n="NEW">You cannot apply borders to multiple selections.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7790154" role="heading" level="2" l10n="NEW">Default Settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2918485" role="paragraph" l10n="NEW">Click one of the <emph>Default</emph> icons to set or reset multiple borders.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1836909" role="listitem" l10n="NEW">The thin gray lines inside an icon show the borders that will be reset or cleared.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5212561" role="listitem" l10n="NEW">The dark lines inside an icon show the lines that will be set using the selected line style and color.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4818872" role="listitem" l10n="NEW">The thick gray lines inside an icon show the lines that will not be changed.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id8989226" role="heading" level="3" l10n="NEW">Examples</paragraph>
+      <paragraph xml-lang="en-US" id="par_id622577" role="paragraph" l10n="NEW">Select a block of about 8x8 cells, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8119754" role="paragraph" l10n="NEW">
+<image id="img_id7261268" src="res/helpimg/border_ca_5.png" width="1.0937in" height="0.2189in"><alt xml-lang="en-US" id="alt_id7261268">default icon row of Borders tab page</alt>
 	</image></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8964201" xml-lang="en-US" l10n="NEW">Click the left icon to clear all lines. This removes all outer borders, all inner lines, and all diagonal lines.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6048463" xml-lang="en-US" l10n="NEW">Click the second icon from the left to set an outer border and to remove all other lines.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1495406" xml-lang="en-US" l10n="NEW">Click the rightmost icon to set an outer border. The inner lines are not changed, except the diagonal lines, which will be removed.<comment>is this a bug?</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9269386" xml-lang="en-US" l10n="NEW">Now you can continue to see which lines the other icons will set or remove.</paragraph>
-<paragraph role="heading" id="hd_id3593554" xml-lang="en-US" level="2" l10n="NEW">User defined settings</paragraph>
-<paragraph role="paragraph" id="par_id4018066" xml-lang="en-US" l10n="NEW">In the <emph>User defined</emph> area, you can click to set or remove individual lines. The preview shows lines in three different states. </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8004699" xml-lang="en-US" l10n="NEW">Repeatedly click an edge or a corner to switch through the three different states.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id5196996">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id8037659" xml-lang="en-US" l10n="NEW">Line types</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id2305978" xml-lang="en-US" l10n="NEW">Image</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id8716086" xml-lang="en-US" l10n="NEW">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3978087" xml-lang="en-US" l10n="NEW">A black line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4065065" xml-lang="en-US" l10n="NEW">
-<image id="img_id9379863" src="res/helpimg/border_ca_7.png" width="1.2811inch" height="1.1354inch"><alt id="alt_id9379863" xml-lang="en-US">solid line for user defined border</alt>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8964201" role="listitem" l10n="NEW">Click the left icon to clear all lines. This removes all outer borders, all inner lines, and all diagonal lines.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6048463" role="listitem" l10n="NEW">Click the second icon from the left to set an outer border and to remove all other lines.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1495406" role="listitem" l10n="NEW">Click the rightmost icon to set an outer border. The inner lines are not changed, except the diagonal lines, which will be removed.<comment>is this a bug?</comment></paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9269386" role="paragraph" l10n="NEW">Now you can continue to see which lines the other icons will set or remove.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3593554" role="heading" level="2" l10n="NEW">User Defined Settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4018066" role="paragraph" l10n="NEW">In the <emph>User defined</emph> area, you can click to set or remove individual lines. The preview shows lines in three different states. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id8004699" role="paragraph" l10n="NEW">Repeatedly click an edge or a corner to switch through the three different states.</paragraph>
+      <table id="tbl_id5196996">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8037659" role="tablehead" l10n="NEW">Line types</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2305978" role="tablehead" l10n="NEW">Image</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8716086" role="tablehead" l10n="NEW">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3978087" role="tablecontent" l10n="NEW">A black line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4065065" role="tablecontent" l10n="NEW">
+<image id="img_id9379863" src="res/helpimg/border_ca_7.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id9379863">solid line for user defined border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6987823" xml-lang="en-US" l10n="NEW">A black line sets the corresponding line of the selected cells. The line is shown as a dotted line when you choose the 0.05 pt line style. Double lines are shown when you select a double line style.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1209143" xml-lang="en-US" l10n="NEW">A gray line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6653340" xml-lang="en-US" l10n="NEW">
-<image id="img_id6972563" src="res/helpimg/border_ca_gray.png" width="1.2709inch" height="1.1563inch"><alt id="alt_id6972563" xml-lang="en-US">gray line for user defined border</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6987823" role="tablecontent" l10n="NEW">A black line sets the corresponding line of the selected cells. The line is shown as a dotted line when you choose the 0.05 pt line style. Double lines are shown when you select a double line style.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1209143" role="tablecontent" l10n="NEW">A gray line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6653340" role="tablecontent" l10n="NEW">
+<image id="img_id6972563" src="res/helpimg/border_ca_gray.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id6972563">gray line for user defined border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2278817" xml-lang="en-US" l10n="NEW">A gray line is shown when the corresponding line of the selected cells will not be changed. No line will be set or removed at this position.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5374919" xml-lang="en-US" l10n="NEW">A white line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id52491" xml-lang="en-US" l10n="NEW">
-<image id="img_id3801080" src="res/helpimg/border_ca_white.png" width="1.2811inch" height="1.1354inch"><alt id="alt_id3801080" xml-lang="en-US">white line for user defined border</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2278817" role="tablecontent" l10n="NEW">A gray line is shown when the corresponding line of the selected cells will not be changed. No line will be set or removed at this position.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5374919" role="tablecontent" l10n="NEW">A white line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id52491" role="tablecontent" l10n="NEW">
+<image id="img_id3801080" src="res/helpimg/border_ca_white.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id3801080">white line for user defined border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id372325" xml-lang="en-US" l10n="NEW">A white line is shown when the corresponding line of the selected cells will be removed.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id372325" role="tablecontent" l10n="NEW">A white line is shown when the corresponding line of the selected cells will be removed.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id7282937" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
-<paragraph role="paragraph" id="par_id4230780" xml-lang="en-US" l10n="NEW">Select a single cell, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id1712393" xml-lang="en-US" l10n="NEW">Click the lower edge to set a very thin line as a lower border. All other lines will be removed from the cell.</paragraph>
-<paragraph role="paragraph" id="par_id5149693" xml-lang="en-US" l10n="NEW">
-<image id="img_id9467452" src="res/helpimg/border_ca_6.png" width="1.2709inch" height="1.1563inch"><alt id="alt_id9467452" xml-lang="en-US">setting a thin lower border</alt>
+      <paragraph xml-lang="en-US" id="hd_id7282937" role="heading" level="3" l10n="NEW">Examples</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4230780" role="paragraph" l10n="NEW">Select a single cell, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1712393" role="paragraph" l10n="NEW">Click the lower edge to set a very thin line as a lower border. All other lines will be removed from the cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5149693" role="paragraph" l10n="NEW">
+<image id="img_id9467452" src="res/helpimg/border_ca_6.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id9467452">setting a thin lower border</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id5759453" xml-lang="en-US" l10n="NEW">Choose a thicker line style and click the lower edge. This sets a thicker line as a lower border.</paragraph>
-<paragraph role="paragraph" id="par_id6342051" xml-lang="en-US" l10n="NEW">
-<image id="img_id7431562" src="res/helpimg/border_ca_7.png" width="1.2811inch" height="1.1354inch"><alt id="alt_id7431562" xml-lang="en-US">setting a thick line as a border</alt>
+      <paragraph xml-lang="en-US" id="par_id5759453" role="paragraph" l10n="NEW">Choose a thicker line style and click the lower edge. This sets a thicker line as a lower border.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6342051" role="paragraph" l10n="NEW">
+<image id="img_id7431562" src="res/helpimg/border_ca_7.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id7431562">setting a thick line as a border</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id5775322" xml-lang="en-US" l10n="NEW">Click the second <emph>Default</emph> icon from the left to set all four borders. Then repeatedly click the lower edge until a white line is shown. This removes the lower border.</paragraph>
-<paragraph role="paragraph" id="par_id2882778" xml-lang="en-US" l10n="NEW">
-<image id="img_id8155766.00000001" src="res/helpimg/border_ca_8.png" width="1.2709inch" height="1.1354inch"><alt id="alt_id8155766.00000001" xml-lang="en-US">removing lower border</alt>
+      <paragraph xml-lang="en-US" id="par_id5775322" role="paragraph" l10n="NEW">Click the second <emph>Default</emph> icon from the left to set all four borders. Then repeatedly click the lower edge until a white line is shown. This removes the lower border.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2882778" role="paragraph" l10n="NEW">
+<image id="img_id8155766.00000001" src="res/helpimg/border_ca_8.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id8155766.00000001">removing lower border</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id8102053" xml-lang="en-US" l10n="NEW">You can combine several line types and styles. The last image shows how to set thick outer borders (the thick black lines), while any diagonal lines inside the cell will not be touched (gray lines).</paragraph>
-<paragraph role="paragraph" id="par_id2102420" xml-lang="en-US" l10n="NEW">
-<image id="img_id5380718" src="res/helpimg/border_ca_9.png" width="1.2709inch" height="1.1563inch"><alt id="alt_id5380718" xml-lang="en-US">advanced example for cell borders</alt>
+      <paragraph xml-lang="en-US" id="par_id8102053" role="paragraph" l10n="NEW">You can combine several line types and styles. The last image shows how to set thick outer borders (the thick black lines), while any diagonal lines inside the cell will not be touched (gray lines).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2102420" role="paragraph" l10n="NEW">
+<image id="img_id5380718" src="res/helpimg/border_ca_9.png" width="1.2602in" height="1.1252in"><alt xml-lang="en-US" id="alt_id5380718">advanced example for cell borders</alt>
 	</image></paragraph>
-<section id="relatedtopics">
+      <section id="relatedtopics">
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/border_page.xhp#border_page"/>
 </case>
-</switch>
-<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-</section>
-</body>
-</helpdocument>
+</switch><embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/calc_date.xhp b/helpcontent2/source/text/scalc/guide/calc_date.xhp
index 7eeda013d9..9830134a81 100755
--- a/helpcontent2/source/text/scalc/guide/calc_date.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_date.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calc_date.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,55 +27,53 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidecalc_datexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating With Dates and Times</title>
-<filename>/text/scalc/guide/calc_date.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-26T14:55:52">FPE: Screenshot deleted
-YJ: checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidecalc_datexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating With Dates and Times</title>
+         <filename>/text/scalc/guide/calc_date.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146120"><bookmark_value>dates; in cells</bookmark_value>
-<bookmark_value>times; in cells</bookmark_value>
-<bookmark_value>cells;date and time formats</bookmark_value>
-<bookmark_value>current date and time values</bookmark_value>
+      <bookmark_value>times; in cells</bookmark_value>
+      <bookmark_value>cells;date and time formats</bookmark_value>
+      <bookmark_value>current date and time values</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="calc_date"><link href="text/scalc/guide/calc_date.xhp" name="Calculating With Dates and Times">Calculating With Dates and Times</link>
+<paragraph xml-lang="en-US" id="hd_id3146120" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="calc_date"><link href="text/scalc/guide/calc_date.xhp" name="Calculating With Dates and Times">Calculating With Dates and Times</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="CHG" oldref="12">In $[officename] Calc, you can perform calculations with current date and time values. As an example, to find out exactly how old you are in seconds or hours, follow the following steps:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150750" xml-lang="en-US" l10n="U" oldref="13">In a spreadsheet, enter your birthday in cell A1.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145642" xml-lang="en-US" l10n="U" oldref="14">Enter the following formula in cell A3: =NOW()-A1</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149020" xml-lang="en-US" l10n="U" oldref="52">After pressing the <item type="keycode">Enter</item> key you will see the result in date format. Since the result should show the difference between two dates as a number of days, you must format cell A3 as a number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="53">Place the cursor in cell A3, right-click to open a context menu and choose <emph>Format Cells</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="54">The <emph>Format Cells</emph> dialog appears. On the <emph>Numbers</emph> tab, the <emph>Number</emph> category will appear already highlighted. The format is set to "General", which causes the result of a calculation containing date entries to be displayed as a date. To display the result as a number, set the number format to "-1,234" and close the dialog with the OK button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="15">The number of days between today's date and the specified date is displayed in cell A3.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="16">Experiment with some additional formulas: in A4 enter =A3*24 to calculate the hours, in A5 enter =A4*60 for the minutes, and in A6 enter =A5*60 for seconds. Press the <item type="keycode">Enter</item> key after each formula.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="17">The time since your date of birth will be calculated and displayed in the various units. The values are calculated as of the exact moment when you entered the last formula and pressed the <item type="keycode">Enter</item> key. This value is not automatically updated, although "Now" continuously changes. In the <emph>Tools</emph> menu, the menu item <emph>Cell Contents - AutoCalculate</emph> is normally active; however, automatic calculation does not apply to the function NOW. This ensures that your computer is not solely occupied with updating the sheet.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="CHG" oldref="12">In $[officename] Calc, you can perform calculations with current date and time values. As an example, to find out exactly how old you are in seconds or hours, follow the following steps:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150750" role="listitem" l10n="U" oldref="13">In a spreadsheet, enter your birthday in cell A1.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145642" role="listitem" l10n="U" oldref="14">Enter the following formula in cell A3: <item type="literal">=NOW()-A1</item>
+            </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149020" role="listitem" l10n="U" oldref="52">After pressing the <item type="keycode">Enter</item> key you will see the result in date format. Since the result should show the difference between two dates as a number of days, you must format cell A3 as a number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155335" role="listitem" l10n="U" oldref="53">Place the cursor in cell A3, right-click to open a context menu and choose <emph>Format Cells</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147343" role="listitem" l10n="U" oldref="54">The <item type="menuitem">Format Cells</item> dialog appears. On the <item type="menuitem">Numbers</item> tab, the "Number" category will appear already highlighted. The format is set to "General", which causes the result of a calculation containing date entries to be displayed as a date. To display the result as a number, set the number format to "-1,234" and close the dialog with the <item type="menuitem">OK</item> button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147001" role="listitem" l10n="U" oldref="15">The number of days between today's date and the specified date is displayed in cell A3.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150304" role="listitem" l10n="U" oldref="16">Experiment with some additional formulas: in A4 enter =A3*24 to calculate the hours, in A5 enter =A4*60 for the minutes, and in A6 enter =A5*60 for seconds. Press the <item type="keycode">Enter</item> key after each formula.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149207" role="paragraph" l10n="U" oldref="17">The time since your date of birth will be calculated and displayed in the various units. The values are calculated as of the exact moment when you entered the last formula and pressed the <item type="keycode">Enter</item> key. This value is not automatically updated, although "Now" continuously changes. In the <emph>Tools</emph> menu, the menu item <emph>Cell Contents - AutoCalculate</emph> is normally active; however, automatic calculation does not apply to the function NOW. This ensures that your computer is not solely occupied with updating the sheet.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/calc_series.xhp b/helpcontent2/source/text/scalc/guide/calc_series.xhp
index 2cdce15710..b3642f22d4 100755
--- a/helpcontent2/source/text/scalc/guide/calc_series.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_series.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calc_series.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,69 +29,66 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidecalc_seriesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Automatically Calculating Series</title>
-<filename>/text/scalc/guide/calc_series.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T12:04:13">FPE: Deleted screen shot, heavily reedited; dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidecalc_seriesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Automatically Calculating Series</title>
+         <filename>/text/scalc/guide/calc_series.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150769"><bookmark_value>series; calculating</bookmark_value>
-<bookmark_value>calculating; series</bookmark_value>
-<bookmark_value>linear series</bookmark_value>
-<bookmark_value>growth series</bookmark_value>
-<bookmark_value>date series</bookmark_value>
-<bookmark_value>powers of 2 calculations</bookmark_value>
-<bookmark_value>cells; filling automatically</bookmark_value>
-<bookmark_value>auto filling cells</bookmark_value>
-<bookmark_value>AutoFill function</bookmark_value>
-<bookmark_value>filling;cells, automatically</bookmark_value>
-</bookmark><comment>mw made "powers of 2;..." a one level entry and changed "AutoFill" entry</comment>
-<paragraph role="heading" id="hd_id3150769" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="calc_series"><link href="text/scalc/guide/calc_series.xhp" name="Automatically Calculating Series">Automatically Filling in Data Based on Adjacent Cells</link>
+      <bookmark_value>calculating; series</bookmark_value>
+      <bookmark_value>linear series</bookmark_value>
+      <bookmark_value>growth series</bookmark_value>
+      <bookmark_value>date series</bookmark_value>
+      <bookmark_value>powers of 2 calculations</bookmark_value>
+      <bookmark_value>cells; filling automatically</bookmark_value>
+      <bookmark_value>automatic cell filling</bookmark_value>
+      <bookmark_value>AutoFill function</bookmark_value>
+      <bookmark_value>filling;cells, automatically</bookmark_value>
+</bookmark><comment>mw made "powers of 2;..." a one level entry and changed "AutoFill" entry</comment><comment>MW changed "auto filling cells"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150769" role="heading" level="1" l10n="U" oldref="6"><variable id="calc_series"><link href="text/scalc/guide/calc_series.xhp" name="Automatically Calculating Series">Automatically Filling in Data Based on Adjacent Cells</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN106A8" xml-lang="en-US" l10n="NEW">You can automatically fill cells with data with the AutoFill command or the Series command.</paragraph>
-<paragraph role="heading" id="par_idN106D3" xml-lang="en-US" level="2" l10n="NEW">Using AutoFill</paragraph>
-<paragraph role="paragraph" id="par_idN106D7" xml-lang="en-US" l10n="NEW">AutoFill automatically generates a data series based on a defined pattern.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154319" xml-lang="en-US" l10n="CHG" oldref="7">On a sheet, click in cell, and type a number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Click in another cell and then click back in the cell where you typed the number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145272" xml-lang="en-US" l10n="CHG" oldref="16">Drag the fill handle in the bottom right corner of the cell across the cells that you want to fill, and release the mouse button.</paragraph>
-<paragraph role="listitem" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="17">The cells are filled with ascending numbers.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN106EE" xml-lang="en-US" l10n="NEW">To quickly create a list of consecutive days, enter "Monday" in a cell, and drag the fill handle.</paragraph>
-<paragraph role="paragraph" id="par_id9720145" xml-lang="en-US" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
-<paragraph role="note" id="par_id3154490" xml-lang="en-US" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem">Tools - Options - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
-<paragraph role="tip" id="par_idN10737" xml-lang="en-US" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
-<paragraph role="heading" id="par_idN10713" xml-lang="en-US" level="2" l10n="NEW">Using a Defined Series</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150749" xml-lang="en-US" l10n="CHG" oldref="9">Select the cell range in the sheet that you want to fill.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154754" xml-lang="en-US" l10n="CHG" oldref="19">Choose <item type="menuitem">Edit - Fill - Series</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10716" xml-lang="en-US" l10n="NEW">Select the parameters for the series. </paragraph>
-<paragraph role="listitem" id="par_idN10731" xml-lang="en-US" l10n="NEW">If you select a <emph>linear</emph> series, the increment that you enter is <emph>added</emph> to each consecutive number in the series to create the next value.</paragraph>
-<paragraph role="listitem" id="par_idN1073C" xml-lang="en-US" l10n="NEW">If you select a <emph>growth</emph> series, the increment that you enter is <emph>multiplied</emph> by each consecutive number to create the next value.</paragraph>
-<paragraph role="listitem" id="par_idN10747" xml-lang="en-US" l10n="NEW">If you select a <emph>date</emph> series, the increment that you enter is added to the time unit that you specify.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/sorted_list.xhp#sorted_list"/>
-<paragraph role="paragraph" id="par_id3159173" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01060400.xhp" name="Sort lists">Sort lists</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">You can automatically fill cells with data with the AutoFill command or the Series command.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106D3" role="heading" level="2" l10n="NEW">Using AutoFill</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106D7" role="paragraph" l10n="NEW">AutoFill automatically generates a data series based on a defined pattern.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154319" role="listitem" l10n="CHG" oldref="7">On a sheet, click in a cell, and type a number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106CB" role="listitem" l10n="NEW">Click in another cell and then click back in the cell where you typed the number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145272" role="listitem" l10n="CHG" oldref="16">Drag the fill handle in the bottom right corner of the cell across the cells that you want to fill, and release the mouse button.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3145801" role="listitem" l10n="CHG" oldref="17">The cells are filled with ascending numbers.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN106EE" role="tip" l10n="NEW">To quickly create a list of consecutive days, enter <item type="literal">Monday</item> in a cell, and drag the fill handle.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9720145" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10737" role="tip" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10713" role="heading" level="2" l10n="NEW">Using a Defined Series</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150749" role="listitem" l10n="CHG" oldref="9">Select the cell range in the sheet that you want to fill.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154754" role="listitem" l10n="CHG" oldref="19">Choose <item type="menuitem">Edit - Fill - Series</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10716" role="listitem" l10n="NEW">Select the parameters for the series. </paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10731" role="listitem" l10n="NEW">If you select a <emph>linear</emph> series, the increment that you enter is <emph>added</emph> to each consecutive number in the series to create the next value.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1073C" role="listitem" l10n="NEW">If you select a <emph>growth</emph> series, the increment that you enter is <emph>multiplied</emph> by each consecutive number to create the next value.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10747" role="listitem" l10n="NEW">If you select a <emph>date</emph> series, the increment that you enter is added to the time unit that you specify.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/sorted_list.xhp#sorted_list"/>
+         <paragraph xml-lang="en-US" id="par_id3159173" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060400.xhp" name="Sort lists">Sort lists</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp b/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
index 5e11e1c59c..c799c3504f 100755
--- a/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calc_timevalues.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/calculate.xhp b/helpcontent2/source/text/scalc/guide/calculate.xhp
index 950f917dc0..c764a0b755 100644
--- a/helpcontent2/source/text/scalc/guide/calculate.xhp
+++ b/helpcontent2/source/text/scalc/guide/calculate.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,56 +29,53 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidecalculatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating in Spreadsheets</title>
-<filename>/text/scalc/guide/calculate.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-21T13:06:54">FPE: Changed screenshots, cleaned up text; dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidecalculatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating in Spreadsheets</title>
+         <filename>/text/scalc/guide/calculate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150791"><bookmark_value>spreadsheets; calculating</bookmark_value>
-<bookmark_value>calculating; spreadsheets</bookmark_value>
-<bookmark_value>formulas; calculating</bookmark_value>
+      <bookmark_value>calculating; spreadsheets</bookmark_value>
+      <bookmark_value>formulas; calculating</bookmark_value>
 </bookmark><comment>mw changed "formulas;..." entry</comment>
-<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1" l10n="U" oldref="25"><variable id="calculate"><link href="text/scalc/guide/calculate.xhp" name="Calculating in Spreadsheets">Calculating in Spreadsheets</link>
+<paragraph xml-lang="en-US" id="hd_id3150791" role="heading" level="1" l10n="U"
+                 oldref="25"><variable id="calculate"><link href="text/scalc/guide/calculate.xhp" name="Calculating in Spreadsheets">Calculating in Spreadsheets</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="CHG" oldref="6">The following is an example of a calculation in $[officename] Calc.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153951" xml-lang="en-US" l10n="CHG" oldref="7">Click in a cell, and type a number</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10656" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Enter</item>.</paragraph>
-<paragraph role="paragraph" id="par_idN1065D" xml-lang="en-US" l10n="NEW">The cursor moves down to the next cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="CHG" oldref="9">Enter another number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1066F" xml-lang="en-US" l10n="NEW">Press the <item type="keycode">Tab</item> key.</paragraph>
-<paragraph role="paragraph" id="par_idN10676" xml-lang="en-US" l10n="NEW">The cursor moves to the right into the next cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="CHG" oldref="10">Type in a formula, for example, <item type="literal">=A3 * A4 / 100.</item>
+      <paragraph xml-lang="en-US" id="par_id3146120" role="paragraph" l10n="CHG" oldref="6">The following is an example of a calculation in $[officename] Calc.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153951" role="listitem" l10n="CHG" oldref="7">Click in a cell, and type a number</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10656" role="listitem" l10n="NEW">Press <item type="keycode">Enter</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1065D" role="listitem" l10n="NEW">The cursor moves down to the next cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155064" role="listitem" l10n="CHG" oldref="9">Enter another number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1066F" role="listitem" l10n="NEW">Press the <item type="keycode">Tab</item> key.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10676" role="listitem" l10n="NEW">The cursor moves to the right into the next cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154253" role="listitem" l10n="CHG" oldref="10">Type in a formula, for example, <item type="literal">=A3 * A4 / 100.</item>
 </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1068B" xml-lang="en-US" l10n="NEW"> Press <item type="keycode">Enter</item>.</paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="20">The result of the formula appears in the cell. If you want, you can edit the formula in the input line of the Formula bar.</paragraph>
-<paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="U" oldref="12">When you edit a formula, the new result is calculated automatically.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/calc_date.xhp#calc_date"/>
-<embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
-<embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/>
-<embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1068B" role="listitem" l10n="NEW"> Press <item type="keycode">Enter</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147343" role="listitem" l10n="U" oldref="20">The result of the formula appears in the cell. If you want, you can edit the formula in the input line of the Formula bar.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155378" role="listitem" l10n="U" oldref="12">When you edit a formula, the new result is calculated automatically.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/calc_date.xhp#calc_date"/>
+         <embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
+         <embed href="text/scalc/guide/calc_timevalues.xhp#calc_timevalues"/>
+         <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cell_enter.xhp b/helpcontent2/source/text/scalc/guide/cell_enter.xhp
index eb7e171b79..3f1d019d72 100644
--- a/helpcontent2/source/text/scalc/guide/cell_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_enter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell_enter.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,44 +29,43 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecell_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Entering Values</title>
-<filename>/text/scalc/guide/cell_enter.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidecell_enterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Entering Values</title>
+         <filename>/text/scalc/guide/cell_enter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150868"><bookmark_value>values; inserting in multiple cells</bookmark_value>
-<bookmark_value>inserting;values</bookmark_value>
-<bookmark_value>cell ranges;selecting for data entries</bookmark_value>
-<bookmark_value>areas, see also cell ranges</bookmark_value>
+      <bookmark_value>inserting;values</bookmark_value>
+      <bookmark_value>cell ranges;selecting for data entries</bookmark_value>
+      <bookmark_value>areas, see also cell ranges</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3405255" xml-lang="en-US" level="1" l10n="NEW"><variable id="cell_enter"><link href="text/scalc/guide/cell_enter.xhp">Entering Values</link>
+<paragraph xml-lang="en-US" id="hd_id3405255" role="heading" level="1" l10n="NEW"><variable id="cell_enter"><link href="text/scalc/guide/cell_enter.xhp">Entering Values</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id7147129" xml-lang="en-US" l10n="NEW">Calc can simplify entering data and values into multiple cells. You can change some settings to conform to your preferences.</paragraph>
-<paragraph role="heading" id="hd_id5621509" xml-lang="en-US" level="2" l10n="NEW">To enter values into a range of cells manually</paragraph>
-<paragraph role="paragraph" id="par_id8200018" xml-lang="en-US" l10n="NEW">There are two features that assist you when you enter a block of data manually.</paragraph>
-<paragraph role="heading" id="hd_id1867427" xml-lang="en-US" level="3" l10n="NEW">Area detection for new rows</paragraph>
-<paragraph role="paragraph" id="par_id7908871" xml-lang="en-US" l10n="NEW">In the row below a heading row, you can advance from one cell to the next with the <item type="keycode">Tab</item> key. After you enter the value into the last cell in the current row, press <item type="keycode">Enter</item>. Calc positions the cursor below the first cell of the current block.</paragraph>
-<paragraph role="paragraph" id="par_id6196783" xml-lang="en-US" l10n="NEW">
-<image id="img_id6473586" src="res/helpimg/area1.png" width="6.4437inch" height="2.1252inch"><alt id="alt_id6473586" xml-lang="en-US">area detection</alt>
+      <paragraph xml-lang="en-US" id="par_id7147129" role="paragraph" l10n="NEW">Calc can simplify entering data and values into multiple cells. You can change some settings to conform to your preferences.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5621509" role="heading" level="2" l10n="NEW">To Enter Values Into a Range of Cells Manually</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8200018" role="paragraph" l10n="NEW">There are two features that assist you when you enter a block of data manually.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id1867427" role="heading" level="3" l10n="NEW">Area Detection for New Rows</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7908871" role="paragraph" l10n="NEW">In the row below a heading row, you can advance from one cell to the next with the Tab key. After you enter the value into the last cell in the current row, press Enter. Calc positions the cursor below the first cell of the current block.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6196783" role="paragraph" l10n="NEW">
+<image id="img_id6473586" src="res/helpimg/area1.png" width="4.8335in" height="1.5937in"><alt xml-lang="en-US" id="alt_id6473586">area detection</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id8118839" xml-lang="en-US" l10n="NEW">In row 3, press <item type="keycode">Tab</item> to advance from cell B3 to C3, D3, and E3. Then press <item type="keycode">Enter</item> to advance to B4.</paragraph>
-<paragraph role="heading" id="hd_id3583788" xml-lang="en-US" level="3" l10n="NEW">Area selection</paragraph>
-<paragraph role="paragraph" id="par_id2011780" xml-lang="en-US" l10n="NEW">Use drag-and-drop to select the area where you want to input values. But start dragging from the last cell of the area and release the mouse button when you have selected the first cell. Now you can start to input values. Always press the <item type="keycode">Tab</item> key to advance to the next cell. You will not leave the selected area.</paragraph>
-<paragraph role="paragraph" id="par_id7044282" xml-lang="en-US" l10n="NEW">
-<image id="img_id2811365" src="res/helpimg/area2.png" width="6.4437inch" height="2.1252inch"><alt id="alt_id2811365" xml-lang="en-US">area selection</alt>
+      <paragraph xml-lang="en-US" id="par_id8118839" role="paragraph" l10n="NEW">In row 3, press Tab to advance from cell B3 to C3, D3, and E3. Then press Enter to advance to B4.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3583788" role="heading" level="3" l10n="NEW">Area Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2011780" role="paragraph" l10n="NEW">Use drag-and-drop to select the area where you want to input values. But start dragging from the last cell of the area and release the mouse button when you have selected the first cell. Now you can start to input values. Always press the Tab key to advance to the next cell. You will not leave the selected area.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7044282" role="paragraph" l10n="NEW">
+<image id="img_id2811365" src="res/helpimg/area2.png" width="4.8335in" height="1.5937in"><alt xml-lang="en-US" id="alt_id2811365">area selection</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id3232520" xml-lang="en-US" l10n="NEW">Select the area from E7 to B3. Now B3 is waiting for your input. Press <item type="keycode">Tab</item> to advance to the next cell within the selected area.</paragraph>
-<paragraph role="heading" id="hd_id8950163" xml-lang="en-US" level="2" l10n="NEW">To enter values to a range of cells automatically</paragraph>
-<paragraph role="paragraph" id="par_id633869" xml-lang="en-US" l10n="NEW">See <link href="text/scalc/guide/calc_series.xhp">Automatically Filling in Data Based on Adjacent Cells</link>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/formula_enter.xhp#formula_enter"/>
-<embed href="text/scalc/guide/multitables.xhp#multitables"/>
-<embed href="text/scalc/guide/multi_tables.xhp#multi_tables"/>
-</section>
-</body>
+      <paragraph xml-lang="en-US" id="par_id3232520" role="paragraph" l10n="NEW">Select the area from E7 to B3. Now B3 is waiting for your input. Press Tab to advance to the next cell within the selected area.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id8950163" role="heading" level="2" l10n="NEW">To Enter Values to a Range of Cells Automatically</paragraph>
+      <paragraph xml-lang="en-US" id="par_id633869" role="paragraph" l10n="NEW">See <link href="text/scalc/guide/calc_series.xhp">Automatically Filling in Data Based on Adjacent Cells</link>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/formula_enter.xhp#formula_enter"/>
+         <embed href="text/scalc/guide/multitables.xhp#multitables"/>
+         <embed href="text/scalc/guide/multi_tables.xhp#multi_tables"/>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/cell_protect.xhp b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
index c079997282..73f47392d5 100755
--- a/helpcontent2/source/text/scalc/guide/cell_protect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell_protect.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,71 +29,66 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecell_protectxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Protecting Cells from Changes</title>
-<filename>/text/scalc/guide/cell_protect.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textscalcguidecell_protectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Protecting Cells from Changes</title>
+         <filename>/text/scalc/guide/cell_protect.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146119"><bookmark_value>protecting;cells and sheets</bookmark_value>
-<bookmark_value>cells; protecting</bookmark_value>
-<bookmark_value>cell protection; enabling</bookmark_value>
-<bookmark_value>sheets; protecting</bookmark_value>
-<bookmark_value>documents; protecting</bookmark_value>
-<bookmark_value>cells; hiding for printing</bookmark_value>
-<bookmark_value>changing; sheet protection</bookmark_value>
-<bookmark_value>hiding;formulas</bookmark_value>
-<bookmark_value>formulas;hiding</bookmark_value>
-</bookmark>
-  <comment>MW transferred "modifying;..." and "changing;..." into one index entry</comment>
-  <paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link> 
+      <bookmark_value>cells; protecting</bookmark_value>
+      <bookmark_value>cell protection; enabling</bookmark_value>
+      <bookmark_value>sheets; protecting</bookmark_value>
+      <bookmark_value>documents; protecting</bookmark_value>
+      <bookmark_value>cells; hiding for printing</bookmark_value>
+      <bookmark_value>changing; sheet protection</bookmark_value>
+      <bookmark_value>hiding;formulas</bookmark_value>
+      <bookmark_value>formulas;hiding</bookmark_value>
+</bookmark><comment>MW transferred "modifying;..." and "changing;..." into one index entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="U" oldref="17">In <item type="productname">%PRODUCTNAME</item> Calc you can protect sheets and the document as a whole. You can choose whether the cells are protected against accidental changes, whether the formulas can be viewed from within Calc, whether the cells are visible or whether the cells can be printed.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145261" role="paragraph" l10n="U" oldref="18">Protection can be provided by means of a password, but it does not have to be. If you have assigned a password, protection can only be removed once the correct password has been entered.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="19">Note that the cell protection for cells with the <emph>Protected</emph> attribute is only effective when you protect the whole table. In the default condition, every cell has the <emph>Protected</emph> attribute. Therefore you must remove the attribute selectively for those cells where the user may make changes. You then protect the whole table and save the document.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id5974303" role="warning" l10n="NEW">These protection features are just switches to prevent accidental action. The features are not intended to provide any secure protection. For example, by exporting a sheet to another file format, a user may be able to surpass the protection features. There is only one secure protection: the password that you can apply when saving an OpenDocument file. A file that has been saved with a password can be opened only with the same password.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1066B" role="paragraph" l10n="NEW">Select the cells that you want to specify the cell protection options for.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149019" role="paragraph" l10n="U" oldref="7">Choose <item type="menuitem">Format - Cells</item> and click the <emph>Cell Protection</emph> tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3152985" role="paragraph" l10n="U" oldref="9">Select the protection options that you want.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3152898" role="paragraph" l10n="U" oldref="10">Select <emph>Protected</emph> to prevent changes to the contents and the format of a cell. </paragraph>
-    <paragraph xml-lang="en-US" id="par_idN1069A" role="paragraph" l10n="NEW">Select <emph>Hide formula</emph> to hide and to protect formulas from changes.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106A1" role="paragraph" l10n="NEW">Select <emph>Hide when printing</emph> to hide protected cells in the printed document. The cells are not hidden onscreen.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3152872" role="paragraph" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145362" role="paragraph" l10n="U" oldref="12">Apply the protection options.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">To protect the cells from being changed / viewed / printed according to your settings in the <emph>Format - Cells</emph> dialog, choose <item type="menuitem">Tools - Protect Document - Sheet</item>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106C7" role="paragraph" l10n="CHG">To protect the structure of the document, for example the count, <link href="text/scalc/guide/rename_table.xhp">names</link>, and order of the sheets, from being changed, choose <item type="menuitem">Tools - Protect Document - Document</item>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106CF" role="paragraph" l10n="NEW">(Optional) Enter a password of at least 5 characters.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106D2" role="warning" l10n="NEW">If you forget your password, you cannot deactivate the protection. If you only want to protect cells from accidental changes, set the sheet protection, but do not enter a password.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153810" role="paragraph" l10n="U" oldref="13">Click <emph>OK</emph>. </paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/scalc/guide/cell_unprotect.xhp#cell_unprotect"/>
-   <embed href="text/shared/guide/protection.xhp#protection"/>
-   <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW"> <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/> </paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="U" oldref="17">In <item type="productname">%PRODUCTNAME</item> Calc you can protect sheets and the document as a whole. You can choose whether the cells are protected against accidental changes, whether the formulas can be viewed from within Calc, whether the cells are visible or whether the cells can be printed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145261" role="paragraph" l10n="U" oldref="18">Protection can be provided by means of a password, but it does not have to be. If you have assigned a password, protection can only be removed once the correct password has been entered.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="19">Note that the cell protection for cells with the <emph>Protected</emph> attribute is only effective when you protect the whole table. In the default condition, every cell has the <emph>Protected</emph> attribute. Therefore you must remove the attribute selectively for those cells where the user may make changes. You then protect the whole table and save the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5974303" role="warning" l10n="NEW">These protection features are just switches to prevent accidental action. The features are not intended to provide any secure protection. For example, by exporting a sheet to another file format, a user may be able to surpass the protection features. There is only one secure protection: the password that you can apply when saving an OpenDocument file. A file that has been saved with a password can be opened only with the same password.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1066B" role="listitem" l10n="NEW">Select the cells that you want to specify the cell protection options for.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149019" role="listitem" l10n="U" oldref="7">Choose <item type="menuitem">Format - Cells</item> and click the <emph>Cell Protection</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152985" role="listitem" l10n="U" oldref="9">Select the protection options that you want.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3152898" role="listitem" l10n="U" oldref="10">Select <emph>Protected</emph> to prevent changes to the contents and the format of a cell. </paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1069A" role="listitem" l10n="NEW">Select <emph>Hide formula</emph> to hide and to protect formulas from changes.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106A1" role="listitem" l10n="NEW">Select <emph>Hide when printing</emph> to hide protected cells in the printed document. The cells are not hidden onscreen.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152872" role="listitem" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145362" role="listitem" l10n="U" oldref="12">Apply the protection options.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106C0" role="listitem" l10n="NEW">To protect the cells from being changed / viewed / printed according to your settings in the <emph>Format - Cells</emph> dialog, choose <item type="menuitem">Tools - Protect Document - Sheet</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106C7" role="listitem" l10n="CHG">To protect the structure of the document, for example the count, <link href="text/scalc/guide/rename_table.xhp">names</link>, and order of the sheets, from being changed, choose <item type="menuitem">Tools - Protect Document - Document</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106CF" role="listitem" l10n="CHG">(Optional) Enter a password.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106D2" role="warning" l10n="NEW">If you forget your password, you cannot deactivate the protection. If you only want to protect cells from accidental changes, set the sheet protection, but do not enter a password.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153810" role="listitem" l10n="U" oldref="13">Click <emph>OK</emph>. </paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cell_unprotect.xhp#cell_unprotect"/>
+         <embed href="text/shared/guide/protection.xhp#protection"/>
+         <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW">
+            <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+         </paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp b/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
index 8700d8ba41..2b72611e8c 100755
--- a/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell_unprotect.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,41 +29,36 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecell_unprotectxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Unprotecting Cells</title>
-<filename>/text/scalc/guide/cell_unprotect.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textscalcguidecell_unprotectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Unprotecting Cells</title>
+         <filename>/text/scalc/guide/cell_unprotect.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153252"><bookmark_value>cell protection; unprotecting</bookmark_value>
-<bookmark_value>protecting; unprotecting cells</bookmark_value>
-<bookmark_value>unprotecting cells</bookmark_value>
+      <bookmark_value>protecting; unprotecting cells</bookmark_value>
+      <bookmark_value>unprotecting cells</bookmark_value>
 </bookmark>
-  <paragraph xml-lang="en-US" id="hd_id3153252" role="heading" level="1" l10n="U" oldref="14"><variable id="cell_unprotect"><link href="text/scalc/guide/cell_unprotect.xhp" name="Unprotecting Cells">Unprotecting Cells</link> 
+<paragraph xml-lang="en-US" id="hd_id3153252" role="heading" level="1" l10n="U"
+                 oldref="14"><variable id="cell_unprotect"><link href="text/scalc/guide/cell_unprotect.xhp" name="Unprotecting Cells">Unprotecting Cells</link> 
 </variable></paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3151112" role="listitem" l10n="U" oldref="15">Click the sheet for which you want to cancel the protection.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149656" role="listitem" l10n="U" oldref="16">Select <emph>Tools - Protect Document</emph>, then choose <emph>Sheet</emph> or <emph>Document</emph> to remove the check mark indicating the protected status.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145171" role="listitem" l10n="U" oldref="17">If you have assigned a password, enter it in this dialog and click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3153771" role="paragraph" l10n="U" oldref="18">The cells can now be edited, the formulas can be viewed, and all cells can be printed until you reactivate the protection for the sheet or document.</paragraph>
-  <section id="relatedtopics">
-   
-   <embed href="text/scalc/guide/cell_protect.xhp#cell_protect"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151112" role="listitem" l10n="U" oldref="15">Click the sheet for which you want to cancel the protection.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149656" role="listitem" l10n="U" oldref="16">Select <emph>Tools - Protect Document</emph>, then choose <emph>Sheet</emph> or <emph>Document</emph> to remove the check mark indicating the protected status.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145171" role="listitem" l10n="U" oldref="17">If you have assigned a password, enter it in this dialog and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153771" role="paragraph" l10n="U" oldref="18">The cells can now be edited, the formulas can be viewed, and all cells can be printed until you reactivate the protection for the sheet or document.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cell_protect.xhp#cell_protect"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellcopy.xhp b/helpcontent2/source/text/scalc/guide/cellcopy.xhp
index 12d5c239ba..fff3be6b36 100755
--- a/helpcontent2/source/text/scalc/guide/cellcopy.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellcopy.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellcopy.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,61 +29,62 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecellcopyxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Only Copy Visible Cells</title>
-<filename>/text/scalc/guide/cellcopy.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidecellcopyxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Only Copy Visible Cells</title>
+         <filename>/text/scalc/guide/cellcopy.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150440"><bookmark_value>cells; copying/deleting/formatting/moving</bookmark_value>
-<bookmark_value>rows;visible and invisible</bookmark_value>
-<bookmark_value>copying; visible cells only</bookmark_value>
-<bookmark_value>formatting;visible cells only</bookmark_value>
-<bookmark_value>moving;visible cells only</bookmark_value>
-<bookmark_value>deleting;visible cells only</bookmark_value>
-<bookmark_value>invisible cells</bookmark_value>
-<bookmark_value>filters;copying visible cells only</bookmark_value>
-<bookmark_value>hidden cells</bookmark_value>
-</bookmark><comment>mw changed "cells;"</comment><paragraph role="heading" id="hd_id3150440" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="cellcopy"><link href="text/scalc/guide/cellcopy.xhp" name="Only Copy Visible Cells">Only Copy Visible Cells</link>
+      <bookmark_value>rows;visible and invisible</bookmark_value>
+      <bookmark_value>copying; visible cells only</bookmark_value>
+      <bookmark_value>formatting;visible cells only</bookmark_value>
+      <bookmark_value>moving;visible cells only</bookmark_value>
+      <bookmark_value>deleting;visible cells only</bookmark_value>
+      <bookmark_value>invisible cells</bookmark_value>
+      <bookmark_value>filters;copying visible cells only</bookmark_value>
+      <bookmark_value>hidden cells</bookmark_value>
+</bookmark><comment>mw changed "cells;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150440" role="heading" level="1" l10n="U" oldref="1"><variable id="cellcopy"><link href="text/scalc/guide/cellcopy.xhp" name="Only Copy Visible Cells">Only Copy Visible Cells</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148577" xml-lang="en-US" l10n="CHG" oldref="2">Assume you have hidden a few rows in a cell range. Now you want to copy, delete, or format only the remaining visible rows.</paragraph>
-<paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="CHG" oldref="3">$[officename] behavior depends on how the cells were made invisible, by a filter or manually.</paragraph>
-<table id="tbl_id3154942">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="4">Method and Action</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3150751" xml-lang="en-US" l10n="U" oldref="5">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="6">Cells were filtered by AutoFilters, standard filters or advanced filters.</paragraph>
-<paragraph role="tablecontent" id="par_id3150044" xml-lang="en-US" l10n="CHG" oldref="7">Copy, delete, move, or format a selection of currently visible cells.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="8">Only the visible cells of the selection are copied, deleted, moved, or formatted.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3166427" xml-lang="en-US" l10n="U" oldref="12">Cells were hidden using the <emph>Hide</emph> command in the context menu of the row or column headers, or through an <link href="text/scalc/01/12080000.xhp" name="outline">outline</link>.</paragraph>
-<paragraph role="tablecontent" id="par_id3152990" xml-lang="en-US" l10n="CHG" oldref="13">Copy, delete, move, or format a selection of currently visible cells.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154371" xml-lang="en-US" l10n="CHG" oldref="14">All cells of the selection, including the hidden cells, are copied, deleted, moved, or formatted.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/filters.xhp#filters"/>
-<embed href="text/scalc/guide/autofilter.xhp#autofilter"/>
-<embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3148577" role="paragraph" l10n="CHG" oldref="2">Assume you have hidden a few rows in a cell range. Now you want to copy, delete, or format only the remaining visible rows.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154729" role="paragraph" l10n="CHG" oldref="3">$[officename] behavior depends on how the cells were made invisible, by a filter or manually.</paragraph>
+      <table id="tbl_id3154942">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155603" role="tablehead" l10n="U" oldref="4">Method and Action</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150751" role="tablehead" l10n="U" oldref="5">Result</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149018" role="tablecontent" l10n="U" oldref="6">Cells were filtered by AutoFilters, standard filters or advanced filters.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150044" role="tablecontent" l10n="CHG" oldref="7">Copy, delete, move, or format a selection of currently visible cells.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146918" role="tablecontent" l10n="CHG" oldref="8">Only the visible cells of the selection are copied, deleted, moved, or formatted.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166427" role="tablecontent" l10n="U" oldref="12">Cells were hidden using the <emph>Hide</emph> command in the context menu of the row or column headers, or through an <link href="text/scalc/01/12080000.xhp" name="outline">outline</link>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3152990" role="tablecontent" l10n="CHG" oldref="13">Copy, delete, move, or format a selection of currently visible cells.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154371" role="tablecontent" l10n="CHG" oldref="14">All cells of the selection, including the hidden cells, are copied, deleted, moved, or formatted.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/filters.xhp#filters"/>
+         <embed href="text/scalc/guide/autofilter.xhp#autofilter"/>
+         <embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
index 7877b9f6ab..c83c804d28 100755
--- a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cellreference_dragdrop.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,55 +27,53 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
 <meta>
-<topic id="textscalcguidecellreference_dragdropxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Referencing Cells by Drag-and-Drop</title>
-<filename>/text/scalc/guide/cellreference_dragdrop.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-08T11:16:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidecellreference_dragdropxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Referencing Cells by Drag-and-Drop</title>
+         <filename>/text/scalc/guide/cellreference_dragdrop.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154686"><bookmark_value>drag and drop; referencing cells</bookmark_value>
-<bookmark_value>cells; referencing by drag and drop </bookmark_value>
-<bookmark_value>references;inserting by drag and drop</bookmark_value>
-<bookmark_value>inserting;references, by drag and drop</bookmark_value>
+      <bookmark_value>cells; referencing by drag and drop </bookmark_value>
+      <bookmark_value>references;inserting by drag and drop</bookmark_value>
+      <bookmark_value>inserting;references, by drag and drop</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="cellreference_dragdrop"><link href="text/scalc/guide/cellreference_dragdrop.xhp" name="Referencing Cells by Drag-and-Drop">Referencing Cells by Drag-and-Drop</link>
+<paragraph xml-lang="en-US" id="hd_id3154686" role="heading" level="1" l10n="U"
+                 oldref="16"><variable id="cellreference_dragdrop"><link href="text/scalc/guide/cellreference_dragdrop.xhp" name="Referencing Cells by Drag-and-Drop">Referencing Cells by Drag-and-Drop</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156444" xml-lang="en-US" l10n="U" oldref="17">With the help of the Navigator you can reference cells from one spreadsheet to another sheet in the same document or in a different document. The cells can be inserted as a copy, link or hyperlink. The range to be inserted must be defined with a name in the original file so that it can be inserted in the target file.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="25">Open the document that contains the source cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="26">To set the source range as the range, select the cells and choose <emph>Insert - Names - Define</emph>. Save the source document, and do not close it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="18">Open the sheet in which you want to insert something.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154732" xml-lang="en-US" l10n="U" oldref="19">Open the <link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>. In the lower box of the Navigator select the source file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150752" xml-lang="en-US" l10n="U" oldref="22">In the Navigator, the source file object appears under "Range names".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="27">Using the <emph>Drag Mode</emph> icon in Navigator, choose whether you want the reference to be a hyperlink, link, or copy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154256" xml-lang="en-US" l10n="U" oldref="23">Click the name under "Range names" in the Navigator, and drag into the cell of the current sheet where you want to insert the reference.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="24">This method can also be used to insert a range from another sheet of the same document into the current sheet. Select the active document as source in step 4 above.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
-<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="CHG" oldref="17">With the help of the Navigator you can reference cells from one sheet to another sheet in the same document or in a different document. The cells can be inserted as a copy, link, or hyperlink. The range to be inserted must be defined with a name in the original file so that it can be inserted in the target file.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152576" role="listitem" l10n="U" oldref="25">Open the document that contains the source cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154011" role="listitem" l10n="U" oldref="26">To set the source range as the range, select the cells and choose <emph>Insert - Names - Define</emph>. Save the source document, and do not close it.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151073" role="listitem" l10n="U" oldref="18">Open the sheet in which you want to insert something.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154732" role="listitem" l10n="U" oldref="19">Open the <link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>. In the lower box of the Navigator select the source file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150752" role="listitem" l10n="U" oldref="22">In the Navigator, the source file object appears under "Range names".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154754" role="listitem" l10n="U" oldref="27">Using the <emph>Drag Mode</emph> icon in Navigator, choose whether you want the reference to be a hyperlink, link, or copy.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154256" role="listitem" l10n="U" oldref="23">Click the name under "Range names" in the Navigator, and drag into the cell of the current sheet where you want to insert the reference.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149565" role="paragraph" l10n="U" oldref="24">This method can also be used to insert a range from another sheet of the same document into the current sheet. Select the active document as source in step 4 above.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+         <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences.xhp b/helpcontent2/source/text/scalc/guide/cellreferences.xhp
index 19934a11ff..8764d32055 100755
--- a/helpcontent2/source/text/scalc/guide/cellreferences.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellreferences.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,66 +29,68 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidecellreferencesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Referencing a Cell in Another Document</title>
-<filename>/text/scalc/guide/cellreferences.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-16T11:37:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidecellreferencesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Referencing a Cell in Another Document</title>
+         <filename>/text/scalc/guide/cellreferences.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147436"><bookmark_value>sheet references</bookmark_value>
-<bookmark_value>references; to cells in another document</bookmark_value>
-<bookmark_value>cells; operating in another document</bookmark_value>
-</bookmark><comment>mw made "sheet references;" a one level entry</comment>
-<paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="1" l10n="CHG" oldref="9"><variable id="cellreferences"><link href="text/scalc/guide/cellreferences.xhp" name="Referencing Other Sheets">Referencing Other Sheets</link>
+      <bookmark_value>references; to cells in other sheets/documents</bookmark_value>
+      <bookmark_value>cells; operating in another document</bookmark_value>
+      <bookmark_value>documents;references</bookmark_value>
+</bookmark><comment>mw made "sheet references;" a one level entry</comment><comment>MW changed "references;" and added "documents;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147436" role="heading" level="1" l10n="CHG"
+                 oldref="9"><variable id="cellreferences"><link href="text/scalc/guide/cellreferences.xhp" name="Referencing Other Sheets">Referencing Other Sheets</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id9663075" xml-lang="en-US" l10n="NEW">In a sheet cell you can show a reference to a cell in another sheet.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id2078005" xml-lang="en-US" l10n="NEW">Open a new, empty spreadsheet.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id4943693" xml-lang="en-US" l10n="NEW">By way of example, enter the following formula in cell A1 of Sheet1:</paragraph>
-<paragraph role="listitem" id="par_id9064302" xml-lang="en-US" l10n="NEW">=Sheet2.A1</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7609790" xml-lang="en-US" l10n="NEW">Click the <emph>Sheet 2</emph> tab at the bottom of the spreadsheet. Set the cursor in cell A1 there and enter text or a number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id809961" xml-lang="en-US" l10n="NEW">If you switch back to Sheet1, you will see the same content in cell A1 there. If the contents of Sheet2.A1 change, then the contents of Sheet1.A1 also change.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id1879329" xml-lang="en-US" l10n="NEW">In the same way, a reference can also be made to a cell from another document provided that this document has already been saved as a file.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id5949278" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph>, to load an existing spreadsheet document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id8001953" xml-lang="en-US" l10n="NEW">Choose <emph>File - New</emph>, to open a new spreadsheet document. Set the cursor in the cell where you want to insert the external data and enter an equals sign to indicate that you want to begin a formula.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id8571123" xml-lang="en-US" l10n="NEW">Now switch to the document you have just loaded. Click the cell with the data that you want to insert in the new document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id8261665" xml-lang="en-US" l10n="NEW">Switch back to the new spreadsheet. In the input line you will now see how $[officename] Calc has added the reference to the formula for you. </paragraph>
-<paragraph role="listitem" id="par_id5888241" xml-lang="en-US" l10n="NEW">The reference to a cell of another document contains the name of the other document in single inverted commas, then a hash #, then the name of the sheet of the other document, followed by a point and the name of the cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7697683" xml-lang="en-US" l10n="NEW">Confirm the formula by clicking the green check mark.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7099826" xml-lang="en-US" l10n="NEW">If you drag the box in the lower right corner of the active cell to select a range of cells, $[officename] automatically inserts the corresponding references in the adjacent cells. As a result, the sheet name is preceded with a "$" sign to designate it as an absolute reference.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id674459" xml-lang="en-US" l10n="NEW">If you examine the name of the other document in this formula, you will notice that it is written as a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>. This means that you can also enter a URL from the Internet.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/cellreferences_url.xhp#cellreferences_url"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id9663075" role="paragraph" l10n="NEW">In a sheet cell you can show a reference to a cell in another sheet.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1879329" role="paragraph" l10n="NEW">In the same way, a reference can also be made to a cell from another document provided that this document has already been saved as a file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7122409" role="heading" level="2" l10n="NEW">To Reference a Cell in the Same Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2078005" role="listitem" l10n="NEW">Open a new, empty spreadsheet.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4943693" role="listitem" l10n="NEW">By way of example, enter the following formula in cell A1 of Sheet1:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9064302" role="listitem" l10n="NEW">
+               <item type="literal">=Sheet2.A1</item>
+            </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7609790" role="listitem" l10n="NEW">Click the <emph>Sheet 2</emph> tab at the bottom of the spreadsheet. Set the cursor in cell A1 there and enter text or a number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id809961" role="listitem" l10n="NEW">If you switch back to Sheet1, you will see the same content in cell A1 there. If the contents of Sheet2.A1 change, then the contents of Sheet1.A1 also change.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id9209570" role="heading" level="2" l10n="NEW">To Reference a Cell in Another Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5949278" role="listitem" l10n="NEW">Choose <emph>File - Open</emph>, to load an existing spreadsheet document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8001953" role="listitem" l10n="NEW">Choose <emph>File - New</emph>, to open a new spreadsheet document. Set the cursor in the cell where you want to insert the external data and enter an equals sign to indicate that you want to begin a formula.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8571123" role="listitem" l10n="NEW">Now switch to the document you have just loaded. Click the cell with the data that you want to insert in the new document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8261665" role="listitem" l10n="NEW">Switch back to the new spreadsheet. In the input line you will now see how $[officename] Calc has added the reference to the formula for you. </paragraph>
+            <paragraph xml-lang="en-US" id="par_id5888241" role="listitem" l10n="NEW">The reference to a cell of another document contains the name of the other document in single inverted commas, then a hash #, then the name of the sheet of the other document, followed by a point and the name of the cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7697683" role="listitem" l10n="NEW">Confirm the formula by clicking the green check mark.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7099826" role="listitem" l10n="NEW">If you drag the box in the lower right corner of the active cell to select a range of cells, $[officename] automatically inserts the corresponding references in the adjacent cells. As a result, the sheet name is preceded with a "$" sign to designate it as an absolute reference.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id674459" role="paragraph" l10n="NEW">If you examine the name of the other document in this formula, you will notice that it is written as a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>. This means that you can also enter a URL from the Internet.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cellreferences_url.xhp#cellreferences_url"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
index ebec4bdd5a..39513f1d72 100755
--- a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
- *
+***********************************************************************
+*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellreferences_url.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,19 +27,15 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
+************************************************************************
+-->
+
 	
-<helpdocument version="1.0">
 <meta>
 <topic id="textscalcguidecellreferences_urlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">References to Other Sheets and Referencing URLs</title>
+<title xml-lang="en-US" id="tit">References to Other Sheets and Referencing URLs</title>
 <filename>/text/scalc/guide/cellreferences_url.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-16T11:39:52">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150441"><bookmark_value>HTML; in sheet cells</bookmark_value>
@@ -50,29 +43,30 @@
 <bookmark_value>cells; Internet references</bookmark_value>
 <bookmark_value>URL; in Calc</bookmark_value>
 </bookmark><comment>mw deleted "sheet references;"</comment>
-<paragraph role="heading" id="hd_id3150441" xml-lang="en-US" level="1" l10n="CHG" oldref="15"><variable id="cellreferences_url"><link href="text/scalc/guide/cellreferences_url.xhp" name="Referencing URLs">Referencing URLs</link>
+<paragraph xml-lang="en-US" id="hd_id3150441" role="heading" level="1" l10n="CHG"
+oldref="15"><variable id="cellreferences_url"><link href="text/scalc/guide/cellreferences_url.xhp" name="Referencing URLs">Referencing URLs</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1955626" xml-lang="en-US" l10n="NEW">For example, if you found an Internet page containing current stock exchange information in spreadsheet cells, you can load this page in $[officename] Calc by using the following procedure:</paragraph>
+<paragraph xml-lang="en-US" id="par_id1955626" role="paragraph" l10n="NEW">For example, if you found an Internet page containing current stock exchange information in spreadsheet cells, you can load this page in $[officename] Calc by using the following procedure:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="39">In a $[officename] Calc document, position the cursor in the cell into which you want to insert the external data.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152993" role="listitem" l10n="U" oldref="39">In a $[officename] Calc document, position the cursor in the cell into which you want to insert the external data.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="40">Choose <emph>Insert - Link to External Data</emph>. The <link href="text/scalc/01/04090000.xhp" name="External Data"><emph>External Data</emph></link> dialog appears.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145384" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Insert - Link to External Data</item>. The <link href="text/scalc/01/04090000.xhp" name="External Data"><item type="menuitem">External Data</item></link> dialog appears.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3152892" xml-lang="en-US" l10n="U" oldref="41">Enter the URL of the document or Web page in the dialog. The URL must be in the format: http://www.my-bank.com/table.html. The URL for local or local area network files is the path seen in the <emph>File - Open</emph> dialog.</paragraph>
-<paragraph role="listitem" id="par_id3153068" xml-lang="en-US" l10n="U" oldref="42">$[officename] loads the Web page or file in the "background", that is, without displaying it. In the large list box of the <emph>External Data</emph> dialog, you can see the name of all the sheets or named ranges you can choose from.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3152892" role="listitem" l10n="U" oldref="41">Enter the URL of the document or Web page in the dialog. The URL must be in the format: http://www.my-bank.com/table.html. The URL for local or local area network files is the path seen in the <item type="menuitem">File - Open</item> dialog.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153068" role="listitem" l10n="U" oldref="42">$[officename] loads the Web page or file in the "background", that is, without displaying it. In the large list box of the <item type="menuitem">External Data</item> dialog, you can see the name of all the sheets or named ranges you can choose from.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="43">Select one or more sheets or named ranges. You can also activate the automatic update function every "n" minutes and click OK.</paragraph>
-<paragraph role="listitem" id="par_id3157979" xml-lang="en-US" l10n="U" oldref="44">The contents will be inserted as a link in the $[officename] Calc document.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153914" role="listitem" l10n="CHG" oldref="43">Select one or more sheets or named ranges. You can also activate the automatic update function every "n" seconds and click <item type="menuitem">OK</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3157979" role="listitem" l10n="U" oldref="44">The contents will be inserted as a link in the $[officename] Calc document.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3144768" xml-lang="en-US" l10n="U" oldref="30">Save your spreadsheet. When you open it again later, $[officename] Calc will update the linked cells following an inquiry.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3144768" role="listitem" l10n="U" oldref="30">Save your spreadsheet. When you open it again later, $[officename] Calc will update the linked cells following an inquiry.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3159204" xml-lang="en-US" l10n="U" oldref="38">Under <link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Spreadsheet - General"><emph>Tools - Options - %PRODUCTNAME Calc - General</emph></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <emph>Edit - Links</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040900.xhp" name="Spreadsheet - General"><item type="menuitem">%PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
@@ -80,4 +74,4 @@
 <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
index f8b5ebdb65..5a2726974a 100755
--- a/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellstyle_by_formula.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,58 +29,56 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecellstyle_by_formulaxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Assigning Formats by Formula</title>
-<filename>/text/scalc/guide/cellstyle_by_formula.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textscalcguidecellstyle_by_formulaxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Assigning Formats by Formula</title>
+         <filename>/text/scalc/guide/cellstyle_by_formula.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145673"><bookmark_value>formats; assigning by formulas</bookmark_value>
-<bookmark_value>cell formats; assigning by formulas</bookmark_value>
-<bookmark_value>STYLE function example</bookmark_value>
-<bookmark_value>cell styles;assigning by formulas</bookmark_value>
-<bookmark_value>formulas;assigning cell formats</bookmark_value>
-</bookmark>
-  <comment>mw deleted "applying;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3145673" role="heading" level="1" l10n="U" oldref="13"><variable id="cellstyle_by_formula"><link href="text/scalc/guide/cellstyle_by_formula.xhp" name="Assigning Formats by Formula">Assigning Formats by Formula</link> 
+      <bookmark_value>cell formats; assigning by formulas</bookmark_value>
+      <bookmark_value>STYLE function example</bookmark_value>
+      <bookmark_value>cell styles;assigning by formulas</bookmark_value>
+      <bookmark_value>formulas;assigning cell formats</bookmark_value>
+</bookmark><comment>mw deleted "applying;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145673" role="heading" level="1" l10n="U"
+                 oldref="13"><variable id="cellstyle_by_formula"><link href="text/scalc/guide/cellstyle_by_formula.xhp" name="Assigning Formats by Formula">Assigning Formats by Formula</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150275" role="paragraph" l10n="CHG" oldref="14">The STYLE() function can be added to an existing formula in a cell. For example, together with the CURRENT function, you can color a cell depending on its value. The formula =...+STYLE(IF(CURRENT()&gt;3; "Red"; "Green")) applies the cell style "Red" to cells if the value is greater than 3, otherwise the cell style "Green" is applied.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="U" oldref="15">If you would like to apply a formula to all cells in a selected area, you can use the<emph> Find &amp; Replace</emph> dialog.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="16">Select all the desired cells.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148797" role="listitem" l10n="U" oldref="17">Select the menu command <emph>Edit - Find &amp; Replace</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150767" role="listitem" l10n="U" oldref="18">For the <emph>Search for</emph> term, enter: .*</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3153770" role="listitem" l10n="U" oldref="19">".*" is a regular expression that designates the contents of the current cell.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153143" role="listitem" l10n="U" oldref="20">Enter the following formula in the <emph>Replace with</emph> field: =&amp;+STYLE(IF(CURRENT()&gt;3;"Red";"Green"))</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3146975" role="listitem" l10n="U" oldref="21">The "&amp;" symbol designates the current contents of the <emph>Search for</emph> field. The line must begin with an equal sign, since it is a formula. It is assumed that the cell styles "Red" and "Green" already exist.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149262" role="listitem" l10n="U" oldref="22">Mark the fields <link href="text/shared/01/02100000.xhp" name="Regular expressions"><emph>Regular expressions</emph></link> and <emph>Current selection only</emph>. Click <emph>Find All</emph>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3144767" role="listitem" l10n="U" oldref="24">All cells with contents that were included in the selection are now highlighted.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147127" role="listitem" l10n="U" oldref="23">Click<emph> Replace all</emph>.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
-   <embed href="text/scalc/guide/cellstyle_minusvalue.xhp#cellstyle_minusvalue"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150275" role="paragraph" l10n="CHG" oldref="14">The STYLE() function can be added to an existing formula in a cell. For example, together with the CURRENT function, you can color a cell depending on its value. The formula =...+STYLE(IF(CURRENT()&gt;3; "Red"; "Green")) applies the cell style "Red" to cells if the value is greater than 3, otherwise the cell style "Green" is applied.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="U" oldref="15">If you would like to apply a formula to all cells in a selected area, you can use the<emph/>
+         <item type="menuitem">Find &amp; Replace</item> dialog.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="16">Select all the desired cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148797" role="listitem" l10n="U" oldref="17">Select the menu command <emph>Edit - Find &amp; Replace</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150767" role="listitem" l10n="U" oldref="18">For the <item type="menuitem">Search for</item> term, enter: .<item type="literal">*</item>
+            </paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153770" role="listitem" l10n="U" oldref="19">".*" is a regular expression that designates the contents of the current cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153143" role="listitem" l10n="U" oldref="20">Enter the following formula in the <item type="menuitem">Replace with</item> field: <item type="literal">=&amp;+STYLE(IF(CURRENT()&gt;3;"Red";"Green"))</item>
+            </paragraph>
+            <paragraph xml-lang="en-US" id="par_id3146975" role="listitem" l10n="U" oldref="21">The "&amp;" symbol designates the current contents of the <emph>Search for</emph> field. The line must begin with an equal sign, since it is a formula. It is assumed that the cell styles "Red" and "Green" already exist.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149262" role="listitem" l10n="U" oldref="22">Mark the fields <link href="text/shared/01/02100000.xhp" name="Regular expressions"><emph>Regular expressions</emph></link> and <emph>Current selection only</emph>. Click <emph>Find All</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3144767" role="listitem" l10n="U" oldref="24">All cells with contents that were included in the selection are now highlighted.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147127" role="listitem" l10n="U" oldref="23">Click<emph/>
+               <item type="menuitem">Replace all</item>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
+         <embed href="text/scalc/guide/cellstyle_minusvalue.xhp#cellstyle_minusvalue"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
index 10ac33ba85..1c1d38d508 100755
--- a/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellstyle_conditional.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,120 +29,128 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecellstyle_conditionalxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying Conditional Formatting</title>
-<filename>/text/scalc/guide/cellstyle_conditional.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidecellstyle_conditionalxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Conditional Formatting</title>
+         <filename>/text/scalc/guide/cellstyle_conditional.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149263"><bookmark_value>conditional formatting; cells</bookmark_value>
-<bookmark_value>cells; conditional formatting</bookmark_value>
-<bookmark_value>formatting; conditional formatting</bookmark_value>
-<bookmark_value>styles;conditional styles</bookmark_value>
-<bookmark_value>cell formats; conditional</bookmark_value>
-<bookmark_value>random numbers;examples</bookmark_value>
-<bookmark_value>cell styles; copying</bookmark_value>
-<bookmark_value>copying; cell styles</bookmark_value>
-<bookmark_value>tables; copying cell styles</bookmark_value>
-</bookmark><comment>mw deleted "formats;"</comment><paragraph role="heading" id="hd_id3149263" xml-lang="en-US" level="1" l10n="U" oldref="24"><variable id="cellstyle_conditional"><link href="text/scalc/guide/cellstyle_conditional.xhp" name="Applying Conditional Formatting">Applying Conditional Formatting</link>
+      <bookmark_value>cells; conditional formatting</bookmark_value>
+      <bookmark_value>formatting; conditional formatting</bookmark_value>
+      <bookmark_value>styles;conditional styles</bookmark_value>
+      <bookmark_value>cell formats; conditional</bookmark_value>
+      <bookmark_value>random numbers;examples</bookmark_value>
+      <bookmark_value>cell styles; copying</bookmark_value>
+      <bookmark_value>copying; cell styles</bookmark_value>
+      <bookmark_value>tables; copying cell styles</bookmark_value>
+</bookmark><comment>mw deleted "formats;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149263" role="heading" level="1" l10n="U"
+                 oldref="24"><variable id="cellstyle_conditional"><link href="text/scalc/guide/cellstyle_conditional.xhp" name="Applying Conditional Formatting">Applying Conditional Formatting</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159156" xml-lang="en-US" l10n="U" oldref="25">Using the menu command <emph>Format - Conditional formatting</emph>, the dialog allows you to define up to three conditions per cell, which must be met in order for the selected cells to have a particular format.</paragraph>
-<paragraph role="warning" id="par_id8039796" xml-lang="en-US" l10n="NEW">To apply conditional formatting, AutoCalculate must be enabled. Choose <emph>Tools - Cell Contents - AutoCalculate</emph> (you see a check mark next to the command when AutoCalculate is enabled).</paragraph>
-<paragraph role="paragraph" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="26">With conditional formatting, you can, for example, highlight the totals that exceed the average value of all totals. If the totals change, the formatting changes correspondingly, without having to apply other styles manually.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="27">Select the cells to which you want to apply a conditional style.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="28">Choose <emph>Format - Conditional Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="29">Enter the condition(s) into the dialog box. The dialog is described in detail in <link href="text/scalc/01/05120000.xhp" name="$[officename] Help">$[officename] Help</link>, and an example is provided below:</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="38">Example of Conditional Formatting: Generate Number Values</paragraph>
-<paragraph role="paragraph" id="par_id3150043" xml-lang="en-US" l10n="U" oldref="39">You want to give certain values in your tables particular emphasis. For example, in a table of turnovers, you can show all the values above the average in green and all those below the average in red. This is possible with conditional formatting.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155337" xml-lang="en-US" l10n="U" oldref="40">First of all, write a table in which a few different values occur. For your test you can create tables with any random numbers:</paragraph>
-<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="41">In one of the cells enter the formula =RAND(), and you will obtain a random number between 0 and 1. If you want integers of between 0 and 50, enter the formula =INT(RAND()*50).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149258" xml-lang="en-US" l10n="U" oldref="42">Copy the formula to create a row of random numbers. Click the bottom right corner of the selected cell, and drag to the right until the desired cell range is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="43">In the same way as described above, drag down the corner of the rightmost cell in order to create more rows of random numbers.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149211" xml-lang="en-US" level="2" l10n="U" oldref="44">Example of Conditional Formatting: Define Cell Styles</paragraph>
-<paragraph role="paragraph" id="par_id3154659" xml-lang="en-US" l10n="U" oldref="45">The next step is to apply a cell style to all values that represent above-average turnover, and one to those that are below the average. Ensure that the Styles and Formatting window is visible before proceeding.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150883" xml-lang="en-US" l10n="U" oldref="46">Click in a blank cell and select the command <emph>Format Cells</emph> in the context menu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Format Cells</emph> dialog on the <emph>Background</emph> tab, select a background color. Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154484" xml-lang="en-US" l10n="U" oldref="48">In the Styles and Formatting window, click the <emph>New Style from Selection</emph> icon. Enter the name of the new style. For this example, name the style "Above".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152889" xml-lang="en-US" l10n="U" oldref="49">To define a second style, click again in a blank cell and proceed as described above. Assign a different background color for the cell and assign a name (for this example, "Below").</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3148704" xml-lang="en-US" level="2" l10n="U" oldref="60">Example of Conditional Formatting: Calculate Average</paragraph>
-<paragraph role="paragraph" id="par_id3148837" xml-lang="en-US" l10n="U" oldref="51">In our particular example, we are calculating the average of the random values. The result is placed in a cell:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3144768" xml-lang="en-US" l10n="CHG" oldref="52">Set the cursor in a blank cell, for example, J14, and choose <emph>Insert - Function</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156016" xml-lang="en-US" l10n="CHG" oldref="53">Select the AVERAGE function. Use the mouse to select all your random numbers. If you cannot see the entire range, because Function Wizard is obscuring it, you can temporarily shrink the dialog using the <link href="text/shared/00/00000001.xhp#eingabesymbol" name="Shrink or Maximize">Shrink / Maximize</link> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153246" xml-lang="en-US" l10n="U" oldref="54">Close Function Wizard with <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149898" xml-lang="en-US" level="2" l10n="U" oldref="50">Example of Conditional Formatting: Apply Cell Style</paragraph>
-<paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="55">Now you can apply the conditional formatting to the sheet:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150049" xml-lang="en-US" l10n="U" oldref="56">Select all cells with the random numbers.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153801" xml-lang="en-US" l10n="U" oldref="57">Choose the <emph>Format - Conditional Formatting</emph> command to open the corresponding dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153013" xml-lang="en-US" l10n="U" oldref="58">Define the condition as follows: If cell value is less than J14, format with cell style "Below", and if cell value is greater than or equal to J14, format with cell style "Above".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155761" xml-lang="en-US" level="2" l10n="U" oldref="61">Example of Conditional Formatting: Copy Cell Style</paragraph>
-<paragraph role="paragraph" id="par_id3145320" xml-lang="en-US" l10n="U" oldref="62">To apply the conditional formatting to other cells later:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153074" xml-lang="en-US" l10n="U" oldref="63">Click one of the cells that has been assigned conditional formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149051" xml-lang="en-US" l10n="U" oldref="64">Copy the cell to the clipboard.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150436" xml-lang="en-US" l10n="U" oldref="65">Select the cells that are to receive this same formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147298" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Edit - Paste Special</emph>. The <emph>Paste Special</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166465" xml-lang="en-US" l10n="U" oldref="67">In the <emph>Selection</emph> area, check only the <emph>Formats</emph> box. All other boxes must be unchecked. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/cellstyle_by_formula.xhp#cellstyle_by_formula"/>
-<embed href="text/scalc/guide/cellstyle_minusvalue.xhp#cellstyle_minusvalue"/>
-<paragraph role="paragraph" id="par_id3159123" xml-lang="en-US" l10n="U" oldref="68"><link href="text/scalc/01/05120000.xhp" name="Format - Conditional formatting">Format - Conditional formatting</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="25">Using the menu command <emph>Format - Conditional formatting</emph>, the dialog allows you to define up to three conditions per cell, which must be met in order for the selected cells to have a particular format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8039796" role="warning" l10n="NEW">To apply conditional formatting, AutoCalculate must be enabled. Choose <emph>Tools - Cell Contents - AutoCalculate</emph> (you see a check mark next to the command when AutoCalculate is enabled).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154944" role="paragraph" l10n="U" oldref="26">With conditional formatting, you can, for example, highlight the totals that exceed the average value of all totals. If the totals change, the formatting changes correspondingly, without having to apply other styles manually.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4480727" role="heading" level="2" l10n="NEW">To Define the Conditions</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154490" role="listitem" l10n="U" oldref="27">Select the cells to which you want to apply a conditional style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155603" role="listitem" l10n="U" oldref="28">Choose <emph>Format - Conditional Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146969" role="listitem" l10n="U" oldref="29">Enter the condition(s) into the dialog box. The dialog is described in detail in <link href="text/scalc/01/05120000.xhp" name="$[officename] Help">$[officename] Help</link>, and an example is provided below:</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2" l10n="U"
+                 oldref="38">Example of Conditional Formatting: Highlighting Totals Above/Under the Average Value</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4341868" role="heading" level="3" l10n="NEW">Step1: Generate Number Values</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="39">You want to give certain values in your tables particular emphasis. For example, in a table of turnovers, you can show all the values above the average in green and all those below the average in red. This is possible with conditional formatting.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155337" role="listitem" l10n="U" oldref="40">First of all, write a table in which a few different values occur. For your test you can create tables with any random numbers:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="41">In one of the cells enter the formula =RAND(), and you will obtain a random number between 0 and 1. If you want integers of between 0 and 50, enter the formula =INT(RAND()*50).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149258" role="listitem" l10n="U" oldref="42">Copy the formula to create a row of random numbers. Click the bottom right corner of the selected cell, and drag to the right until the desired cell range is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159236" role="listitem" l10n="U" oldref="43">In the same way as described above, drag down the corner of the rightmost cell in order to create more rows of random numbers.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149211" role="heading" level="3" l10n="U"
+                 oldref="44">Step 2: Define Cell Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154659" role="paragraph" l10n="U" oldref="45">The next step is to apply a cell style to all values that represent above-average turnover, and one to those that are below the average. Ensure that the Styles and Formatting window is visible before proceeding.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150883" role="listitem" l10n="U" oldref="46">Click in a blank cell and select the command <emph>Format Cells</emph> in the context menu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155529" role="listitem" l10n="U" oldref="47">In the <emph>Format Cells</emph> dialog on the <emph>Background</emph> tab, select a background color. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154484" role="listitem" l10n="U" oldref="48">In the Styles and Formatting window, click the <emph>New Style from Selection</emph> icon. Enter the name of the new style. For this example, name the style "Above".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152889" role="listitem" l10n="U" oldref="49">To define a second style, click again in a blank cell and proceed as described above. Assign a different background color for the cell and assign a name (for this example, "Below").</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3148704" role="heading" level="3" l10n="U"
+                 oldref="60">Step 3: Calculate Average</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148837" role="paragraph" l10n="U" oldref="51">In our particular example, we are calculating the average of the random values. The result is placed in a cell:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3144768" role="listitem" l10n="CHG" oldref="52">Set the cursor in a blank cell, for example, J14, and choose <emph>Insert - Function</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156016" role="listitem" l10n="CHG" oldref="53">Select the AVERAGE function. Use the mouse to select all your random numbers. If you cannot see the entire range, because the Function Wizard is obscuring it, you can temporarily shrink the dialog using the <link href="text/shared/00/00000001.xhp#eingabesymbol" name="Shrink or Maximize"><item type="menuitem">Shrink / Maximize</item></link> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153246" role="listitem" l10n="U" oldref="54">Close the Function Wizard with <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149898" role="heading" level="3" l10n="U"
+                 oldref="50">Step 4: Apply Cell Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149126" role="paragraph" l10n="U" oldref="55">Now you can apply the conditional formatting to the sheet:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150049" role="listitem" l10n="U" oldref="56">Select all cells with the random numbers.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153801" role="listitem" l10n="U" oldref="57">Choose the <emph>Format - Conditional Formatting</emph> command to open the corresponding dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153013" role="listitem" l10n="U" oldref="58">Define the condition as follows: If cell value is less than J14, format with cell style "Below", and if cell value is greater than or equal to J14, format with cell style "Above".</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155761" role="heading" level="3" l10n="U"
+                 oldref="61">Step 5: Copy Cell Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145320" role="paragraph" l10n="U" oldref="62">To apply the conditional formatting to other cells later:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153074" role="listitem" l10n="U" oldref="63">Click one of the cells that has been assigned conditional formatting.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149051" role="listitem" l10n="U" oldref="64">Copy the cell to the clipboard.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150436" role="listitem" l10n="U" oldref="65">Select the cells that are to receive this same formatting.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147298" role="listitem" l10n="U" oldref="66">Choose <emph>Edit - Paste Special</emph>. The <emph>Paste Special</emph> dialog appears.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166465" role="listitem" l10n="U" oldref="67">In the <emph>Selection</emph> area, check only the <emph>Formats</emph> box. All other boxes must be unchecked. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cellstyle_by_formula.xhp#cellstyle_by_formula"/>
+         <embed href="text/scalc/guide/cellstyle_minusvalue.xhp#cellstyle_minusvalue"/>
+         <paragraph xml-lang="en-US" id="par_id3159123" role="paragraph" l10n="U" oldref="68"><link href="text/scalc/01/05120000.xhp" name="Format - Conditional formatting">Format - Conditional formatting</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
index f051c8a5b8..a133ce25b3 100755
--- a/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellstyle_minusvalue.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,36 +29,37 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidecellstyle_minusvaluexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Highlighting Negative Numbers</title>
-<filename>/text/scalc/guide/cellstyle_minusvalue.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidecellstyle_minusvaluexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Highlighting Negative Numbers</title>
+         <filename>/text/scalc/guide/cellstyle_minusvalue.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>negative numbers</bookmark_value>
-<bookmark_value>numbers; highlighting negative numbers</bookmark_value>
-<bookmark_value>highlighting;negative numbers</bookmark_value>
-<bookmark_value>colors;number formats</bookmark_value>
-<bookmark_value>number formats;colors</bookmark_value>
-</bookmark><comment>MW made "negative numbers;" a one level entry</comment><paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="cellstyle_minusvalue"><link href="text/scalc/guide/cellstyle_minusvalue.xhp" name="Highlighting Negative Numbers">Highlighting Negative Numbers</link>
+      <bookmark_value>numbers; highlighting negative numbers</bookmark_value>
+      <bookmark_value>highlighting;negative numbers</bookmark_value>
+      <bookmark_value>colors;negative numbers</bookmark_value>
+      <bookmark_value>number formats;colors for negative numbers</bookmark_value>
+</bookmark><comment>MW made "negative numbers;" a one level entry</comment><comment>MW changed "numbers formats;" and "colors;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="cellstyle_minusvalue"><link href="text/scalc/guide/cellstyle_minusvalue.xhp" name="Highlighting Negative Numbers">Highlighting Negative Numbers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="33">You can format cells with a number format that highlights negative numbers in red. Alternatively, you can define your own number format in which negative numbers are highlighted in other colors.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="34">Select the cells and choose <emph>Format - Cells</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="35">On the <emph>Numbers</emph> tab, select a number format and mark <emph>Negative numbers red</emph> check box. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="U" oldref="36">The cell number format is defined in two parts. The format for positive numbers and zero is defined in front of the semicolon; after the semicolon the formula for negative numbers is defined. You can change the code (RED) under <emph>Format code</emph>. For example, instead of "RED," enter "YELLOW". If the new code appears in the list after clicking the <emph>Add</emph> icon, this is a valid entry.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
-<embed href="text/scalc/guide/cellstyle_by_formula.xhp#cellstyle_by_formula"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153878" role="paragraph" l10n="U" oldref="33">You can format cells with a number format that highlights negative numbers in red. Alternatively, you can define your own number format in which negative numbers are highlighted in other colors.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155600" role="listitem" l10n="U" oldref="34">Select the cells and choose <emph>Format - Cells</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146969" role="listitem" l10n="U" oldref="35">On the <emph>Numbers</emph> tab, select a number format and mark <emph>Negative numbers red</emph> check box. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145640" role="paragraph" l10n="U" oldref="36">The cell number format is defined in two parts. The format for positive numbers and zero is defined in front of the semicolon; after the semicolon the formula for negative numbers is defined. You can change the code (RED) under <item type="menuitem">Format code</item>. For example, instead of RED, enter <item type="literal">YELLOW</item>. If the new code appears in the list after clicking the <item type="menuitem">Add</item> icon, this is a valid entry.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
+         <embed href="text/scalc/guide/cellstyle_by_formula.xhp#cellstyle_by_formula"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/consolidate.xhp b/helpcontent2/source/text/scalc/guide/consolidate.xhp
index 7733ad2d06..8e73e02e12 100755
--- a/helpcontent2/source/text/scalc/guide/consolidate.xhp
+++ b/helpcontent2/source/text/scalc/guide/consolidate.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consolidate.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,71 +29,72 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideconsolidatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Consolidating Data</title>
-<filename>/text/scalc/guide/consolidate.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideconsolidatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Consolidating Data</title>
+         <filename>/text/scalc/guide/consolidate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150791"><bookmark_value>consolidating data</bookmark_value>
-<bookmark_value>ranges; combining</bookmark_value>
-<bookmark_value>combining;cell ranges</bookmark_value>
-<bookmark_value>tables; combining</bookmark_value>
-<bookmark_value>data; merging cell ranges</bookmark_value>
-<bookmark_value>merging;data ranges</bookmark_value>
-</bookmark><comment>mw deleted "values;"</comment><paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1" l10n="U" oldref="5"><variable id="consolidate"><link href="text/scalc/guide/consolidate.xhp" name="Consolidating Data">Consolidating Data</link>
+      <bookmark_value>ranges; combining</bookmark_value>
+      <bookmark_value>combining;cell ranges</bookmark_value>
+      <bookmark_value>tables; combining</bookmark_value>
+      <bookmark_value>data; merging cell ranges</bookmark_value>
+      <bookmark_value>merging;data ranges</bookmark_value>
+</bookmark><comment>mw deleted "values;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150791" role="heading" level="1" l10n="U" oldref="5"><variable id="consolidate"><link href="text/scalc/guide/consolidate.xhp" name="Consolidating Data">Consolidating Data</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153191" xml-lang="en-US" l10n="U" oldref="34">During consolidation, the contents of the cells from several sheets will be combined in one place.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="6">Open the document that contains the cell ranges to be consolidated.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154513" xml-lang="en-US" l10n="U" oldref="7">Choose <item type="menuitem">Data - Consolidate</item> to open the <emph>Consolidate</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="8">From the <emph>Source data area</emph> box select a source cell range to consolidate with other areas.</paragraph>
-<paragraph role="paragraph" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="9">If the range is not named, click in the field next to the <emph>Source data area</emph>. A blinking text cursor appears. Type a reference for the first source data range or select the range with the mouse.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="10">Click <emph>Add</emph> to insert the selected range in the <emph>Consolidation areas</emph> field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153816" xml-lang="en-US" l10n="U" oldref="11">Select additional ranges and click <emph>Add</emph> after each selection.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3157983" xml-lang="en-US" l10n="U" oldref="12">Specify where you want to display the result by selecting a target range from the <emph>Copy results to</emph> box.</paragraph>
-<paragraph role="paragraph" id="par_id3150215" xml-lang="en-US" l10n="U" oldref="13">If the target range is not named, click in the field next to <emph>Copy results to</emph> and enter the reference of the target range. Alternatively, you can select the range using the mouse or position the cursor in the top left cell of the target range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153813" xml-lang="en-US" l10n="U" oldref="14">Select a function from the <emph>Function</emph> box. The function specifies how the values of the consolidation ranges are linked. The "Sum" function is the default setting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149315" xml-lang="en-US" l10n="U" oldref="15">Click <emph>OK</emph> to consolidate the ranges.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107DE" xml-lang="en-US" level="2" l10n="NEW">Additional Settings</paragraph>
-<paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="16">Click <emph>More</emph> in the <emph>Consolidate</emph> dialog to display additional settings:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156400" xml-lang="en-US" l10n="U" oldref="17">Select <emph>Link to source data</emph> to insert the formulas that generate the results in the target range, rather than the actual results. If you link the data, any values modified in the source range are automatically updated in the target range.</paragraph>
-<paragraph role="listitem" id="par_id3150538" xml-lang="en-US" l10n="U" oldref="18">The corresponding cell references in the target range are inserted in consecutive rows, which are automatically ordered and then hidden from view. Only the final result, based on the selected function, is displayed.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="19">Under <emph>Consolidate by</emph>, select either <emph>Row labels</emph> or <emph>Column labels</emph> if the cells of the source data range are not to be consolidated corresponding to the identical position of the cell in the range, but instead according to a matching row label or column label.</paragraph>
-<paragraph role="listitem" id="par_id3157871" xml-lang="en-US" l10n="U" oldref="20">To consolidate by row labels or column labels, the label must be contained in the selected source ranges.</paragraph>
-<paragraph role="note" id="par_id3150478" xml-lang="en-US" l10n="U" oldref="21">The text in the labels must be identical, so that rows or columns can be accurately matched. If the row or column label does not match any that exist in the target range, it will be appended as a new row or column.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3147468" xml-lang="en-US" l10n="U" oldref="22">The data from the consolidation ranges and target range will be saved when you save the document. If you later open a document in which consolidation has been defined, this data will again be available.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153039" xml-lang="en-US" l10n="U" oldref="33"><link href="text/scalc/01/12070000.xhp" name="Data - Consolidate">Data - Consolidate</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153191" role="paragraph" l10n="U" oldref="34">During consolidation, the contents of the cells from several sheets will be combined in one place.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id892056" role="heading" level="2" l10n="NEW">To Combine Cell Contents</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151073" role="listitem" l10n="U" oldref="6">Open the document that contains the cell ranges to be consolidated.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154513" role="listitem" l10n="U" oldref="7">Choose <item type="menuitem">Data - Consolidate</item> to open the <emph>Consolidate</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147345" role="listitem" l10n="U" oldref="8">From the <emph>Source data area</emph> box select a source cell range to consolidate with other areas.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149209" role="listitem" l10n="U" oldref="9">If the range is not named, click in the field next to the <emph>Source data area</emph>. A blinking text cursor appears. Type a reference for the first source data range or select the range with the mouse.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155529" role="listitem" l10n="U" oldref="10">Click <emph>Add</emph> to insert the selected range in the <emph>Consolidation areas</emph> field.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153816" role="listitem" l10n="U" oldref="11">Select additional ranges and click <emph>Add</emph> after each selection.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3157983" role="listitem" l10n="U" oldref="12">Specify where you want to display the result by selecting a target range from the <emph>Copy results to</emph> box.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150215" role="listitem" l10n="U" oldref="13">If the target range is not named, click in the field next to <emph>Copy results to</emph> and enter the reference of the target range. Alternatively, you can select the range using the mouse or position the cursor in the top left cell of the target range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153813" role="listitem" l10n="U" oldref="14">Select a function from the <emph>Function</emph> box. The function specifies how the values of the consolidation ranges are linked. The "Sum" function is the default setting.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149315" role="listitem" l10n="U" oldref="15">Click <emph>OK</emph> to consolidate the ranges.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW">Additional Settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147250" role="paragraph" l10n="U" oldref="16">Click <emph>More</emph> in the <emph>Consolidate</emph> dialog to display additional settings:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156400" role="listitem" l10n="U" oldref="17">Select <emph>Link to source data</emph> to insert the formulas that generate the results in the target range, rather than the actual results. If you link the data, any values modified in the source range are automatically updated in the target range.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150538" role="listitem" l10n="U" oldref="18">The corresponding cell references in the target range are inserted in consecutive rows, which are automatically ordered and then hidden from view. Only the final result, based on the selected function, is displayed.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149945" role="listitem" l10n="U" oldref="19">Under <emph>Consolidate by</emph>, select either <emph>Row labels</emph> or <emph>Column labels</emph> if the cells of the source data range are not to be consolidated corresponding to the identical position of the cell in the range, but instead according to a matching row label or column label.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3157871" role="listitem" l10n="U" oldref="20">To consolidate by row labels or column labels, the label must be contained in the selected source ranges.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150478" role="note" l10n="U" oldref="21">The text in the labels must be identical, so that rows or columns can be accurately matched. If the row or column label does not match any that exist in the target range, it will be appended as a new row or column.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147468" role="paragraph" l10n="U" oldref="22">The data from the consolidation ranges and target range will be saved when you save the document. If you later open a document in which consolidation has been defined, this data will again be available.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3153039" role="paragraph" l10n="U" oldref="33"><link href="text/scalc/01/12070000.xhp" name="Data - Consolidate">Data - Consolidate</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index b9108f68f8..5fc3c3f65c 100755
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csv_files.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,9 @@
  ************************************************************************
  -->
  
-	
 <meta>
 <topic id="textscalcguidecsv_filesxml" indexer="include">
-<title id="tit" xml-lang="en-US"> Importing and Exporting CSV Files </title>
+<title xml-lang="en-US" id="tit"> Importing and Exporting CSV Files </title>
 <filename>/text/scalc/guide/csv_files.xhp</filename>
 </topic>
 </meta>
@@ -51,67 +47,69 @@
 <bookmark_value>csv files;importing and exporting</bookmark_value>
 <bookmark_value>tables; importing/exporting as text</bookmark_value>
 <bookmark_value>text documents; importing to spreadsheets</bookmark_value>
-</bookmark><comment>MW deleted "importing;text data bases" and copied 4 index entries from scalc/guide/csv_formula.xhp</comment>
-<paragraph role="heading" id="par_idN10862" xml-lang="en-US" level="1" l10n="NEW"><variable id="csv_files"><link href="text/scalc/guide/csv_files.xhp">Opening and Saving Text CSV Files</link>
+<bookmark_value>opening;text csv files</bookmark_value>
+<bookmark_value>saving;as text csv</bookmark_value>
+</bookmark><comment>MW deleted "importing;text data bases" and copied 4 index entries from scalc/guide/csv_formula.xhp</comment><comment>mw added "saving;" and "opening;"</comment>
+<paragraph xml-lang="en-US" id="par_idN10862" role="heading" level="1" l10n="NEW"><variable id="csv_files"><link href="text/scalc/guide/csv_files.xhp">Opening and Saving Text CSV Files</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10880" xml-lang="en-US" l10n="NEW">Comma Separated Values (CSV) is text file format that you can use to exchange data from a database or a spreadsheet between applications. Each line in a Text CSV file represents a record in the database, or a row in a spreadsheet. Each field in a database record or cell in a spreadsheet row is usually separated by a comma. However, you can use other characters to delimit a field, such as a tabulator character.</paragraph>
-<paragraph role="paragraph" id="par_idN10886" xml-lang="en-US" l10n="NEW">If the content of a field or cell contains a comma, the contents of the field or cell <emph>must</emph> be enclosed by single quotes (') or double quotes (").</paragraph>
-<paragraph role="heading" id="par_idN10890" xml-lang="en-US" level="2" l10n="CHG">To Open a Text CSV File in Calc</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10880" role="paragraph" l10n="NEW">Comma Separated Values (CSV) is a text file format that you can use to exchange data from a database or a spreadsheet between applications. Each line in a Text CSV file represents a record in the database, or a row in a spreadsheet. Each field in a database record or cell in a spreadsheet row is usually separated by a comma. However, you can use other characters to delimit a field, such as a tabulator character.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10886" role="paragraph" l10n="NEW">If the field or cell contains a comma, the field or cell <emph>must</emph> be enclosed by single quotes (') or double quotes (").</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10890" role="heading" level="2" l10n="CHG">To Open a Text CSV File in Calc</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN10897" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10897" role="listitem" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1089F" xml-lang="en-US" l10n="NEW">Locate the CSV file that you want to open.</paragraph>
-<paragraph role="paragraph" id="par_idN108A2" xml-lang="en-US" l10n="NEW">If the file has a *.csv extension, select the file.</paragraph>
-<paragraph role="paragraph" id="par_idN108A5" xml-lang="en-US" l10n="NEW">If the CSV file has another extension, select the file, and then select "Text CSV" in the <emph>File type</emph> box</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1089F" role="listitem" l10n="NEW">Locate the CSV file that you want to open.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108A2" role="listitem" l10n="NEW">If the file has a *.csv extension, select the file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108A5" role="listitem" l10n="NEW">If the CSV file has another extension, select the file, and then select "Text CSV" in the <item type="menuitem">File type</item> box</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1082D" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10834" xml-lang="en-US" l10n="NEW">The <emph>Text Import</emph> dialog opens.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1082D" role="listitem" l10n="NEW">Click <item type="menuitem">Open</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10834" role="listitem" l10n="NEW">The <item type="menuitem">Text Import</item> dialog opens.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN108B1" xml-lang="en-US" l10n="NEW">Specify the options to divide the text in the file into columns.</paragraph>
-<paragraph role="paragraph" id="par_idN108BB" xml-lang="en-US" l10n="NEW">You can preview the layout of the imported data at the bottom of the <emph>Text Import</emph> dialog. </paragraph>
-<paragraph role="paragraph" id="par_id8444166" xml-lang="en-US" l10n="NEW">Right-click a column in the preview to set the format or to hide the column.</paragraph>
-<paragraph role="tip" id="par_idN108E2" xml-lang="en-US" l10n="NEW">If the CSV file uses a text delimiter character that is not listed in the <emph>Text delimiter</emph> box, click in the box, and type the character.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108B1" role="listitem" l10n="NEW">Specify the options to divide the text in the file into columns.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108BB" role="listitem" l10n="NEW">You can preview the layout of the imported data at the bottom of the <item type="menuitem">Text Import</item> dialog. </paragraph>
+<paragraph xml-lang="en-US" id="par_id8444166" role="listitem" l10n="NEW">Right-click a column in the preview to set the format or to hide the column.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108E2" role="tip" l10n="CHG">Check the text delimiter box that matches the character used as text delimiter in the file. In case of an unlisted delimiter, type the character into the input box.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN108C5" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108C5" role="listitem" l10n="NEW">Click <item type="menuitem">OK</item>.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="par_idN108FA" xml-lang="en-US" level="2" l10n="NEW">To Save a Sheet as a Text CSV File</paragraph>
-<paragraph role="note" id="par_idN106FC" xml-lang="en-US" l10n="NEW">When you export a spreadsheet to CSV format, only the data on the current sheet is saved. All other information, including formulas and formatting, is lost.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN108FA" role="heading" level="2" l10n="NEW">To Save a Sheet as a Text CSV File</paragraph>
+<paragraph xml-lang="en-US" id="par_idN106FC" role="note" l10n="NEW">When you export a spreadsheet to CSV format, only the data on the current sheet is saved. All other information, including formulas and formatting, is lost.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN10901" xml-lang="en-US" l10n="NEW">Open the Calc sheet that you want to save as a Text CSV file.</paragraph>
-<paragraph role="note" id="par_idN107AF" xml-lang="en-US" l10n="NEW">Only the current sheet can be exported.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10901" role="listitem" l10n="NEW">Open the Calc sheet that you want to save as a Text CSV file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107AF" role="note" l10n="NEW">Only the current sheet can be exported.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN10905" xml-lang="en-US" l10n="NEW">Choose <emph>File - Save as</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10905" role="listitem" l10n="NEW">Choose <item type="menuitem">File - Save as</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN10915" xml-lang="en-US" l10n="NEW">In the <emph>File name</emph> box, enter a name for the file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10915" role="listitem" l10n="NEW">In the <item type="menuitem">File name</item> box, enter a name for the file.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1090D" xml-lang="en-US" l10n="NEW">In the <emph>File type</emph> box, select "Text CSV".</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1090D" role="listitem" l10n="NEW">In the <item type="menuitem">File type</item> box, select "Text CSV".</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US" l10n="NEW">(Optional) Set the field options for the Text CSV file.</paragraph>
-<paragraph role="paragraph" id="par_idN1091C" xml-lang="en-US" l10n="NEW">Select <emph>Edit filter settings</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN107ED" xml-lang="en-US" l10n="NEW">In the <emph>Export of text files</emph> dialog, select the options that you want.</paragraph>
-<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107DD" role="listitem" l10n="NEW">(Optional) Set the field options for the Text CSV file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1091C" role="listitem" l10n="NEW">Select <item type="menuitem">Edit filter settings</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW">In the <item type="menuitem">Export of text files</item> dialog, select the options that you want.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW">Click <item type="menuitem">OK</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN107FC" xml-lang="en-US" l10n="NEW">Click <emph>Save</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107FC" role="listitem" l10n="NEW">Click <item type="menuitem">Save</item>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
 <embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
 <embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
-<paragraph role="paragraph" id="par_id3155595" xml-lang="en-US" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index 126fe5d3a8..6c044c60b7 100755
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csv_formula.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,66 +32,68 @@
  
 	
 <meta>
-<topic id="textscalcguidecsv_formulaxml" indexer="include">
-<title id="tit" xml-lang="en-US">Importing and Exporting Text Files</title>
-<filename>/text/scalc/guide/csv_formula.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidecsv_formulaxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Importing and Exporting Text Files</title>
+         <filename>/text/scalc/guide/csv_formula.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>csv files;formulas</bookmark_value>
-<bookmark_value>formulas; importing/exporting as csv files</bookmark_value>
-<bookmark_value>exporting;formulas as csv files</bookmark_value>
-<bookmark_value>importing;csv files with formulas</bookmark_value>
+      <bookmark_value>formulas; importing/exporting as csv files</bookmark_value>
+      <bookmark_value>exporting;formulas as csv files</bookmark_value>
+      <bookmark_value>importing;csv files with formulas</bookmark_value>
 </bookmark><comment>mw deleted "inserting;", copied 4 index entries to scalc/guide/csv_files.xhp, changed "csv files;" and "formulas;" and added 2 index entries</comment>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="csv_formula"><link href="text/scalc/guide/csv_formula.xhp" name="Importing and Exporting Text Files">Importing and Exporting CSV Text Files with Formulas</link>
+<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U" oldref="1"><variable id="csv_formula"><link href="text/scalc/guide/csv_formula.xhp" name="Importing and Exporting Text Files">Importing and Exporting CSV Text Files with Formulas</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149402" xml-lang="en-US" l10n="U" oldref="2">Comma separated values (CSV) files are text files that contain the cell contents of a single sheet. Commas, semicolons, or other characters can be used as the field delimiters between the cells. Text strings are put in quotation marks, numbers are written without quotation marks.</paragraph>
-<paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="15">Importing a CSV File</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153709" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>File - Open</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155445" xml-lang="en-US" l10n="U" oldref="17">In the <emph>File type</emph> field, select the format "Text CSV". Select the file and click <emph>Open</emph>. When a file has the .csv extension, the file type is automatically recognized.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="18">You will see the <emph>Import text files</emph> dialog. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id3149255" xml-lang="en-US" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
-<paragraph role="heading" id="hd_id3154022" xml-lang="en-US" level="2" l10n="U" oldref="3">Exporting Formulas and Values as CSV Files</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150342" xml-lang="en-US" l10n="U" oldref="4">Click the sheet to be written as a csv file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166423" xml-lang="en-US" l10n="U" oldref="5">If you want to export the formulas as formulas, for example, in the form =SUM(A1:B5), proceed as follows:</paragraph>
-<paragraph role="listitem" id="par_id3155111" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3150200" xml-lang="en-US" l10n="U" oldref="7">Under <emph>Display</emph>, mark the <emph>Formulas</emph> check box. Click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154484" xml-lang="en-US" l10n="U" oldref="8">If you want to export the calculation results instead of the formulas, do not mark <emph>Formulas</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148702" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Save as</emph>. You will see the <emph>Save as</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153912" xml-lang="en-US" l10n="U" oldref="10">In the<emph> File type</emph> field select the format "Text CSV".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="13">Enter a name and click <emph>Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="23">From the <emph>Export of text files</emph> dialog that appears, select the character set and the field and text delimiters for the data to be exported, and confirm with <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3146781" xml-lang="en-US" l10n="U" oldref="12">Caution: If the numbers use commas as decimal separators or thousands separators, do not select the comma as the field delimiter. If the text contains double quotation marks, you must select the single quotation mark as separator.<comment>not possible to have a table here because that would break the numbering in XML.</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150050" xml-lang="en-US" l10n="U" oldref="14">If necessary, after you have saved, clear the <emph>Formulas</emph> check box to see the calculated results in the table again.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
-<paragraph role="paragraph" id="par_id3155595" xml-lang="en-US" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149402" role="paragraph" l10n="U" oldref="2">Comma separated values (CSV) files are text files that contain the cell contents of a single sheet. Commas, semicolons, or other characters can be used as the field delimiters between the cells. Text strings are put in quotation marks, numbers are written without quotation marks.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150715" role="heading" level="2" l10n="U"
+                 oldref="15">To Import a CSV File</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153709" role="listitem" l10n="U" oldref="16">Choose <emph>File - Open</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155445" role="listitem" l10n="U" oldref="17">In the <emph>File type</emph> field, select the format "Text CSV". Select the file and click <emph>Open</emph>. When a file has the .csv extension, the file type is automatically recognized.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="18">You will see the <item type="menuitem">Text Import</item> dialog. Click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154022" role="heading" level="2" l10n="U" oldref="3">To Export Formulas and Values as CSV Files</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150342" role="listitem" l10n="U" oldref="4">Click the sheet to be written as a csv file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166423" role="listitem" l10n="U" oldref="5">If you want to export the formulas as formulas, for example, in the form =SUM(A1:B5), proceed as follows:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150200" role="listitem" l10n="U" oldref="7">Under <emph>Display</emph>, mark the <emph>Formulas</emph> check box. Click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154484" role="listitem" l10n="U" oldref="8">If you want to export the calculation results instead of the formulas, do not mark <emph>Formulas</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148702" role="listitem" l10n="U" oldref="9">Choose <emph>File - Save as</emph>. You will see the <emph>Save as</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153912" role="listitem" l10n="U" oldref="10">In the<emph/>
+               <item type="menuitem">File type</item> field select the format "Text CSV".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3157978" role="listitem" l10n="U" oldref="13">Enter a name and click <emph>Save</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152869" role="listitem" l10n="U" oldref="23">From the <emph>Export of text files</emph> dialog that appears, select the character set and the field and text delimiters for the data to be exported, and confirm with <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3146781" role="warning" l10n="U" oldref="12">If the numbers use commas as decimal separators or thousands separators, do not select the comma as the field delimiter. If the text contains double quotation marks, you must select the single quotation mark as separator.<comment>not possible to have a table here because that would break the numbering in XML.</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150050" role="listitem" l10n="U" oldref="14">If necessary, after you have saved, clear the <emph>Formulas</emph> check box to see the calculated results in the table again.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
+         <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/currency_format.xhp b/helpcontent2/source/text/scalc/guide/currency_format.xhp
index 1ad6ba0f35..d1c8b1ecd0 100644
--- a/helpcontent2/source/text/scalc/guide/currency_format.xhp
+++ b/helpcontent2/source/text/scalc/guide/currency_format.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: currency_format.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,17 +29,13 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
 <topic id="textscalcguidecurrency_formatxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Cells in Currency Format</title>
+<title xml-lang="en-US" id="tit">Cells in Currency Format</title>
 <filename>/text/scalc/guide/currency_format.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:06:10">FPE: cleaned up, deleted screenshot</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156329"><bookmark_value>currency formats; spreadsheets</bookmark_value>
@@ -53,25 +46,26 @@
 <bookmark_value>defaults;currency formats</bookmark_value>
 <bookmark_value>changing;currency formats</bookmark_value>
 </bookmark><comment>mw changed one index entry</comment>
-<paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="1" l10n="U" oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency_format.xhp" name="Cells in Currency Format">Cells in Currency Format</link>
+<paragraph xml-lang="en-US" id="hd_id3156329" role="heading" level="1" l10n="U"
+oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency_format.xhp" name="Cells in Currency Format">Cells in Currency Format</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <emph>Currency</emph> icon 
-<image id="img_id3150791" src="res/commandimagelist/sc_currencyfield.png" width="4.23mm" height="4.23mm"><alt id="alt_id3150791" xml-lang="en-US">Icon</alt>
-	</image> in the <emph>Formatting </emph>bar to format a number, the cell is given the default currency format set under <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
-<paragraph role="note" id="par_id3150010" xml-lang="en-US" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
-<paragraph role="paragraph" id="par_id3156442" xml-lang="en-US" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
-<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="U" oldref="49">You can change the currency format in the <emph>Format Cells</emph> dialog (choose <emph>Format - Cells - Numbers</emph> tab) by two country settings. In the <emph>Language</emph> combo box select the basic setting for currency symbol, decimal and thousands separators. In the <emph>Format</emph> list box you can select possible variations from the default format for the language.</paragraph>
-<list type="unordered">
+<paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <item type="menuitem">Currency</item> icon 
+<image id="img_id3150791" src="res/commandimagelist/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
+</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150010" role="note" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151075" role="paragraph" l10n="CHG" oldref="49">You can change the currency format in the <item type="menuitem">Format Cells</item> dialog (choose <item type="menuitem">Format - Cells - Numbers</item> tab) by two country settings. In the <item type="menuitem">Language</item> combo box select the basic setting for decimal and thousands separators. In the <item type="menuitem">Format</item> list box you can select the currency symbol and its position.</paragraph>
+<list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="50">For example, if the language is set to "Default" and you are using a german locale setting, the currency format will be "1.234,00 €". A point is used before the thousand digits and a comma before the decimal places. If you now select the subordinate currency format "$ English (US)" from the <emph>Format</emph> list box , you will get the following format: "$ 1.234,00". As you can see, the separators have remained the same. Only the currency symbol has been changed and converted, but the underlying format of the notation remains the same as in the locale setting.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150749" role="listitem" l10n="U" oldref="50">For example, if the language is set to "Default" and you are using a german locale setting, the currency format will be "1.234,00 €". A point is used before the thousand digits and a comma before the decimal places. If you now select the subordinate currency format "$ English (US)" from the <item type="menuitem">Format</item> list box , you will get the following format: "$ 1.234,00". As you can see, the separators have remained the same. Only the currency symbol has been changed and converted, but the underlying format of the notation remains the same as in the locale setting.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3145640" xml-lang="en-US" l10n="U" oldref="51">If, under <emph>Language</emph>, you convert the cells to "English (US)", the English-language locale setting is also transferred and the default currency format is now "$ 1,234.00".</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145640" role="listitem" l10n="U" oldref="51">If, under <item type="menuitem">Language</item>, you convert the cells to "English (US)", the English-language locale setting is also transferred and the default currency format is now "$ 1,234.00".</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
 <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="53"><link href="text/shared/01/05020300.xhp" name="Format - Cell - Numbers">Format - Cell - Numbers</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="53"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/database_define.xhp b/helpcontent2/source/text/scalc/guide/database_define.xhp
index a1de905dda..976f04faa3 100755
--- a/helpcontent2/source/text/scalc/guide/database_define.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_define.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database_define.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,54 +27,51 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidedatabase_definexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Database Ranges</title>
-<filename>/text/scalc/guide/database_define.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-10T11:40:29">FPE: Cleaned up, deleted screenshot
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidedatabase_definexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Database Ranges</title>
+         <filename>/text/scalc/guide/database_define.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154758"><bookmark_value>tables; database ranges</bookmark_value>
-<bookmark_value>database ranges; defining</bookmark_value>
-<bookmark_value>ranges; defining database ranges</bookmark_value>
-<bookmark_value>defining;database ranges</bookmark_value>
+      <bookmark_value>database ranges; defining</bookmark_value>
+      <bookmark_value>ranges; defining database ranges</bookmark_value>
+      <bookmark_value>defining;database ranges</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154758" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="database_define"><link href="text/scalc/guide/database_define.xhp" name="Defining Database Ranges">Defining a Database Range</link>
+<paragraph xml-lang="en-US" id="hd_id3154758" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="database_define"><link href="text/scalc/guide/database_define.xhp" name="Defining Database Ranges">Defining a Database Range</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="81">You can define a range of cells in a spreadsheet to use as a database. Each row in this database range corresponds to a database record and each cell in a row corresponds to a database field. You can sort, group, search, and perform calculations on the range as you would in a database.</paragraph>
-<paragraph role="warning" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="82">You can only edit and access a database range in the spreadsheet that contains the range. You cannot access the database range in the %PRODUCTNAME Data Sources view. </paragraph>
-<paragraph role="heading" id="par_idN10648" xml-lang="en-US" level="2" l10n="NEW">To Define a Database Range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155064" xml-lang="en-US" l10n="CHG" oldref="41">Select the range of cells that you want to define as a database range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10654" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Data - Define Range</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153715" xml-lang="en-US" l10n="U" oldref="72">In the <emph>Name</emph> box, enter a name for the database range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1066A" xml-lang="en-US" l10n="NEW">Click <emph>More</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154253" xml-lang="en-US" l10n="U" oldref="42">Specify the options for the database range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10675" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
-<embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="81">You can define a range of cells in a spreadsheet to use as a database. Each row in this database range corresponds to a database record and each cell in a row corresponds to a database field. You can sort, group, search, and perform calculations on the range as you would in a database.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145801" role="warning" l10n="CHG" oldref="82">You can only edit and access a database range in the spreadsheet that contains the range. You cannot access the database range in the %PRODUCTNAME Data Sources view. </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10648" role="paragraph" l10n="NEW">To define a database range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155064" role="listitem" l10n="CHG" oldref="41">Select the range of cells that you want to define as a database range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10654" role="listitem" l10n="NEW">Choose <item type="menuitem">Data - Define Range</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153715" role="listitem" l10n="U" oldref="72">In the <emph>Name</emph> box, enter a name for the database range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1066A" role="listitem" l10n="NEW">Click <emph>More</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154253" role="listitem" l10n="U" oldref="42">Specify the options for the database range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10675" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
+         <embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/database_filter.xhp b/helpcontent2/source/text/scalc/guide/database_filter.xhp
index 55fa23ad8f..ef57d19561 100755
--- a/helpcontent2/source/text/scalc/guide/database_filter.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_filter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database_filter.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,74 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidedatabase_filterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Filtering Cell Ranges </title>
-<filename>/text/scalc/guide/database_filter.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidedatabase_filterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Filtering Cell Ranges </title>
+         <filename>/text/scalc/guide/database_filter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153541"><bookmark_value>cell ranges;applying/removing filters</bookmark_value>
-<bookmark_value>filtering;cell ranges/database ranges</bookmark_value>
-<bookmark_value>database ranges;applying/removing filters</bookmark_value>
-<bookmark_value>removing;cell range filters</bookmark_value>
-</bookmark><comment>MW changed "cell ranges," added "removing;" and made one "database ranges;" entry out of two. Same for "filtering;"</comment><paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="1" l10n="CHG" oldref="47"><variable id="database_filter"><link href="text/scalc/guide/database_filter.xhp" name="Filtering Cell Ranges">Filtering Cell Ranges</link>
+      <bookmark_value>filtering;cell ranges/database ranges</bookmark_value>
+      <bookmark_value>database ranges;applying/removing filters</bookmark_value>
+      <bookmark_value>removing;cell range filters</bookmark_value>
+</bookmark><comment>MW changed "cell ranges," added "removing;" and made one "database ranges;" entry out of two. Same for "filtering;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153541" role="heading" level="1" l10n="CHG"
+                 oldref="47"><variable id="database_filter"><link href="text/scalc/guide/database_filter.xhp" name="Filtering Cell Ranges">Filtering Cell Ranges</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="CHG" oldref="48">You can use several filters to filter cell ranges in spreadsheets. A standard filter uses the options that you specify to filter the data. An AutoFilter filters data according to a specific value or string. An advanced filter uses filter criteria from specified cells.</paragraph>
-<paragraph role="heading" id="par_idN10682" xml-lang="en-US" level="2" l10n="CHG">To Apply a Standard Filter to a Cell Range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="50">Click in a cell range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10693" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Data - Filter - Standard Filter</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="51">In the <emph>Standard Filter</emph> dialog, specify the filter options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN106A5" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3153143" xml-lang="en-US" l10n="U" oldref="52">The records that match the filter options that you specified are shown.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_id3153728" xml-lang="en-US" level="2" l10n="CHG" oldref="53">To Apply an AutoFilter to a Cell Range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="CHG" oldref="54">Click in a cell range or a database range.</paragraph>
-<paragraph role="tip" id="par_id9303872" xml-lang="en-US" l10n="NEW">If you want to apply multiple AutoFilters to the same sheet, you must first define database ranges, then apply the AutoFilters to the database ranges.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="55">Choose <item type="menuitem">Data - Filter - AutoFilter</item>.</paragraph>
-<paragraph role="listitem" id="par_idN106DB" xml-lang="en-US" l10n="NEW">An arrow button is added to the head of each column in the database range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="56">Click the arrow button in the column that contains the value or string that you want to set as the filter criteria.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10749" xml-lang="en-US" l10n="NEW">Select the value or string that you want to use as the filter criteria.</paragraph>
-<paragraph role="listitem" id="par_idN1074C" xml-lang="en-US" l10n="NEW">The records that match the filter criteria that you selected are shown.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106E8" xml-lang="en-US" level="2" l10n="CHG">To Remove a Filter From a Cell Range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1075C" xml-lang="en-US" l10n="CHG">Click in a filtered cell range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/database_define.xhp#database_define"/>
-<embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
-<embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
-<embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
-<paragraph role="paragraph" id="par_id4525284" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="CHG" oldref="48">You can use several filters to filter cell ranges in spreadsheets. A standard filter uses the options that you specify to filter the data. An AutoFilter filters data according to a specific value or string. An advanced filter uses filter criteria from specified cells.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10682" role="heading" level="2" l10n="CHG">To Apply a Standard Filter to a Cell Range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150398" role="listitem" l10n="CHG" oldref="50">Click in a cell range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10693" role="listitem" l10n="NEW">Choose <item type="menuitem">Data - Filter - Standard Filter</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156422" role="listitem" l10n="CHG" oldref="51">In the <emph>Standard Filter</emph> dialog, specify the filter options that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106A5" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153143" role="paragraph" l10n="U" oldref="52">The records that match the filter options that you specified are shown.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153728" role="heading" level="2" l10n="CHG"
+                 oldref="53">To Apply an AutoFilter to a Cell Range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="CHG" oldref="54">Click in a cell range or a database range.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9303872" role="tip" l10n="NEW">If you want to apply multiple AutoFilters to the same sheet, you must first define database ranges, then apply the AutoFilters to the database ranges.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154944" role="listitem" l10n="U" oldref="55">Choose <item type="menuitem">Data - Filter - AutoFilter</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106DB" role="listitem" l10n="NEW">An arrow button is added to the head of each column in the database range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153878" role="listitem" l10n="U" oldref="56">Click the arrow button in the column that contains the value or string that you want to set as the filter criteria.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10749" role="listitem" l10n="NEW">Select the value or string that you want to use as the filter criteria.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1074C" role="listitem" l10n="NEW">The records that match the filter criteria that you selected are shown.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN106E8" role="heading" level="2" l10n="CHG">To Remove a Filter From a Cell Range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1075C" role="paragraph" l10n="CHG">Click in a filtered cell range.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106EC" role="paragraph" l10n="NEW">Choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/database_define.xhp#database_define"/>
+         <embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
+         <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
+         <embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
+         <paragraph xml-lang="en-US" id="par_id4525284" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/database_sort.xhp b/helpcontent2/source/text/scalc/guide/database_sort.xhp
index 0a274439f3..477bf7a1ba 100755
--- a/helpcontent2/source/text/scalc/guide/database_sort.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_sort.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database_sort.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,40 +29,42 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidedatabase_sortxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sorting Database Ranges</title>
-<filename>/text/scalc/guide/database_sort.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidedatabase_sortxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Sorting Data </title>
+         <filename>/text/scalc/guide/database_sort.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150767"><bookmark_value>database ranges; sorting</bookmark_value>
-<bookmark_value>sorting; database ranges</bookmark_value>
-<bookmark_value>data;sorting in databases</bookmark_value>
+      <bookmark_value>sorting; database ranges</bookmark_value>
+      <bookmark_value>data;sorting in databases</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="1" l10n="U" oldref="44"><variable id="database_sort"><link href="text/scalc/guide/database_sort.xhp" name="Sorting Database Ranges">Sorting Database Ranges</link>
+<paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="1" l10n="U"
+                 oldref="44"><variable id="database_sort"><link href="text/scalc/guide/database_sort.xhp" name="Sorting Database Ranges">Sorting Data</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3145751" xml-lang="en-US" l10n="U" oldref="45">Click in a database range.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Data - Sort</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10645" xml-lang="en-US" l10n="NEW">Select the sort options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/database_define.xhp#database_define"/>
-<embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
-<paragraph role="paragraph" id="par_id1846980" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145751" role="listitem" l10n="U" oldref="45">Click in a database range.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id121020081121549" role="listitem" l10n="NEW">If you select a range of cells, only these cells will get sorted. If you just click one cell without selecting, then the whole database range will get sorted.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10635" role="listitem" l10n="NEW">Choose <item type="menuitem">Data - Sort</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id121020081121547" role="listitem" l10n="NEW">The range of cells that will get sorted is shown in inverted colors.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10645" role="listitem" l10n="NEW">Select the sort options that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1063D" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/database_define.xhp#database_define"/>
+         <embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
+         <paragraph xml-lang="en-US" id="par_id1846980" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot.xhp b/helpcontent2/source/text/scalc/guide/datapilot.xhp
index 4ed3afe3c9..9bc65aedf7 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
index a2c3aad4e2..e605818255 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_createtable.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,65 +27,64 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidedatapilot_createtablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating DataPilot Tables</title>
-<filename>/text/scalc/guide/datapilot_createtable.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T12:09:44">UFI: fix to #i22166#, deleted 3 hard-to-localize images
-YJ: checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidedatapilot_createtablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating DataPilot Tables</title>
+         <filename>/text/scalc/guide/datapilot_createtable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148491"><bookmark_value>DataPilot tables</bookmark_value>
-<bookmark_value>DataPilot function; calling up and applying</bookmark_value>
+      <bookmark_value>DataPilot function; calling up and applying</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3148491" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="datapilot_createtable"><link href="text/scalc/guide/datapilot_createtable.xhp" name="Creating DataPilot Tables">Creating DataPilot Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3148491" role="heading" level="1" l10n="U" oldref="7"><variable id="datapilot_createtable"><link href="text/scalc/guide/datapilot_createtable.xhp" name="Creating DataPilot Tables">Creating DataPilot Tables</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="8">Position the cursor within a range of cells containing values, row and column headings.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Data - DataPilot - Start</emph>. The <emph>Select Source</emph> dialog appears. Choose <emph>Current selection</emph> and confirm with <emph>OK</emph>. The table headings are shown as buttons in the <emph>DataPilot</emph> dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150868" xml-lang="en-US" l10n="CHG" oldref="10">Drag the desired buttons into one of the four areas.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7599414" xml-lang="en-US" l10n="NEW">Drag a button to the <emph>Page Fields</emph> area to create a button and a listbox on top of the generated datapilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter.</paragraph>
-<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="CHG" oldref="11">If the button is dropped in the <emph>Data Fields</emph> area it will be given a caption that also shows the formula that will be used to calculate the data.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="16">By double-clicking on one of the fields in the <emph>Data Fields</emph> area you can call up the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="17">Use the <emph>Data Field</emph> dialog to select the calculations to be used for the data. To make a multiple selection, press the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key while clicking the desired calculation.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150329" xml-lang="en-US" l10n="CHG" oldref="13">The order of the buttons can be changed at any time by moving them to a different position in the area with the mouse.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153714" xml-lang="en-US" l10n="U" oldref="14">Remove a button by dragging it back to the area of the other buttons at the right of the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="15">To open the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog, double-click one of the buttons in the <emph>Row</emph> or <emph>Column</emph> area. Use the dialog to select if and to what extent <item type="productname">%PRODUCTNAME</item> calculates display subtotals.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US" l10n="CHG" oldref="18">Exit the DataPilot dialog by pressing OK. A <emph>Filter</emph> button will now be inserted, or a page button for every data field that you dropped in the <emph>Page Fields</emph> area. The DataPilot table is inserted further down.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
-<embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
-<embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
-<embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
-<embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
-<embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
-<embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
-</section>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156023" role="listitem" l10n="U" oldref="8">Position the cursor within a range of cells containing values, row and column headings.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147264" role="listitem" l10n="CHG" oldref="9">Choose <emph>Data - DataPilot - Start</emph>. The <emph>Select Source</emph> dialog appears. Choose <emph>Current selection</emph> and confirm with <emph>OK</emph>. The table headings are shown as buttons in the <emph>DataPilot</emph> dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="CHG" oldref="10">Drag the desired buttons into one of the four areas.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id7599414" role="paragraph" l10n="NEW">Drag a button to the <emph>Page Fields</emph> area to create a button and a listbox on top of the generated datapilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154011" role="paragraph" l10n="CHG" oldref="11">If the button is dropped in the <emph>Data Fields</emph> area it will be given a caption that also shows the formula that will be used to calculate the data.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146974" role="listitem" l10n="CHG" oldref="16">By double-clicking on one of the fields in the <emph>Data Fields</emph> area you can call up the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" l10n="U" oldref="17">Use the <item type="menuitem">Data Field</item> dialog to select the calculations to be used for the data. To make a multiple selection, press the <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>key while clicking the desired calculation.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150329" role="listitem" l10n="CHG" oldref="13">The order of the buttons can be changed at any time by moving them to a different position in the area with the mouse.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153714" role="listitem" l10n="U" oldref="14">Remove a button by dragging it back to the area of the other buttons at the right of the dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147338" role="listitem" l10n="U" oldref="15">To open the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog, double-click one of the buttons in the <emph>Row</emph> or <emph>Column</emph> area. Use the dialog to select if and to what extent <item type="productname">%PRODUCTNAME</item> calculates display subtotals.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154020" role="paragraph" l10n="CHG" oldref="18">Exit the DataPilot dialog by pressing OK. A <emph>Filter</emph> button will now be inserted, or a page button for every data field that you dropped in the <emph>Page Fields</emph> area. The DataPilot table is inserted further down.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
+         <embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
+         <embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
+         <embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
+         <embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
+         <embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
+         <embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
index 8f8b49eaef..de85d0d9ff 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_deletetable.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,33 +27,31 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidedatapilot_deletetablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Deleting DataPilot Tables</title>
-<filename>/text/scalc/guide/datapilot_deletetable.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-09T08:34:40">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidedatapilot_deletetablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Deleting DataPilot Tables</title>
+         <filename>/text/scalc/guide/datapilot_deletetable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>DataPilot function; deleting tables</bookmark_value>
-<bookmark_value>deleting;DataPilot tables</bookmark_value>
+      <bookmark_value>deleting;DataPilot tables</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="datapilot_deletetable"><link href="text/scalc/guide/datapilot_deletetable.xhp" name="Deleting DataPilot Tables">Deleting DataPilot Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="datapilot_deletetable"><link href="text/scalc/guide/datapilot_deletetable.xhp" name="Deleting DataPilot Tables">Deleting DataPilot Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="32">In order to delete a DataPilot table, select any cell in the DataPilot table, then choose <emph>Delete</emph> in the context menu.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
-<embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
-<embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
-<embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
-<embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
-<embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154014" role="paragraph" l10n="U" oldref="32">In order to delete a DataPilot table, select any cell in the DataPilot table, then choose <emph>Delete</emph> in the context menu.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
+         <embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
+         <embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
+         <embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
+         <embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
+         <embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
index 802da43faa..3e5ac91aa7 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_edittable.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,36 +29,35 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidedatapilot_edittablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Editing DataPilot Tables</title>
-<filename>/text/scalc/guide/datapilot_edittable.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidedatapilot_edittablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Editing DataPilot Tables</title>
+         <filename>/text/scalc/guide/datapilot_edittable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148663"><bookmark_value>DataPilot function; editing tables</bookmark_value>
-<bookmark_value>editing;DataPilot tables</bookmark_value>
+      <bookmark_value>editing;DataPilot tables</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="1" l10n="U" oldref="25"><variable id="datapilot_edittable"><link href="text/scalc/guide/datapilot_edittable.xhp" name="Editing DataPilot Tables">Editing DataPilot Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3148663" role="heading" level="1" l10n="U"
+                 oldref="25"><variable id="datapilot_edittable"><link href="text/scalc/guide/datapilot_edittable.xhp" name="Editing DataPilot Tables">Editing DataPilot Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="26">Click one of the buttons in the table that the DataPilot has created and hold the mouse button down. A special symbol will appear next to the mouse pointer.</paragraph>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="27">By dragging the button to a different position in the same row you can alter the order of the columns. If you drag a button to the left edge of the table into the row headings area, you can change a column into a row.</paragraph>
-<paragraph role="paragraph" id="par_id1648915" xml-lang="en-US" l10n="NEW">In the DataPilot dialog, you can drag a button to the <emph>Page Fields</emph> area to create a button and a listbox on top of the generated DataPilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter.</paragraph>
-<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="29">To remove a button from the table, just drag it out of the DataPilot table. Release the mouse button when the mouse pointer positioned within the sheet has become a 'not allowed' icon. The button is deleted.</paragraph>
-<paragraph role="paragraph" id="par_id3156442" xml-lang="en-US" l10n="U" oldref="40">To edit the DataPilot table, click a cell inside the DataPilot table and open the context menu. In the context menu you find the command <emph>Start</emph>, which displays the <emph>DataPilot</emph> dialog for the current DataPilot table.</paragraph>
-<paragraph role="paragraph" id="par_id2666096" xml-lang="en-US" l10n="NEW">In the DataPilot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields.</paragraph>
-<paragraph role="tip" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="38">By double-clicking on some buttons inside the DataPilot table you can hide the subelements below it.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
-<embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
-<embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
-<embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
-<embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
-<embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
-<embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150868" role="paragraph" l10n="U" oldref="26">Click one of the buttons in the table that the DataPilot has created and hold the mouse button down. A special symbol will appear next to the mouse pointer.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="27">By dragging the button to a different position in the same row you can alter the order of the columns. If you drag a button to the left edge of the table into the row headings area, you can change a column into a row.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1648915" role="paragraph" l10n="NEW">In the DataPilot dialog, you can drag a button to the <emph>Page Fields</emph> area to create a button and a listbox on top of the generated DataPilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="U" oldref="29">To remove a button from the table, just drag it out of the DataPilot table. Release the mouse button when the mouse pointer positioned within the sheet has become a 'not allowed' icon. The button is deleted.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="40">To edit the DataPilot table, click a cell inside the DataPilot table and open the context menu. In the context menu you find the command <emph>Start</emph>, which displays the <emph>DataPilot</emph> dialog for the current DataPilot table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2666096" role="paragraph" l10n="NEW">In the DataPilot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
+         <embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
+         <embed href="text/scalc/guide/datapilot_filtertable.xhp#datapilot_filtertable"/>
+         <embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
+         <embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
+         <embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
+         <embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
index a0a240194a..65d2663b99 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_filtertable.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,34 +29,31 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidedatapilot_filtertablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Filtering DataPilot Tables</title>
-<filename>/text/scalc/guide/datapilot_filtertable.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-18T11:36:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidedatapilot_filtertablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Filtering DataPilot Tables</title>
+         <filename>/text/scalc/guide/datapilot_filtertable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150792"><bookmark_value>DataPilot function; filtering tables</bookmark_value>
-<bookmark_value>filtering;DataPilot tables</bookmark_value>
+      <bookmark_value>filtering;DataPilot tables</bookmark_value>
 </bookmark><comment>mw deleted "filters;"</comment>
-<paragraph role="heading" id="hd_id3150792" xml-lang="en-US" level="1" l10n="U" oldref="35"><variable id="datapilot_filtertable"><link href="text/scalc/guide/datapilot_filtertable.xhp" name="Filtering DataPilot Tables">Filtering DataPilot Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="1" l10n="U"
+                 oldref="35"><variable id="datapilot_filtertable"><link href="text/scalc/guide/datapilot_filtertable.xhp" name="Filtering DataPilot Tables">Filtering DataPilot Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="36">You can use filters to remove unwanted data from a DataPilot table.</paragraph><comment>UFI: removed help id</comment>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="CHG" oldref="37">Click the <emph>Filter</emph> button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the DataPilot table and select the <emph>Filter</emph> command. The <link href="text/scalc/01/12090103.xhp" name="Filter"><emph>Filter</emph></link> dialog appears. Here you can filter the DataPilot table.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
-<embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
-<embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
-<embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
-<embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
-<embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
-<embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="36">You can use filters to remove unwanted data from a DataPilot table.</paragraph><comment>UFI: removed help id</comment>
+<paragraph xml-lang="en-US" id="par_id3150441" role="paragraph" l10n="CHG" oldref="37">Click the <emph>Filter</emph> button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the DataPilot table and select the <emph>Filter</emph> command. The <link href="text/scalc/01/12090103.xhp" name="Filter"><emph>Filter</emph></link> dialog appears. Here you can filter the DataPilot table.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
+         <embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
+         <embed href="text/scalc/guide/datapilot_edittable.xhp#datapilot_edittable"/>
+         <embed href="text/scalc/guide/datapilot_updatetable.xhp#datapilot_updatetable"/>
+         <embed href="text/scalc/guide/datapilot_grouping.xhp#datapilot_grouping"/>
+         <embed href="text/scalc/guide/datapilot_tipps.xhp#datapilot_tipps"/>
+         <embed href="text/scalc/guide/datapilot_deletetable.xhp#datapilot_deletetable"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
index ff6c685fb3..5610db5c59 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_grouping.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
index 8e8b6727d2..72a1079d11 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_tipps.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
index 0186fe637b..002bd09af0 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datapilot_updatetable.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/dbase_files.xhp b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
index ec3ee09e85..e8e501dc5a 100755
--- a/helpcontent2/source/text/scalc/guide/dbase_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbase_files.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,87 +31,87 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidedbase_filesxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Importing and Exporting dBASE Files </title>
-<filename>/text/scalc/guide/dbase_files.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidedbase_filesxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Importing and Exporting dBASE Files </title>
+         <filename>/text/scalc/guide/dbase_files.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1226844"><bookmark_value>exporting;spreadsheets to dBASE</bookmark_value>
-<bookmark_value>importing;dBASE files</bookmark_value>
-<bookmark_value>dBASE import/export</bookmark_value>
-<bookmark_value>spreadsheets; importing from/exporting to dBASE files</bookmark_value>
-<bookmark_value>tables in databases;importing dBASE files</bookmark_value>
-</bookmark><comment>mw changed "database tables;" to "tables in databases;" and reduced "spreadsheets;" from two to one entry</comment><paragraph role="heading" id="par_idN10738" xml-lang="en-US" level="1" l10n="NEW"><variable id="dbase_files"><link href="text/scalc/guide/dbase_files.xhp">Importing and Exporting dBASE Files</link>
+      <bookmark_value>importing;dBASE files</bookmark_value>
+      <bookmark_value>dBASE import/export</bookmark_value>
+      <bookmark_value>spreadsheets; importing from/exporting to dBASE files</bookmark_value>
+      <bookmark_value>tables in databases;importing dBASE files</bookmark_value>
+</bookmark><comment>mw changed "database tables;" to "tables in databases;" and reduced "spreadsheets;" from two to one entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10738" role="heading" level="1" l10n="NEW"><variable id="dbase_files"><link href="text/scalc/guide/dbase_files.xhp">Importing and Exporting dBASE Files</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10756" xml-lang="en-US" l10n="CHG">You can open and save data in the dBASE file format (*.dbf file extension) in $[officename] Base or a spreadsheet. In %PRODUCTNAME Base, a dBASE database is a folder that contains files with the .dbf file extension. Each file corresponds to a table in the database. Formulas and formatting are lost when you open and save a dBASE file from %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="par_idN10759" xml-lang="en-US" level="2" l10n="NEW">To Import a dBASE File Into a Spreadsheet</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1071F" xml-lang="en-US" l10n="NEW">Locate the *.dbf file that you want to import. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10730" xml-lang="en-US" l10n="NEW">The <emph>Import dBASE files</emph> dialog opens.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10774" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10777" xml-lang="en-US" l10n="NEW">The dBASE file opens as a new Calc spreadsheet.</paragraph>
-<paragraph role="warning" id="par_idN1074E" xml-lang="en-US" l10n="NEW">If you want to save the spreadsheet as a dBASE file, do not alter or delete the first row in the imported file. This row contains information that is required by a dBASE database.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1077A" xml-lang="en-US" level="2" l10n="NEW">To Import a dBASE File Into a Database Table</paragraph>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">A %PRODUCTNAME Base database table is actually a link to an existing database.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10796" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - New - Database</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10786" xml-lang="en-US" l10n="NEW">In the <emph>File name</emph> box of the <emph>Save As</emph> dialog, enter a name for the database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10792" xml-lang="en-US" l10n="NEW">Click <emph>Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1079A" xml-lang="en-US" l10n="NEW">In the <emph>Database type </emph>box of the <emph>Database Properties</emph> dialog, select "dBASE".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107A6" xml-lang="en-US" l10n="NEW">Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107AE" xml-lang="en-US" l10n="NEW">Click <emph>Browse</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107B6" xml-lang="en-US" l10n="NEW">Locate the directory that contains the dBASE file, and click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US" l10n="NEW">Click <emph>Create</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107F1" xml-lang="en-US" level="2" l10n="NEW">To Export a Spreadsheet to a dBASE File</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107F8" xml-lang="en-US" l10n="NEW">Choose <emph>File - Export</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10800" xml-lang="en-US" l10n="NEW">In the <emph>File format</emph> box, select "dBASE file".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107F9" xml-lang="en-US" l10n="NEW">In the <emph>File name</emph> box, type a name for the dBASE file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10801" xml-lang="en-US" l10n="NEW">Click <emph>Export</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN10808" xml-lang="en-US" l10n="NEW">Only the data on the current sheet is exported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<embed href="text/shared/guide/data_dbase2office.xhp#data_dbase2office"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10756" role="paragraph" l10n="CHG">You can open and save data in the dBASE file format (*.dbf file extension) in $[officename] Base or a spreadsheet. In %PRODUCTNAME Base, a dBASE database is a folder that contains files with the .dbf file extension. Each file corresponds to a table in the database. Formulas and formatting are lost when you open and save a dBASE file from %PRODUCTNAME.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10759" role="heading" level="2" l10n="NEW">To Import a dBASE File Into a Spreadsheet</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1071F" role="paragraph" l10n="NEW">Locate the *.dbf file that you want to import. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">Click <emph>Open</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10730" role="paragraph" l10n="NEW">The <emph>Import dBASE files</emph> dialog opens.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10774" role="paragraph" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10777" role="paragraph" l10n="NEW">The dBASE file opens as a new Calc spreadsheet.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1074E" role="warning" l10n="NEW">If you want to save the spreadsheet as a dBASE file, do not alter or delete the first row in the imported file. This row contains information that is required by a dBASE database.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1077A" role="heading" level="2" l10n="NEW">To Import a dBASE File Into a Database Table</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">A %PRODUCTNAME Base database table is actually a link to an existing database.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10796" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - New - Database</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10786" role="paragraph" l10n="NEW">In the <emph>File name</emph> box of the <emph>Save As</emph> dialog, enter a name for the database.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10792" role="paragraph" l10n="NEW">Click <emph>Save</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1079A" role="paragraph" l10n="NEW">In the <emph>Database type </emph>box of the <emph>Database Properties</emph> dialog, select "dBASE".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107A6" role="paragraph" l10n="NEW">Click <emph>Next</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107AE" role="paragraph" l10n="NEW">Click <emph>Browse</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107B6" role="paragraph" l10n="NEW">Locate the directory that contains the dBASE file, and click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107BE" role="paragraph" l10n="NEW">Click <emph>Create</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107F1" role="heading" level="2" l10n="NEW">To Save a Spreadsheet as a dBASE File</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW">Choose <emph>File - Save As</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10800" role="paragraph" l10n="NEW">In the <emph>File format</emph> box, select "dBASE file".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107F9" role="paragraph" l10n="NEW">In the <emph>File name</emph> box, type a name for the dBASE file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10801" role="paragraph" l10n="NEW">Click <emph>Save</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10808" role="note" l10n="NEW">Only the data on the current sheet is exported.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
+         <embed href="text/shared/guide/data_dbase2office.xhp#data_dbase2office"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/design.xhp b/helpcontent2/source/text/scalc/guide/design.xhp
index 9aabb04671..1df2d7fb4a 100644
--- a/helpcontent2/source/text/scalc/guide/design.xhp
+++ b/helpcontent2/source/text/scalc/guide/design.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: design.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
index 71b635961c..a46d8a26ad 100755
--- a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edit_multitables.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/filters.xhp b/helpcontent2/source/text/scalc/guide/filters.xhp
index d530d44b41..a1c68a1c89 100755
--- a/helpcontent2/source/text/scalc/guide/filters.xhp
+++ b/helpcontent2/source/text/scalc/guide/filters.xhp
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
 	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filters.xhp,v $
- *
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,37 +32,38 @@
  
 	
 <meta>
-<topic id="textscalcguidefiltersxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying Filters</title>
-<filename>/text/scalc/guide/filters.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidefiltersxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Filters</title>
+         <filename>/text/scalc/guide/filters.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153896"><bookmark_value>filters; applying/removing</bookmark_value>
-<bookmark_value>rows;removing/redisplaying with filters</bookmark_value>
-<bookmark_value>removing;filters</bookmark_value>
-</bookmark><comment>MW deleted "filters;showing..." and "clearing;", and changed "filters;introduction" and "rows;"</comment><comment>mw deleted advanced filters</comment>
-<paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="1" l10n="U" oldref="70"><variable id="filters"><link href="text/scalc/guide/filters.xhp" name="Applying Filters">Applying Filters</link>
+      <bookmark_value>rows;removing/redisplaying with filters</bookmark_value>
+      <bookmark_value>removing;filters</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id3153896" role="heading" level="1" l10n="U"
+                 oldref="70"><variable id="filters"><link href="text/scalc/guide/filters.xhp" name="Applying Filters">Applying Filters</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="CHG" oldref="2">Filters and advanced filters allow you to work on certain filtered rows (records) of a data range. In the spreadsheets in $[officename] there are various possibilities for applying filters.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="3">One use for the <emph>AutoFilter</emph> function is to quickly restrict the display to records with identical entries in a data field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="4">In the <emph>Filter</emph> dialog, you can also define ranges which contain the values in particular data fields. You can use the standard filter to connect up to three conditions with either a logical AND or a logical OR operator.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="5">The <emph>Advanced filter</emph> exceeds the three condition limitation and allows up to a total of eight filter conditions. With advanced filters you enter the conditions directly into the sheet.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id9384746" xml-lang="en-US" l10n="NEW">To remove a filter, so that you see all cells again, click inside the area where the filter was applied, then choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
-<paragraph role="note" id="par_idN10663" xml-lang="en-US" l10n="NEW">When you select multiple rows from an area where a filter was applied, then this selection can include rows that are visible and rows that are hidden by the filter. If you then apply formatting, or delete the selected rows, this action then applies only to the visible rows. The hidden rows are not affected. </paragraph>
-<paragraph role="note" id="par_id218817" xml-lang="en-US" l10n="NEW">This is the opposite to rows that you have hidden manually by the <emph>Format - Rows - Hide Rows</emph> command. Manually hidden rows are deleted when you delete a selection that contains them.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/autofilter.xhp#autofilter"/>
-<embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
-<embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="CHG" oldref="2">Filters and advanced filters allow you to work on certain filtered rows (records) of a data range. In the spreadsheets in $[officename] there are various possibilities for applying filters.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155131" role="listitem" l10n="U" oldref="3">One use for the <emph>AutoFilter</emph> function is to quickly restrict the display to records with identical entries in a data field.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146119" role="listitem" l10n="U" oldref="4">In the <emph>Standard Filter</emph> dialog, you can also define ranges which contain the values in particular data fields. You can use the standard filter to connect the conditions with either a logical AND or a logical OR operator.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150010" role="listitem" l10n="U" oldref="5">The <emph>Advanced filter</emph> allows up to a total of eight filter conditions. With advanced filters you enter the conditions directly into the sheet.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9384746" role="tip" l10n="NEW">To remove a filter, so that you see all cells again, click inside the area where the filter was applied, then choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10663" role="note" l10n="NEW">When you select multiple rows from an area where a filter was applied, then this selection can include rows that are visible and rows that are hidden by the filter. If you then apply formatting, or delete the selected rows, this action then applies only to the visible rows. The hidden rows are not affected. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id218817" role="note" l10n="NEW">This is the opposite to rows that you have hidden manually by the <emph>Format - Rows - Hide Rows</emph> command. Manually hidden rows are deleted when you delete a selection that contains them.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/autofilter.xhp#autofilter"/>
+         <embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
+         <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/finding.xhp b/helpcontent2/source/text/scalc/guide/finding.xhp
index a9fead5784..d3bafa15c0 100644
--- a/helpcontent2/source/text/scalc/guide/finding.xhp
+++ b/helpcontent2/source/text/scalc/guide/finding.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: finding.xhp,v $
- * $Revision: 1.4.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/format_table.xhp b/helpcontent2/source/text/scalc/guide/format_table.xhp
index e18ccd3af2..c71896440c 100755
--- a/helpcontent2/source/text/scalc/guide/format_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_table.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: format_table.xhp,v $
- *
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/format_value.xhp b/helpcontent2/source/text/scalc/guide/format_value.xhp
index 842362762f..0ef456f6e1 100644
--- a/helpcontent2/source/text/scalc/guide/format_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: format_value.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,60 +29,56 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Numbers With Decimals</title>
-<filename>/text/scalc/guide/format_value.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T14:05:23">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers; formatting in tables</bookmark_value>
-<bookmark_value>formats; numbers in tables</bookmark_value>
-<bookmark_value>tables; number formats</bookmark_value>
-<bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
-<bookmark_value>decimal places;formatting numbers</bookmark_value>
-<bookmark_value>formatting;numbers with decimals</bookmark_value>
-<bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
-<bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
-<bookmark_value>deleting; decimal places</bookmark_value>
-<bookmark_value>decimal places; adding/deleting</bookmark_value>
-</bookmark><comment>mw changed one index entry</comment><comment>mw inserted three index entries from scalc/02/02160000.xhp and three index entries from scalc/02/02170000.xhp. Then changed three index entries and deleted two.</comment><comment>mw deleted one "number formats;..." entry and changed the other</comment>
-<paragraph role="heading" id="hd_id3145367" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
+      <topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting Numbers With Decimals</title>
+         <filename>/text/scalc/guide/format_value.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers;formatting decimals</bookmark_value>
+      <bookmark_value>formats; numbers in tables</bookmark_value>
+      <bookmark_value>tables; number formats</bookmark_value>
+      <bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
+      <bookmark_value>decimal places;formatting numbers</bookmark_value>
+      <bookmark_value>formatting;numbers with decimals</bookmark_value>
+      <bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
+      <bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
+      <bookmark_value>deleting; decimal places</bookmark_value>
+      <bookmark_value>decimal places; adding/deleting</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145367" role="heading" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
-<paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149121">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="E">
-<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149021" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154012" role="paragraph" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147394" role="listitem" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153157" role="listitem" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
+         </listitem>
+      </list>
+      <table id="tbl_id3149121">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="E">
+<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149021">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149256" xml-lang="en-US" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149256" role="paragraph" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="relatedtopics">
-<embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
-<embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
-<embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
+         <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+         <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+         <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
index 659656e40c..4775ce3511 100755
--- a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: format_value_userdef.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,115 +29,108 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">User-defined Number Formats</title>
-<filename>/text/scalc/guide/format_value_userdef.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers; user-defined formatting in tables</bookmark_value>
-<bookmark_value>formatting; user-defined numbers</bookmark_value>
-<bookmark_value>number formats; millions</bookmark_value>
-<bookmark_value>format codes; user-defined number formats</bookmark_value>
-</bookmark>
-  <comment>mw copied "format codes;" from shared/01/05020300.xhp</comment>
-  <paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U" oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link> 
+      <topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">User-defined Number Formats</title>
+         <filename>/text/scalc/guide/format_value_userdef.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers;user-defined formatting</bookmark_value>
+      <bookmark_value>formatting; user-defined numbers</bookmark_value>
+      <bookmark_value>number formats; millions</bookmark_value>
+      <bookmark_value>format codes; user-defined number formats</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U"
+                 oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
-  <table id="tbl_id3153157">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <section id="relatedtopics">
-   
-   <embed href="text/scalc/guide/format_value.xhp#format_value"/>
-   <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
-   <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-   <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
+      <table id="tbl_id3153157">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+         <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+         <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+         <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/formula_copy.xhp b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
index 5198cc0f1c..2719af67ca 100755
--- a/helpcontent2/source/text/scalc/guide/formula_copy.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula_copy.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/formula_enter.xhp b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
index 5c3a77bc8e..64ba7745e8 100644
--- a/helpcontent2/source/text/scalc/guide/formula_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula_enter.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -67,7 +64,7 @@
 <paragraph role="paragraph" id="par_id4206976" xml-lang="en-US" l10n="NEW">You can also press the + or - key on the numerical keyboard to start a formula. NumLock must be "on". For example, press the following keys in succession:</paragraph>
 <paragraph role="code" id="par_id1836909" xml-lang="en-US" l10n="NEW">+ 5 0 - 8 Enter</paragraph>
 <paragraph role="paragraph" id="par_id8171330" xml-lang="en-US" l10n="NEW">You see the result <item type="literal">42</item> in the cell. The cell contains the formula <item type="literal">=+50-8</item>.</paragraph>
-<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color </emph>can be deactivated under <link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link>.</paragraph>
+<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color</emph> can be deactivated under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link>.</paragraph>
 <paragraph role="tip" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="7"><variable id="tip">If you would like to view the calculation of individual elements of a formula, select the respective elements and press F9. For example, in the formula =SUM(A1:B12)*SUM(C1:D12) select the section SUM(C1:D12) and press F9 to view the subtotal for this area. 
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="5">If an error occurs when creating the formula, an <link href="text/scalc/05/02140000.xhp" name="error message">error message</link> appears in the active cell.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_value.xhp b/helpcontent2/source/text/scalc/guide/formula_value.xhp
index c59eccd843..fc32f100e6 100755
--- a/helpcontent2/source/text/scalc/guide/formula_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_value.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula_value.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,15 +53,15 @@
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="2">If you want to display the formulas in the cells, for example in the form =SUM(A1:B5), proceed as follows:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="4">In the <emph>Display</emph> area mark the <emph>Formulas</emph> box. Click OK.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="5">If you want to view the calculation results instead of the formula, do not mark the Formulasbox.</paragraph>
+<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="5">If you want to view the calculation results instead of the formula, do not mark the Formulas box.</paragraph>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/formulas.xhp b/helpcontent2/source/text/scalc/guide/formulas.xhp
index b9eebbd69d..47ee3ac0c3 100644
--- a/helpcontent2/source/text/scalc/guide/formulas.xhp
+++ b/helpcontent2/source/text/scalc/guide/formulas.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formulas.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -109,14 +106,7 @@
 <paragraph role="paragraph" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="36">Calculates the sum of cells B10 to B14 and adds the value to B8.</paragraph>
 </tablecell>
 </tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="CHG" oldref="50">=SUM(B1:B65536)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157982" xml-lang="en-US" l10n="U" oldref="51">Sums all numbers in column B.</paragraph>
-</tablecell>
-</tablerow>
+<comment>removed row with old row limit of 65536</comment>
 </table>
 <paragraph role="paragraph" id="par_id3150109" xml-lang="en-US" l10n="U" oldref="30">It is also possible to nest functions in formulas, as shown in the example. You can also nest functions within functions. The Function Wizard assists you with nested functions.</paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/fraction_enter.xhp b/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
index cd1a96eb05..4e62bfa517 100755
--- a/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fraction_enter.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 <paragraph role="listitem" id="par_id3155133" xml-lang="en-US" l10n="U" oldref="42">Enter "0 1/5" in a cell (without the quotation marks) and press the input key. In the input line above the spreadsheet you will see the value 0.2, which is used for the calculation.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="43">If you enter "0 1/2" AutoCorrect causes the three characters 1, / and 2 to be replaced by a single character. The same applies to 1/4 and 3/4. This replacement is defined in <emph>Tools - AutoCorrect</emph> - <emph>Replace</emph> tab.</paragraph>
+<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="43">If you enter "0 1/2" AutoCorrect causes the three characters 1, / and 2 to be replaced by a single character. The same applies to 1/4 and 3/4. This replacement is defined in <emph>Tools - AutoCorrect Options - Options</emph> tab.</paragraph>
 <paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="44">If you want to see multi-digit fractions such as "1/10", you must change the cell format to the multi-digit fraction view. Open the context menu of the cell, and choose <emph>Format cells. </emph>Select "Fraction" from the <emph>Category</emph> field, and then select "-1234 10/81". You can then enter fractions such as 12/31 or 12/32 - the fractions are, however, automatically reduced, so that in the last example you would see 3/8.</paragraph>
 </section>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/goalseek.xhp b/helpcontent2/source/text/scalc/guide/goalseek.xhp
index 3088a7dde6..a3b04f7ebc 100755
--- a/helpcontent2/source/text/scalc/guide/goalseek.xhp
+++ b/helpcontent2/source/text/scalc/guide/goalseek.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: goalseek.xhp,v $
- *
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/html_doc.xhp b/helpcontent2/source/text/scalc/guide/html_doc.xhp
index 9bffdcd85a..d9d8d855ba 100755
--- a/helpcontent2/source/text/scalc/guide/html_doc.xhp
+++ b/helpcontent2/source/text/scalc/guide/html_doc.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: html_doc.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
index 9612575904..f967cd0cb4 100755
--- a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
+++ b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: integer_leading_zero.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,73 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Entering a Number with Leading Zeros</title>
-<filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Entering a Number with Leading Zeros</title>
+         <filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147560"><bookmark_value>zero values; entering leading zeros</bookmark_value>
-<bookmark_value>numbers; with leading zeros</bookmark_value>
-<bookmark_value>leading zeros</bookmark_value>
-<bookmark_value>integers with leading zeros</bookmark_value>
-<bookmark_value>numbers; changing text/number formats</bookmark_value>
-<bookmark_value>cells; changing text/number formats</bookmark_value>
-<bookmark_value>formats; changing text/number</bookmark_value>
-<bookmark_value>text in cells; changing to numbers</bookmark_value>
-<bookmark_value>converting; text to numbers</bookmark_value>
-</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><paragraph role="heading" id="hd_id3147560" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
+      <bookmark_value>numbers; with leading zeros</bookmark_value>
+      <bookmark_value>leading zeros</bookmark_value>
+      <bookmark_value>integers with leading zeros</bookmark_value>
+      <bookmark_value>cells; changing text/number formats</bookmark_value>
+      <bookmark_value>formats; changing text/number</bookmark_value>
+      <bookmark_value>text in cells; changing to numbers</bookmark_value>
+      <bookmark_value>converting;text with leading zeros, into numbers</bookmark_value>
+</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><comment>mw changed "converting;" and deleted "numbers,changing..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3147560" role="heading" level="1" l10n="U"
+                 oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
 </variable></paragraph>
-<section id="inttext">
-<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="E" oldref="66" localize="false"/>
-<paragraph role="paragraph" id="par_id3153158" xml-lang="en-US" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155068" xml-lang="en-US" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="64">Check <emph>Current selection only</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146916" xml-lang="en-US" l10n="U" oldref="65">Click <emph>Replace All</emph>
-</paragraph>
-</listitem>
-</list>
-</section>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-<embed href="text/scalc/guide/format_value.xhp#format_value"/>
-</section>
-</body>
-</helpdocument>
+      <section id="inttext">
+         <paragraph xml-lang="en-US" id="par_id3153194" role="paragraph" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3146119" role="listitem" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3154013" role="listitem" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="E" oldref="66"
+                    localize="false"/>
+         <paragraph xml-lang="en-US" id="par_id3153158" role="paragraph" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3149377" role="listitem" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3154944" role="listitem" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
+               </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
+               </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3155068" role="listitem" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
+               </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3149018" role="listitem" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
+               </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3156382" role="listitem" l10n="U" oldref="64">Check <emph>Current selection only</emph>
+               </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3146916" role="listitem" l10n="U" oldref="65">Click <emph>Replace All</emph>
+               </paragraph>
+            </listitem>
+         </list>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+         <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/keyboard.xhp b/helpcontent2/source/text/scalc/guide/keyboard.xhp
index b8c81b0617..c58fc20933 100644
--- a/helpcontent2/source/text/scalc/guide/keyboard.xhp
+++ b/helpcontent2/source/text/scalc/guide/keyboard.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="E">
-<image id="img_id3150439" src="sc/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3150439" xml-lang="en-US">Icon</alt>
+<image id="img_id3150439" src="formula/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3150439" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/guide/line_fix.xhp b/helpcontent2/source/text/scalc/guide/line_fix.xhp
index 572dcc9097..d883cf22a9 100644
--- a/helpcontent2/source/text/scalc/guide/line_fix.xhp
+++ b/helpcontent2/source/text/scalc/guide/line_fix.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: line_fix.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalcguideline_fixxml" indexer="include" status="PUBLISH">
@@ -55,7 +52,7 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="line_fix"><link href="text/scalc/guide/line_fix.xhp" name="Freezing Rows or Columns as Headers">Freezing Rows or Columns as Headers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="2">If you have long rows or columns of data that extend beyond the viewable area of the spreadsheet, you can freeze them, which allows you to see the columns or rows as you scroll through the rest of the data.</paragraph>
+<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="CHG" oldref="2">If you have long rows or columns of data that extend beyond the viewable area of the sheet, you can freeze some rows or columns, which allows you to see the frozen columns or rows as you scroll through the rest of the data.</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">Select the row below, or the column to the right of the row or column that you want to be in the frozen region. All rows above, or all columns to the left of the selection are frozen.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/main.xhp b/helpcontent2/source/text/scalc/guide/main.xhp
index 1251bffb36..8d23ff37ed 100755
--- a/helpcontent2/source/text/scalc/guide/main.xhp
+++ b/helpcontent2/source/text/scalc/guide/main.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,6 +62,7 @@
 <embed href="text/scalc/guide/format_value.xhp#format_value"/>
 <embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
 <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+<embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>  
 <embed href="text/scalc/guide/note_insert.xhp#note_insert"/>
 <embed href="text/scalc/guide/rename_table.xhp#rename_table"/>
 <embed href="text/scalc/guide/row_height.xhp#row_height"/>
diff --git a/helpcontent2/source/text/scalc/guide/makefile.mk b/helpcontent2/source/text/scalc/guide/makefile.mk
index b3aa776e36..edf07b4aff 100644
--- a/helpcontent2/source/text/scalc/guide/makefile.mk
+++ b/helpcontent2/source/text/scalc/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.18.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -109,6 +105,7 @@ XHPFILES = \
    multioperation.xhp \
    multitables.xhp \
    note_insert.xhp \
+   numbers_text.xhp \
    print_details.xhp \
    print_exact.xhp \
    print_landscape.xhp \
@@ -137,4 +134,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/scalc/guide/mark_cells.xhp b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
index 3f34af06f0..b08450811c 100755
--- a/helpcontent2/source/text/scalc/guide/mark_cells.xhp
+++ b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mark_cells.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,81 +29,87 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting Multiple Cells</title>
-<filename>/text/scalc/guide/mark_cells.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T12:48:20">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Selecting Multiple Cells</title>
+         <filename>/text/scalc/guide/mark_cells.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153361"><bookmark_value>cells; selecting</bookmark_value>
-<bookmark_value>marking cells</bookmark_value>
-<bookmark_value>selecting;cells</bookmark_value>
-<bookmark_value>multiple cells selection</bookmark_value>
-<bookmark_value>selection modes in spreadsheets</bookmark_value>
-<bookmark_value>tables; selecting ranges</bookmark_value>
+      <bookmark_value>marking cells</bookmark_value>
+      <bookmark_value>selecting;cells</bookmark_value>
+      <bookmark_value>multiple cells selection</bookmark_value>
+      <bookmark_value>selection modes in spreadsheets</bookmark_value>
+      <bookmark_value>tables; selecting ranges</bookmark_value>
 </bookmark><comment>mw changed "selection modes..."</comment>
-<paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
+<paragraph xml-lang="en-US" id="hd_id3153361" role="heading" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
-<paragraph role="paragraph" id="par_id3149261" xml-lang="en-US" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="19">Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. You can now move the individual cell by drag and drop.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
-<paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
-<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
-<table id="tbl_id3145643">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="10">Field contents</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="12">STD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148486" xml-lang="en-US" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="14">EXT</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150305" xml-lang="en-US" l10n="U" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="16">ADD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149261" role="paragraph" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="19">Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3163710" role="listitem" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149959" role="listitem" l10n="CHG" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. Release the mouse button. You can now move the individual cell by drag and drop.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154942" role="heading" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1001200901072060" role="paragraph" l10n="NEW">Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1001200901072023" role="paragraph" l10n="NEW">Click the STD / EXT / ADD area in the status bar until it shows ADD. Now click all cells that you want to select.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3146971" role="heading" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
+      <table id="tbl_id3145643">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159264" role="paragraph" l10n="U" oldref="10">Field contents</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155337" role="paragraph" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="U" oldref="12">STD</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148486" role="paragraph" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150090" role="paragraph" l10n="U" oldref="14">EXT</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150305" role="paragraph" l10n="CHG" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked. Alternatively, Shift-click a cell.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145587" role="paragraph" l10n="U" oldref="16">ADD</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154487" xml-lang="en-US" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3154487" role="paragraph" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/matrixformula.xhp b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
index 8bfeed24c7..7f93022c8b 100755
--- a/helpcontent2/source/text/scalc/guide/matrixformula.xhp
+++ b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: matrixformula.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp b/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
index 355fa15071..a9bd366561 100644
--- a/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
+++ b/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: move_dragdrop.xhp,v $
- * $Revision: 1.4.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/multi_tables.xhp b/helpcontent2/source/text/scalc/guide/multi_tables.xhp
index 18ed42e631..e7c28f7edb 100644
--- a/helpcontent2/source/text/scalc/guide/multi_tables.xhp
+++ b/helpcontent2/source/text/scalc/guide/multi_tables.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: multi_tables.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/multioperation.xhp b/helpcontent2/source/text/scalc/guide/multioperation.xhp
index e8885845fd..3c821540ae 100755
--- a/helpcontent2/source/text/scalc/guide/multioperation.xhp
+++ b/helpcontent2/source/text/scalc/guide/multioperation.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <helpdocument version="1.0">
-	
+
 <!--
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: multioperation.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,8 +30,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textscalcguidemultioperationxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Applying Multiple Operations</title>
@@ -52,7 +48,7 @@
 <paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="1" l10n="U" oldref="5"><variable id="multioperation"><link href="text/scalc/guide/multioperation.xhp" name="Applying Multiple Operations">Applying Multiple Operations</link>
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="U" oldref="1">Multiple Operations in Columns or Rows</paragraph>
-<paragraph role="paragraph" id="par_id4123966" xml-lang="en-US" l10n="NEW">The <item type="menuitem">Data - Multiple Operations</item> command provides a planning tool for "what if" questions.In your spreadsheet, you enter a formula to calculate a result from values that are stored in other cells. Then, you set up a cell range where you enter some fixed values, and the Multiple Operations command will calculate the results depending on the formula.</paragraph>
+<paragraph role="paragraph" id="par_id4123966" xml-lang="en-US" l10n="NEW">The <item type="menuitem">Data - Multiple Operations</item> command provides a planning tool for "what if" questions. In your spreadsheet, you enter a formula to calculate a result from values that are stored in other cells. Then, you set up a cell range where you enter some fixed values, and the Multiple Operations command will calculate the results depending on the formula.</paragraph>
 <paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Formula</emph> field, enter the cell reference to the formula that applies to the data range. In the <emph>Column input cell/Row input cell</emph> field, enter the cell reference to the corresponding cell that is part of the formula. This can be explained best by examples:</paragraph>
 <paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="3" l10n="U" oldref="7">Examples</paragraph>
 <paragraph role="paragraph" id="par_id3153189" xml-lang="en-US" l10n="U" oldref="8">You produce toys which you sell for $10 each. Each toy costs $2 to make, in addition to which you have fixed costs of $10,000 per year. How much profit will you make in a year if you sell a particular number of toys?</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/multitables.xhp b/helpcontent2/source/text/scalc/guide/multitables.xhp
index 7dc1f87a3d..0aa8986679 100644
--- a/helpcontent2/source/text/scalc/guide/multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/multitables.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: multitables.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,48 +29,52 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidemultitablesxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Applying Multiple Sheets</title>
-<filename>/text/scalc/guide/multitables.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textscalcguidemultitablesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Multiple Sheets</title>
+         <filename>/text/scalc/guide/multitables.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154759"><bookmark_value>sheets; inserting</bookmark_value>
-<bookmark_value>inserting; sheets</bookmark_value>
-<bookmark_value>sheets; selecting multiple</bookmark_value>
-<bookmark_value>appending sheets</bookmark_value>
-<bookmark_value>selecting;multiple sheets</bookmark_value>
-<bookmark_value>multiple sheets</bookmark_value>
-<bookmark_value>calculating;multiple sheets</bookmark_value>
-</bookmark>
-  <comment>MW moved "sheets;simultaneous.." to edit_multitables.xhp, transferred 2 entries from there and added "calculating;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3154759" role="heading" level="1" l10n="U" oldref="9"><variable id="multitables"><link href="text/scalc/guide/multitables.xhp" name="Applying Multiple Sheets">Applying Multiple Sheets</link> 
+      <bookmark_value>inserting; sheets</bookmark_value>
+      <bookmark_value>sheets; selecting multiple</bookmark_value>
+      <bookmark_value>appending sheets</bookmark_value>
+      <bookmark_value>selecting;multiple sheets</bookmark_value>
+      <bookmark_value>multiple sheets</bookmark_value>
+      <bookmark_value>calculating;multiple sheets</bookmark_value>
+</bookmark><comment>MW moved "sheets;simultaneous.." to edit_multitables.xhp, transferred 2 entries from there and added "calculating;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3154759" role="heading" level="1" l10n="U" oldref="9"><variable id="multitables"><link href="text/scalc/guide/multitables.xhp" name="Applying Multiple Sheets">Applying Multiple Sheets</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3148576" role="heading" level="2" l10n="U" oldref="10">Inserting a Sheet</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154731" role="paragraph" l10n="CHG" oldref="4">Choose <item type="menuitem">Insert - Sheet</item> to insert a new sheet or an existing sheet from another file.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3154491" role="heading" level="2" l10n="U" oldref="11">Selecting Multiple Sheets</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>you can select multiple sheets.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="CHG">You can use <item type="keycode">Shift</item>+<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline></item>+<item type="keycode">Page Up</item> or <item type="keycode">Page Down</item> to select multiple sheets using the keyboard.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2" l10n="U" oldref="12">Undoing a Selection</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline></item>key. The sheet that is currently visible cannot be removed from the selection.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="2" l10n="CHG" oldref="15">Calculating Across Multiple Sheets</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="CHG" oldref="16">You can refer to a range of sheets in a formula by specifying the first and last sheet of the range, for example, <item type="literal">=SUM(Sheet1.A1:Sheet3.A1) </item>sums up all A1 cells on Sheet1 through Sheet3.</paragraph>
-  <section id="relatedtopics">
-   
-   <embed href="text/scalc/guide/multi_tables.xhp#multi_tables"/>
-   <embed href="text/scalc/guide/edit_multitables.xhp#edit_multitables"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3148576" role="heading" level="2" l10n="U"
+                 oldref="10">Inserting a Sheet</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154731" role="paragraph" l10n="CHG" oldref="4">Choose <item type="menuitem">Insert - Sheet</item> to insert a new sheet or an existing sheet from another file.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_SELECTALL" id="bm_id9065824" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id050920091402035" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select all sheets in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_DESELECTALL" id="bm_id9065825" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0509200914020391" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to deselect all sheets in the document, except the current sheet.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154491" role="heading" level="2" l10n="U"
+                 oldref="11">Selecting Multiple Sheets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>you can select multiple sheets.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="CHG">You can use Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down to select multiple sheets using the keyboard.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2" l10n="U"
+                 oldref="12">Undoing a Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. The sheet that is currently visible cannot be removed from the selection.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="2" l10n="CHG"
+                 oldref="15">Calculating Across Multiple Sheets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="CHG" oldref="16">You can refer to a range of sheets in a formula by specifying the first and last sheet of the range, for example, <item type="literal">=SUM(Sheet1.A1:Sheet3.A1) </item>sums up all A1 cells on Sheet1 through Sheet3.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/multi_tables.xhp#multi_tables"/>
+         <embed href="text/scalc/guide/edit_multitables.xhp#edit_multitables"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index 2e177fe750..0b57a89a7a 100755..100644
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: note_insert.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,55 +27,51 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
 
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting and Editing Notes</title>
-<filename>/text/scalc/guide/note_insert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T12:10:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>notes; on cells</bookmark_value>
-<bookmark_value>cells;notes</bookmark_value>
-<bookmark_value>comments; on cells</bookmark_value>
-<bookmark_value>remarks on cells</bookmark_value>
-<bookmark_value>formatting;notes on cells</bookmark_value>
-<bookmark_value>viewing;notes on cells</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Notes">Inserting and Editing Notes</link>
+      <topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting and Editing Comments</title>
+         <filename>/text/scalc/guide/note_insert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>comments; on cells</bookmark_value>
+      <bookmark_value>cells;comments</bookmark_value>
+      <bookmark_value>remarks on cells</bookmark_value>
+      <bookmark_value>formatting;comments on cells</bookmark_value>
+      <bookmark_value>viewing;comments on cells</bookmark_value>
+      <bookmark_value>displaying; comments</bookmark_value>
+</bookmark><comment>MW deleted double index "comments;on cells" and copied "displaying;comments" from shared/optionen/01060100.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a note to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link>. The note is indicated by a small red square, the note indicator, in the cell.</paragraph>
+<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The note is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The comment is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Note</emph> from the context menu of the cell. Doing so keeps the note visible until you deactivate the <emph>Show Note</emph> command from the same context menu.</paragraph>
+<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible note, just click in it. If you delete the entire text of the note, the note itself is deleted.</paragraph>
+<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each note as you like.</paragraph>
+<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each comment as you like.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each note by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the note.</paragraph>
+<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the note indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Note indicator</emph> check box.</paragraph>
+<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Note">Insert - Note</link></paragraph>
+<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
 <embed href="text/scalc/guide/validity.xhp#validity"/>
 </section>
 </body>
diff --git a/helpcontent2/source/text/scalc/guide/numbers_text.xhp b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
new file mode 100644
index 0000000000..de8ade70ee
--- /dev/null
+++ b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textscalcguidenumbers_textxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Converting Text to Numbers</title>
+         <filename>/text/scalc/guide/numbers_text.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>formats; text as numbers</bookmark_value>
+      <bookmark_value>time format conversion</bookmark_value>
+      <bookmark_value>date formats;conversion</bookmark_value>
+      <bookmark_value>converting;text, into numbers</bookmark_value>
+</bookmark><comment>mw changed "converting;" and added two index entries</comment>
+<paragraph xml-lang="en-US" id="hd_id0908200901265171" role="heading" level="1" l10n="NEW"><variable id="numbers_text"><link href="text/scalc/guide/numbers_text.xhp" name="Converting Text to Numbers">Converting Text to Numbers</link>
+</variable></paragraph>
+      <section id="text">
+         <paragraph xml-lang="en-US" id="par_id0908200901265127" role="paragraph" l10n="NEW">Calc converts text inside cells to the respective numeric values if an unambiguous conversion is possible. If no conversion is possible, Calc returns a #VALUE! error.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0908200901265196" role="paragraph" l10n="NEW">Only integer numbers including exponent are converted, and ISO 8601 dates and times in their extended formats with separators. Anything else, like fractional numbers with decimal separators or dates other than ISO 8601, is not converted, as the text string would be locale dependent. Leading and trailing blanks are ignored.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0908200901265220" role="paragraph" l10n="NEW">The following ISO 8601 formats are converted:</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265288" role="paragraph" l10n="NEW">CCYY-MM-DD</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265267" role="paragraph" l10n="NEW">CCYY-MM-DDThh:mm</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265248" role="paragraph" l10n="NEW">CCYY-MM-DDThh:mm:ss</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265374" role="paragraph" l10n="NEW">CCYY-MM-DDThh:mm:ss,s</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265327" role="paragraph" l10n="NEW">CCYY-MM-DDThh:mm:ss.s</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265399" role="paragraph" l10n="NEW">hh:mm</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265347" role="paragraph" l10n="NEW">hh:mm:ss</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265349" role="paragraph" l10n="NEW">hh:mm:ss,s</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id0908200901265342" role="paragraph" l10n="NEW">hh:mm:ss.s</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id0908200901265491" role="paragraph" l10n="NEW">The century code CC may not be omitted. Instead of the T date and time separator, exactly one space character may be used.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0908200901265467" role="paragraph" l10n="NEW">If a date is given, it must be a valid Gregorian calendar date. In this case the optional time must be in the range 00:00 to 23:59:59.99999...</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0908200901265420" role="paragraph" l10n="NEW">If only a time string is given, it may have an hours value of more than 24, while minutes and seconds can have a maximum value of 59.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0908200901265448" role="paragraph" l10n="NEW">The conversion is done for single arguments only, as in =A1+A2, or ="1E2"+1. Cell range arguments are not affected, so SUM(A1:A2) differs from A1+A2 if at least one of the two cells contain a convertible string.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id090820090126540" role="paragraph" l10n="NEW">Strings inside formulas are also converted, such as in ="1999-11-22"+42, which returns the date 42 days after November 22nd, 1999. Calculations involving localized dates as strings inside the formula return an error. For example, the localized date string "11/22/1999" or "22.11.1999" cannot be used for the automatic conversion.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id1005200903485368" role="heading" level="2" l10n="NEW">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1005200903485359" role="paragraph" l10n="NEW">In A1 enter the text <item type="literal">'1e2</item> (which is converted to the number 100 internally).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1005200903485341" role="paragraph" l10n="NEW">In A2 enter <item type="literal">=A1+1</item> (which correctly results in 101).</paragraph>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+         <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
+         <paragraph xml-lang="en-US" id="par_id0908200901265544" role="paragraph" l10n="NEW"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
+         <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/print_details.xhp b/helpcontent2/source/text/scalc/guide/print_details.xhp
index 1a640884fa..048ff87505 100755
--- a/helpcontent2/source/text/scalc/guide/print_details.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_details.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_details.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <bookmark_value>sheets; printing details</bookmark_value>
 <bookmark_value>grids; printing sheet grids</bookmark_value>
 <bookmark_value>formulas; printing, instead of results</bookmark_value>
-<bookmark_value>notes; printing</bookmark_value>
+<bookmark_value>comments; printing</bookmark_value>
 <bookmark_value>charts;printing</bookmark_value>
 <bookmark_value>sheet grids; printing</bookmark_value>
 <bookmark_value>cells; printing grids</bookmark_value>
@@ -69,7 +66,7 @@
 <paragraph role="listitem" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="4">Sheet grid</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="5">Notes</paragraph>
+<paragraph role="listitem" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="5">Comments</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3145801" xml-lang="en-US" l10n="U" oldref="6">Objects and graphics</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/print_exact.xhp b/helpcontent2/source/text/scalc/guide/print_exact.xhp
index d06b40b69a..0f25f2b7bf 100755
--- a/helpcontent2/source/text/scalc/guide/print_exact.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_exact.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_exact.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/print_landscape.xhp b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
index a629382075..71dea28b32 100755
--- a/helpcontent2/source/text/scalc/guide/print_landscape.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_landscape.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,61 +29,62 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguideprint_landscapexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Sheets in Landscape Format</title>
-<filename>/text/scalc/guide/print_landscape.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguideprint_landscapexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing Sheets in Landscape Format</title>
+         <filename>/text/scalc/guide/print_landscape.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153418"><bookmark_value>printing; sheet selections</bookmark_value>
-<bookmark_value>sheets; printing in landscape</bookmark_value>
-<bookmark_value>printing; landscape</bookmark_value>
-<bookmark_value>landscape printing</bookmark_value>
-</bookmark><comment>mw corrected a typo in "printing; sheet..."</comment><paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="print_landscape"><link href="text/scalc/guide/print_landscape.xhp" name="Printing Sheets in Landscape Format">Printing Sheets in Landscape Format</link>
+      <bookmark_value>sheets; printing in landscape</bookmark_value>
+      <bookmark_value>printing; landscape</bookmark_value>
+      <bookmark_value>landscape printing</bookmark_value>
+</bookmark><comment>mw corrected a typo in "printing; sheet..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3153418" role="heading" level="1" l10n="U" oldref="1"><variable id="print_landscape"><link href="text/scalc/guide/print_landscape.xhp" name="Printing Sheets in Landscape Format">Printing Sheets in Landscape Format</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149257" xml-lang="en-US" l10n="U" oldref="2">In order to print a sheet you have a number of interactive options available under <emph>View - Page Break Preview</emph>. Drag the delimiter lines to define the range of printed cells on each page.</paragraph>
-<paragraph role="paragraph" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="15">To print in landscape format, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154020" xml-lang="en-US" l10n="U" oldref="3">Go to the sheet to be printed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150786" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Page</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3150089" xml-lang="en-US" l10n="U" oldref="5">The command is not visible if the sheet has been opened with write protection on. In that case, click the <emph>Edit File </emph>icon on the <emph>Standard</emph> bar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166430" xml-lang="en-US" l10n="U" oldref="6">Select the <emph>Page</emph> tab. Select the <emph>Landscape</emph> paper format and click OK.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150885" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Print</emph>. You will see the <emph>Print</emph> dialog.</paragraph>
-<paragraph role="listitem" id="par_id3156288" xml-lang="en-US" l10n="U" oldref="8">Depending on the printer driver and the operating system, it may be necessary to click the <emph>Properties</emph> button and to change your printer to landscape format there.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149404" xml-lang="en-US" l10n="CHG" oldref="9">In the <emph>Print </emph>dialog under the <emph>Print</emph> heading, select the sheets to be printed:</paragraph>
-<paragraph role="listitem" id="par_id3153305" xml-lang="en-US" l10n="CHG" oldref="10">
-<emph>All sheets</emph> - All sheets will be printed.</paragraph>
-<paragraph role="listitem" id="par_id3148871" xml-lang="en-US" l10n="CHG" oldref="12">
-<emph>Selected sheets</emph> - Only the selected sheets will be printed. All sheets whose names (at the bottom on the sheet tabs) are selected will be printed. By pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while clicking a sheet name you can change this selection.</paragraph>
-<paragraph role="listitem" id="par_id3764763" xml-lang="en-US" l10n="NEW">
-<emph>Selected cells</emph> - All selected cells are printed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id5538804" xml-lang="en-US" l10n="NEW">In the <emph>Print</emph> dialog under the <emph>Print range</emph> heading, from all the paper pages that result from the above selection, you can select the range of paper pages to be printed:</paragraph>
-<paragraph role="listitem" id="par_id14343" xml-lang="en-US" l10n="NEW">
-<emph>All pages</emph> - Print all resulting pages.</paragraph>
-<paragraph role="listitem" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="11">
-<emph>Pages</emph> - Enter the pages to be printed. The pages will also be numbered from the first sheet onwards. If you see in the Page Break Preview that Sheet1 will be printed on 4 pages and you want to print the first two pages of Sheet2, enter 5-6 here.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3145076" xml-lang="en-US" l10n="U" oldref="13">If under <emph>Format - Print ranges</emph> you have defined one or more print ranges, only the contents of these print ranges will be printed.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3156019" xml-lang="en-US" l10n="U" oldref="14"><link href="text/scalc/01/03100000.xhp" name="View - Page Break Preview">View - Page Break Preview</link></paragraph>
-<paragraph role="paragraph" id="par_id8254646" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/printranges.xhp">Defining Print Ranges on a Sheet</link></paragraph>
-<embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149257" role="paragraph" l10n="U" oldref="2">In order to print a sheet you have a number of interactive options available under <emph>View - Page Break Preview</emph>. Drag the delimiter lines to define the range of printed cells on each page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153963" role="paragraph" l10n="U" oldref="15">To print in landscape format, proceed as follows:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154020" role="listitem" l10n="U" oldref="3">Go to the sheet to be printed.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150786" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Page</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150089" role="listitem" l10n="U" oldref="5">The command is not visible if the sheet has been opened with write protection on. In that case, click the <emph>Edit File </emph>icon on the <emph>Standard</emph> bar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166430" role="listitem" l10n="U" oldref="6">Select the <emph>Page</emph> tab. Select the <emph>Landscape</emph> paper format and click OK.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150885" role="listitem" l10n="U" oldref="7">Choose <emph>File - Print</emph>. You will see the <emph>Print</emph> dialog.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156288" role="listitem" l10n="U" oldref="8">Depending on the printer driver and the operating system, it may be necessary to click the <emph>Properties</emph> button and to change your printer to landscape format there.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149404" role="listitem" l10n="CHG" oldref="9">In the <emph>Print </emph>dialog in the <emph>General</emph> tab page, select the contents to be printed:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153305" role="listitem" l10n="CHG" oldref="10">
+               <emph>All sheets</emph> - All sheets will be printed.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3148871" role="listitem" l10n="CHG" oldref="12">
+               <emph>Selected sheets</emph> - Only the selected sheets will be printed. All sheets whose names (at the bottom on the sheet tabs) are selected will be printed. By pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while clicking a sheet name you can change this selection.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3764763" role="listitem" l10n="NEW">
+               <emph>Selected cells</emph> - All selected cells are printed.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5538804" role="listitem" l10n="NEW">From all the paper pages that result from the above selection, you can select the range of paper pages to be printed:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id14343" role="listitem" l10n="NEW">
+               <emph>All pages</emph> - Print all resulting pages.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3148699" role="listitem" l10n="U" oldref="11">
+               <emph>Pages</emph> - Enter the pages to be printed. The pages will also be numbered from the first sheet onwards. If you see in the Page Break Preview that Sheet1 will be printed on 4 pages and you want to print the first two pages of Sheet2, enter 5-6 here.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145076" role="paragraph" l10n="U" oldref="13">If under <emph>Format - Print ranges</emph> you have defined one or more print ranges, only the contents of these print ranges will be printed.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3156019" role="paragraph" l10n="U" oldref="14"><link href="text/scalc/01/03100000.xhp" name="View - Page Break Preview">View - Page Break Preview</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id8254646" role="paragraph" l10n="NEW"><link href="text/scalc/guide/printranges.xhp">Defining Print Ranges on a Sheet</link></paragraph>
+         <embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/print_title_row.xhp b/helpcontent2/source/text/scalc/guide/print_title_row.xhp
index 968c741e66..b4ca26f226 100644
--- a/helpcontent2/source/text/scalc/guide/print_title_row.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_title_row.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_title_row.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/printranges.xhp b/helpcontent2/source/text/scalc/guide/printranges.xhp
index 9d43fb2448..611b298cd4 100755
--- a/helpcontent2/source/text/scalc/guide/printranges.xhp
+++ b/helpcontent2/source/text/scalc/guide/printranges.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printranges.xhp,v $
- *
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/relativ_absolut_ref.xhp b/helpcontent2/source/text/scalc/guide/relativ_absolut_ref.xhp
index 1f8428b0f1..a4b60447d3 100644
--- a/helpcontent2/source/text/scalc/guide/relativ_absolut_ref.xhp
+++ b/helpcontent2/source/text/scalc/guide/relativ_absolut_ref.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: relativ_absolut_ref.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/rename_table.xhp b/helpcontent2/source/text/scalc/guide/rename_table.xhp
index c1182391de..f43a5d288f 100644
--- a/helpcontent2/source/text/scalc/guide/rename_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/rename_table.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rename_table.xhp,v $
- * $Revision: 1.8.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,69 +32,71 @@
  
 	
 <meta>
-<topic id="textscalcguiderename_tablexml" indexer="include">
-<title id="tit" xml-lang="en-US">Renaming Sheets</title>
-<filename>/text/scalc/guide/rename_table.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150398"><bookmark_value>renaming sheets</bookmark_value>
-<bookmark_value>sheet tabs;renaming</bookmark_value>
-<bookmark_value>tables;renaming</bookmark_value>
-<bookmark_value>names; sheets</bookmark_value>
-</bookmark><comment>mw deleted "sheets;..."</comment>
-<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="rename_table"><link href="text/scalc/guide/rename_table.xhp" name="Renaming Sheets">Renaming Sheets</link>
+      <topic id="textscalcguiderename_tablexml" indexer="include">
+         <title xml-lang="en-US" id="tit">Renaming Sheets</title>
+         <filename>/text/scalc/guide/rename_table.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150398"><bookmark_value>renaming;sheets</bookmark_value>
+      <bookmark_value>sheet tabs;renaming</bookmark_value>
+      <bookmark_value>tables;renaming</bookmark_value>
+      <bookmark_value>names; sheets</bookmark_value>
+</bookmark><comment>mw made "renaming sheets" a two level entry.</comment>
+<paragraph xml-lang="en-US" id="hd_id3150398" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="rename_table"><link href="text/scalc/guide/rename_table.xhp" name="Renaming Sheets">Renaming Sheets</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="12">Click the name of the sheet that you want to change.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146976" xml-lang="en-US" l10n="U" oldref="13">Open the context menu and choose the <emph>Rename</emph> command. A dialog box appears where you can enter a new name.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="15">Enter a new name for the sheet and click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Alternatively, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> and click on any sheet name and enter the new name directly.</paragraph>
-<embed href="text/shared/00/00000099.xhp#winmanager"/>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id0909200810502833" xml-lang="en-US" l10n="NEW">Sheet names can contain almost any character. Some naming restrictions apply when you want to save the spreadsheet to Microsoft Excel format.</paragraph>
-<paragraph role="paragraph" id="par_id090920081050283" xml-lang="en-US" l10n="NEW">When saving to Microsoft Excel format, the following characters are not allowed in sheet names:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id090920081050281" xml-lang="en-US" l10n="NEW">colon :</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0909200810502897" xml-lang="en-US" l10n="NEW">back slash \</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id090920081050299" xml-lang="en-US" l10n="NEW">forward slash /</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0909200810502913" xml-lang="en-US" l10n="NEW">question mark ?</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id090920081050298" xml-lang="en-US" l10n="NEW">asterisk *</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0909200810502969" xml-lang="en-US" l10n="NEW">left square bracket [</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0909200810502910" xml-lang="en-US" l10n="NEW">right square bracket ]</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0909200810502971" xml-lang="en-US" l10n="NEW">single quote ' as the first or last character of the name</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id090920081050307" xml-lang="en-US" l10n="NEW">In cell references, a sheet name has to be enclosed in single quotes ' if the name contains other characters than alphanumeric or underscore. A single quote contained within a name has to be escaped by doubling it (two single quotes). For example, you want to reference the cell A1 on a sheet with the following name:</paragraph>
-<paragraph role="paragraph" id="par_id0909200810503071" xml-lang="en-US" l10n="NEW">This year's sheet</paragraph>
-<paragraph role="paragraph" id="par_id0909200810503054" xml-lang="en-US" l10n="NEW">The reference must be enclosed in single quotes, and the one single quote inside the name must be doubled:</paragraph>
-<paragraph role="paragraph" id="par_id0909200810503069" xml-lang="en-US" l10n="NEW">'This year''s sheet'.A1</paragraph>
-<paragraph role="paragraph" id="par_id3155444" xml-lang="en-US" l10n="U" oldref="16">The name of a sheet is independent of the name of the spreadsheet. You enter the spreadsheet name when you save it for the first time as a file. The document can contain up to 256 individual sheets, which can have different names.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/multitables.xhp#multitables"/>
-</section>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155131" role="listitem" l10n="U" oldref="12">Click the name of the sheet that you want to change.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146976" role="listitem" l10n="U" oldref="13">Open the context menu and choose the <emph>Rename</emph> command. A dialog box appears where you can enter a new name.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="15">Enter a new name for the sheet and click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149667" role="listitem" l10n="U" oldref="27">Alternatively, hold down the <switchinline select="sys"><caseinline select="MAC">Option key
+</caseinline><defaultinline>Alt key</defaultinline></switchinline> and click on any sheet name and enter the new name directly.</paragraph>
+            <embed href="text/shared/00/00000099.xhp#winmanager"/>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0909200810502833" role="paragraph" l10n="NEW">Sheet names can contain almost any character. Some naming restrictions apply when you want to save the spreadsheet to Microsoft Excel format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id090920081050283" role="paragraph" l10n="NEW">When saving to Microsoft Excel format, the following characters are not allowed in sheet names:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id090920081050281" role="paragraph" l10n="NEW">colon :</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0909200810502897" role="paragraph" l10n="NEW">back slash \</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id090920081050299" role="paragraph" l10n="NEW">forward slash /</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0909200810502913" role="paragraph" l10n="NEW">question mark ?</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id090920081050298" role="paragraph" l10n="NEW">asterisk *</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0909200810502969" role="paragraph" l10n="NEW">left square bracket [</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0909200810502910" role="paragraph" l10n="NEW">right square bracket ]</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0909200810502971" role="paragraph" l10n="NEW">single quote ' as the first or last character of the name</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id090920081050307" role="paragraph" l10n="NEW">In cell references, a sheet name has to be enclosed in single quotes ' if the name contains other characters than alphanumeric or underscore. A single quote contained within a name has to be escaped by doubling it (two single quotes). For example, you want to reference the cell A1 on a sheet with the following name:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0909200810503071" role="paragraph" l10n="NEW">This year's sheet</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0909200810503054" role="paragraph" l10n="NEW">The reference must be enclosed in single quotes, and the one single quote inside the name must be doubled:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0909200810503069" role="paragraph" l10n="NEW">'This year''s sheet'.A1</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155444" role="paragraph" l10n="U" oldref="16">The name of a sheet is independent of the name of the spreadsheet. You enter the spreadsheet name when you save it for the first time as a file. The document can contain up to 256 individual sheets, which can have different names.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/multitables.xhp#multitables"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
index de02505124..55359b79c4 100755
--- a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rounding_numbers.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,10 +70,10 @@
 <paragraph role="listitem" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="7">In the <emph>Category</emph> field, select <emph>Number</emph>. Under <emph>Options</emph>, change the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To permanently change this everywhere</paragraph>
+<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To change this everywhere</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="10">Go to the <emph>Calculate</emph> page. Modify the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
@@ -85,10 +82,10 @@
 <paragraph role="heading" id="hd_id3154755" xml-lang="en-US" level="3" l10n="U" oldref="11">To calculate with the rounded off numbers instead of the internal exact values</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph> .</paragraph>
+<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the<emph> Precision as shown</emph> field and exit the dialog with OK.</paragraph>
+<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the <emph>Precision as shown</emph> field and exit the dialog with OK.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/row_height.xhp b/helpcontent2/source/text/scalc/guide/row_height.xhp
index 9b6bd3346e..6b658b9403 100644
--- a/helpcontent2/source/text/scalc/guide/row_height.xhp
+++ b/helpcontent2/source/text/scalc/guide/row_height.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: row_height.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp
index dfde2e64f2..a9ff0be2ef 100755
--- a/helpcontent2/source/text/scalc/guide/scenario.xhp
+++ b/helpcontent2/source/text/scalc/guide/scenario.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scenario.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/sorted_list.xhp b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
index 19d91825f1..b880cbf662 100755
--- a/helpcontent2/source/text/scalc/guide/sorted_list.xhp
+++ b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sorted_list.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
   <paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="7">Sort lists allow you to type one piece of information in a cell, then drag it to fill in a consecutive list of items.</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148645" role="paragraph" l10n="U" oldref="4">For example, enter the text "Jan" or "January" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months.</paragraph>
   <paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
   <section id="relatedtopics">
    
    <embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
diff --git a/helpcontent2/source/text/scalc/guide/specialfilter.xhp b/helpcontent2/source/text/scalc/guide/specialfilter.xhp
index 6089618c6a..2f92baf085 100755
--- a/helpcontent2/source/text/scalc/guide/specialfilter.xhp
+++ b/helpcontent2/source/text/scalc/guide/specialfilter.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: specialfilter.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/super_subscript.xhp b/helpcontent2/source/text/scalc/guide/super_subscript.xhp
index c3658863ae..d58aaa4734 100755
--- a/helpcontent2/source/text/scalc/guide/super_subscript.xhp
+++ b/helpcontent2/source/text/scalc/guide/super_subscript.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: super_subscript.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp b/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp
index 19fe8186d8..dccab8dd4f 100644
--- a/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_cellmerge.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,47 +29,44 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Merging and Splitting Cells</title>
-<filename>/text/scalc/guide/table_cellmerge.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-05T12:29:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Merging and Splitting Cells</title>
+         <filename>/text/scalc/guide/table_cellmerge.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147240"><bookmark_value>cells; merging/unmerging</bookmark_value>
-<bookmark_value>tables; merging cells</bookmark_value>
-<bookmark_value>cell merges</bookmark_value>
-<bookmark_value>unmerging cells</bookmark_value>
-<bookmark_value>merging;cells</bookmark_value>
+      <bookmark_value>tables; merging cells</bookmark_value>
+      <bookmark_value>cell merges</bookmark_value>
+      <bookmark_value>unmerging cells</bookmark_value>
+      <bookmark_value>merging;cells</bookmark_value>
 </bookmark><comment>MW made "cell merges;..." a one level entry</comment>
-<paragraph role="heading" id="hd_id8005005" xml-lang="en-US" level="1" l10n="NEW"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merging and Unmerging Cells</link>
+<paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1" l10n="NEW"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merging and Unmerging Cells</link>
 </variable><comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></paragraph>
-<paragraph role="paragraph" id="par_id8049867" xml-lang="en-US" l10n="NEW">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell that has been created by merging single cells, and divide it back into individual cells.</paragraph>
-<paragraph role="heading" id="hd_id235602" xml-lang="en-US" level="2" l10n="NEW">Merging Cells</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id1272927" xml-lang="en-US" l10n="NEW">Select the adjacent cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id6424146" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id451368" xml-lang="en-US" level="2" l10n="NEW">Canceling the merging of cells</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id7116611" xml-lang="en-US" l10n="NEW">Place the cursor in the cell to be split.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id9493087" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph" l10n="NEW">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell that has been created by merging single cells, and divide it back into individual cells.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0509200913480176" role="note" l10n="NEW">When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id235602" role="heading" level="2" l10n="NEW">Merging Cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1272927" role="listitem" l10n="NEW">Select the adjacent cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6424146" role="listitem" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2" l10n="NEW">Canceling the merging of cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7116611" role="listitem" l10n="NEW">Place the cursor in the cell to be split.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9493087" role="listitem" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/table_rotate.xhp b/helpcontent2/source/text/scalc/guide/table_rotate.xhp
index 2920904c4c..70c48ca5eb 100755
--- a/helpcontent2/source/text/scalc/guide/table_rotate.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_rotate.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_rotate.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index b0eb375903..8413a2640f 100755
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_view.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="table_view"><link href="text/scalc/guide/table_view.xhp" name="Changing Table Views">Changing Table Views</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To permanently hide column and line headers in a table:</paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To hide column and line headers in a table:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
 <emph>,</emph> go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
diff --git a/helpcontent2/source/text/scalc/guide/text_numbers.xhp b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
index 3e583349c3..2e0c3483ce 100644
--- a/helpcontent2/source/text/scalc/guide/text_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_numbers.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,39 +27,36 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidetext_numbersxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Numbers as Text</title>
-<filename>/text/scalc/guide/text_numbers.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-15T13:41:51">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers; as text</bookmark_value>
-<bookmark_value>text formats; for numbers</bookmark_value>
-<bookmark_value>numbers; entering without number formats </bookmark_value>
-<bookmark_value>formats; numbers as text</bookmark_value>
-<bookmark_value>cell formats; text/numbers</bookmark_value>
-<bookmark_value>formatting;numbers as text</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="1" l10n="U" oldref="46"><variable id="text_numbers"><link href="text/scalc/guide/text_numbers.xhp" name="Formatting Numbers as Text">Formatting Numbers as Text</link>
+      <topic id="textscalcguidetext_numbersxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting Numbers as Text</title>
+         <filename>/text/scalc/guide/text_numbers.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers;entering as text</bookmark_value>
+      <bookmark_value>text formats; for numbers</bookmark_value>
+      <bookmark_value>formats; numbers as text</bookmark_value>
+      <bookmark_value>cell formats; text/numbers</bookmark_value>
+      <bookmark_value>formatting;numbers as text</bookmark_value>
+</bookmark><comment>mw deleted "numbers; entering without..." and changed "numbers;as text"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145068" role="heading" level="1" l10n="U"
+                 oldref="46"><variable id="text_numbers"><link href="text/scalc/guide/text_numbers.xhp" name="Formatting Numbers as Text">Formatting Numbers as Text</link>
 </variable></paragraph>
-<section id="text">
-<paragraph role="paragraph" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="43">You can format numbers as text in $[officename] Calc. Open the context menu of a cell or range of cells and choose <emph>Format Cells - Numbers</emph>, then select "Text" from the <emph>Category</emph> list. Any numbers subsequently entered into the formatted range are interpreted as text. The display of these "numbers" is left-justified, just as with other text.</paragraph>
-<paragraph role="note" id="par_id3153728" xml-lang="en-US" l10n="U" oldref="48">When numbers are formatted as text, they cannot be used in calculations or formulas.</paragraph>
-<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="44">If you have already entered normal numbers in cells and have afterwards changed the format of the cells to "Text", the numbers will remain normal numbers. They will not be converted. Only numbers entered afterwards, or numbers which are then edited, will become text numbers.</paragraph>
-<paragraph role="paragraph" id="par_id3144765" xml-lang="en-US" l10n="U" oldref="45">If you decide to enter a number directly as text, enter an apostrophe (') first. For example, for years in column headings, you can enter '1999, '2000 and '2001. The apostrophe is not visible in the cell, it only indicates that the entry is to be recognized as a text. This is useful if, for example, you enter a telephone number or postal code that begins with a zero (0), because a zero (0) at the start of a sequence of digits is removed in normal number formats.</paragraph>
-</section>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="47"><link href="text/shared/01/05020300.xhp" name="Format - Cell - Numbers">Format - Cell - Numbers</link></paragraph>
-<embed href="text/scalc/guide/format_value.xhp#format_value"/>
-</section>
-</body>
-</helpdocument>
+      <section id="text">
+         <paragraph xml-lang="en-US" id="par_id3156280" role="paragraph" l10n="U" oldref="43">You can format numbers as text in $[officename] Calc. Open the context menu of a cell or range of cells and choose <emph>Format Cells - Numbers</emph>, then select "Text" from the <emph>Category</emph> list. Any numbers subsequently entered into the formatted range are interpreted as text. The display of these "numbers" is left-justified, just as with other text.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149377" role="paragraph" l10n="U" oldref="44">If you have already entered normal numbers in cells and have afterwards changed the format of the cells to "Text", the numbers will remain normal numbers. They will not be converted. Only numbers entered afterwards, or numbers which are then edited, will become text numbers.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="45">If you decide to enter a number directly as text, enter an apostrophe (') first. For example, for years in column headings, you can enter '1999, '2000 and '2001. The apostrophe is not visible in the cell, it only indicates that the entry is to be recognized as a text. This is useful if, for example, you enter a telephone number or postal code that begins with a zero (0), because a zero (0) at the start of a sequence of digits is removed in normal number formats.</paragraph>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>
+         <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
+         <paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="47"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
+         <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/text_rotate.xhp b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
index b6e7b59488..65f5fc35bc 100755
--- a/helpcontent2/source/text/scalc/guide/text_rotate.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_rotate.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,40 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcguidetext_rotatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Rotating Text</title>
-<filename>/text/scalc/guide/text_rotate.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T12:49:15">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textscalcguidetext_rotatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Rotating Text</title>
+         <filename>/text/scalc/guide/text_rotate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151112"><bookmark_value>cells; rotating text</bookmark_value>
-<bookmark_value>rotating; text in cells</bookmark_value>
-<bookmark_value>text in cells; writing vertically</bookmark_value>
+      <bookmark_value>rotating; text in cells</bookmark_value>
+      <bookmark_value>text in cells; writing vertically</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3151112" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="text_rotate"><link href="text/scalc/guide/text_rotate.xhp" name="Rotating Text">Rotating Text</link>
+<paragraph xml-lang="en-US" id="hd_id3151112" role="heading" level="1" l10n="U" oldref="1"><variable id="text_rotate"><link href="text/scalc/guide/text_rotate.xhp" name="Rotating Text">Rotating Text</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="2">Select the cells whose text you want to rotate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155133" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Format - Cells</emph>. You will see the <emph>Format Cells</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="4">Click the <emph>Alignment</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="5">In the <emph>Text direction</emph> area use the mouse to select in the preview wheel the direction in which the text is to be rotated. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="6">In the <emph>Text direction </emph>area, if you press the <emph>ABCD </emph>button, the text is written vertically in the direction of the characters.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145171" role="listitem" l10n="U" oldref="2">Select the cells whose text you want to rotate.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155133" role="listitem" l10n="U" oldref="3">Choose <emph>Format - Cells</emph>. You will see the <emph>Format Cells</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="U" oldref="4">Click the <emph>Alignment</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147426" role="listitem" l10n="U" oldref="5">In the <emph>Text direction</emph> area use the mouse to select in the preview wheel the direction in which the text is to be rotated. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list><comment>removed a wrong para, i104207</comment>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="7"><link href="text/scalc/01/05020000.xhp" name="Format - Cells">Format - Cells</link></paragraph>
-<paragraph role="paragraph" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="8"><link href="text/shared/01/05340300.xhp" name="Format - Cells - Alignment">Format - Cells - Alignment</link></paragraph>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id3148456" role="paragraph" l10n="U" oldref="7"><link href="text/scalc/01/05020000.xhp" name="Format - Cells">Format - Cells</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154944" role="paragraph" l10n="U" oldref="8"><link href="text/shared/01/05340300.xhp" name="Format - Cells - Alignment">Format - Cells - Alignment</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/text_wrap.xhp b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
index 9e5e8b7e05..8c66ddf8dd 100755
--- a/helpcontent2/source/text/scalc/guide/text_wrap.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_wrap.xhp,v $
- *
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/userdefined_function.xhp b/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
index 1895118969..9df4f2b191 100755
--- a/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
+++ b/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userdefined_function.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/validity.xhp b/helpcontent2/source/text/scalc/guide/validity.xhp
index 3dc86e5479..e186748c8b 100755
--- a/helpcontent2/source/text/scalc/guide/validity.xhp
+++ b/helpcontent2/source/text/scalc/guide/validity.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validity.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <bookmark_value>error messages; defining for incorrect input</bookmark_value>
 <bookmark_value>actions in case of incorrect input</bookmark_value>
 <bookmark_value>Help tips; defining text for cell input</bookmark_value>
-<bookmark_value>notes;help text for cells</bookmark_value>
+<bookmark_value>comments;help text for cells</bookmark_value>
 <bookmark_value>cells; defining input help</bookmark_value>
 <bookmark_value>macros; running when incorrect input</bookmark_value>
 <bookmark_value>data; validity check</bookmark_value>
diff --git a/helpcontent2/source/text/scalc/guide/value_with_name.xhp b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
index 0b468e8de5..cbc431b0f4 100755
--- a/helpcontent2/source/text/scalc/guide/value_with_name.xhp
+++ b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: value_with_name.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,74 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcguidevalue_with_namexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Naming Cells</title>
-<filename>/text/scalc/guide/value_with_name.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textscalcguidevalue_with_namexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Naming Cells</title>
+         <filename>/text/scalc/guide/value_with_name.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>cells; defining names</bookmark_value>
-<bookmark_value>names; defining for cells</bookmark_value>
-<bookmark_value>values; defining names</bookmark_value>
-<bookmark_value>constants definition</bookmark_value>
-<bookmark_value>variables; defining names</bookmark_value>
-<bookmark_value>cell ranges; defining names</bookmark_value>
-<bookmark_value>defining;names for cell ranges</bookmark_value>
-<bookmark_value>formulas; defining names</bookmark_value>
-<bookmark_value>addressing; by defined names</bookmark_value>
-<bookmark_value>cell names; defining/addressing</bookmark_value>
-<bookmark_value>references; by defined names</bookmark_value>
-<bookmark_value>allowed cell names</bookmark_value>
-</bookmark><comment>mw changed index entry "defining;..."</comment><comment>mw copied three index entries from Calc guide address_byname, deleted "cell names;in formulas" and changed the remaining "cell names;..."entry.</comment><comment>mw changed "names;...", "addressing;..." and "references,..."  entries.</comment><paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="value_with_name"><link href="text/scalc/guide/value_with_name.xhp" name="Naming Cells">Naming Cells</link>
+      <bookmark_value>names; defining for cells</bookmark_value>
+      <bookmark_value>values; defining names</bookmark_value>
+      <bookmark_value>constants definition</bookmark_value>
+      <bookmark_value>variables; defining names</bookmark_value>
+      <bookmark_value>cell ranges; defining names</bookmark_value>
+      <bookmark_value>defining;names for cell ranges</bookmark_value>
+      <bookmark_value>formulas; defining names</bookmark_value>
+      <bookmark_value>addressing; by defined names</bookmark_value>
+      <bookmark_value>cell names; defining/addressing</bookmark_value>
+      <bookmark_value>references; by defined names</bookmark_value>
+      <bookmark_value>allowed cell names</bookmark_value>
+      <bookmark_value>renaming;cells</bookmark_value>
+</bookmark><comment>mw changed "names;...", "addressing;..." and "references,..."  entries.</comment><comment>mw added "renaming;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="1" l10n="U" oldref="1"><variable id="value_with_name"><link href="text/scalc/guide/value_with_name.xhp" name="Naming Cells">Naming Cells</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id4391918" xml-lang="en-US" level="2" l10n="NEW">Allowed names</paragraph>
-<paragraph role="paragraph" id="par_id2129581" xml-lang="en-US" l10n="NEW">Names in Calc can contain letters, numeric characters, and some special characters. Names must start with a letter or an underline character.</paragraph>
-<paragraph role="paragraph" id="par_id1120029" xml-lang="en-US" l10n="NEW">Allowed special characters:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3362224" xml-lang="en-US" l10n="NEW">underline (_) </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4891506" xml-lang="en-US" l10n="NEW">period (.) - allowed within a name, but not as first or last character</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2816553" xml-lang="en-US" l10n="NEW">blank ( ) - allowed within a name, but not as first or last character, and not for a cell range</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id328989" xml-lang="en-US" l10n="NEW">Names must not be the same as cell references. For example, the name A1 is invalid because A1 is a cell reference to the top left cell.</paragraph>
-<paragraph role="paragraph" id="par_id4769737" xml-lang="en-US" l10n="NEW">Names for cell ranges must not include blanks. Blanks are allowed within names for single cells, sheets and documents.</paragraph>
-<paragraph role="heading" id="hd_id1226233" xml-lang="en-US" level="2" l10n="NEW">Naming cells and formulas</paragraph>
-<paragraph role="paragraph" id="par_id5489364" xml-lang="en-US" l10n="NEW">A good way of making the references to cells and cell ranges in formulas legible is to give the ranges names. For example, you can name the range A1:B2 <emph>Start</emph>. You can then write a formula such as "=SUM(Start)". Even after you insert or delete rows or columns, $[officename] still correctly assigns the ranges identified by name. Range names must not contain any spaces.</paragraph>
-<paragraph role="paragraph" id="par_id953398" xml-lang="en-US" l10n="NEW">For example, it is much easier to read a formula for sales tax if you can write "= Amount * Tax_rate" instead of "= A5 * B12". In this case, you would name cell A5 "Amount" and cell B12 "Tax_rate."</paragraph>
-<paragraph role="paragraph" id="par_id4889675" xml-lang="en-US" l10n="NEW">Use the <emph>Define Names</emph> dialog to define names for formulas or parts of formulas you need more often. In order to specify range names,</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153954" xml-lang="en-US" l10n="U" oldref="3">Select a cell or range of cells, then choose <emph>Insert - Names - Define</emph>. The <emph>Define Names</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="4">Type the name of the selected area in the <emph>Name</emph> field. Click <emph>Add</emph>. The newly defined name appears in the list below. Click OK to close the dialog.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5774101" xml-lang="en-US" l10n="NEW">You can also name other cell ranges in this dialog by entering the name in the field and then selecting the respective cells.</paragraph>
-<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="5">If you type the name in a formula, after the first few characters entered you will see the entire name as a tip.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="6">Press the Enter key in order to accept the name from the tip.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="7">If more than one name starts with the same characters, you can scroll through all the names using the Tab key.<comment>mw copied contents from Calc guide address_byname.xhp</comment></paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="8"><link href="text/scalc/01/04070100.xhp" name="Insert - Names - Define">Insert - Names - Define</link></paragraph>
-<embed href="text/scalc/guide/goalseek.xhp#goalseek"/>
-<embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
-<embed href="text/scalc/guide/address_auto.xhp#address_auto"/><comment>mw deleted one EMBED paragraph and copied two EMBED paragraphs from Calc guide address_byname.xhp</comment></section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id4391918" role="heading" level="2" l10n="NEW">Allowed names</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2129581" role="paragraph" l10n="NEW">Names in Calc can contain letters, numeric characters, and some special characters. Names must start with a letter or an underline character.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1120029" role="paragraph" l10n="NEW">Allowed special characters:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3362224" role="paragraph" l10n="NEW">underline (_) </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4891506" role="paragraph" l10n="NEW">period (.) - allowed within a name, but not as first or last character</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2816553" role="paragraph" l10n="NEW">blank ( ) - allowed within a name, but not as first or last character, and not for a cell range</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id328989" role="paragraph" l10n="NEW">Names must not be the same as cell references. For example, the name A1 is invalid because A1 is a cell reference to the top left cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4769737" role="paragraph" l10n="NEW">Names for cell ranges must not include blanks. Blanks are allowed within names for single cells, sheets and documents.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id1226233" role="heading" level="2" l10n="NEW">Naming cells and formulas</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5489364" role="paragraph" l10n="NEW">A good way of making the references to cells and cell ranges in formulas legible is to give the ranges names. For example, you can name the range A1:B2 <emph>Start</emph>. You can then write a formula such as "=SUM(Start)". Even after you insert or delete rows or columns, $[officename] still correctly assigns the ranges identified by name. Range names must not contain any spaces.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id953398" role="paragraph" l10n="NEW">For example, it is much easier to read a formula for sales tax if you can write "= Amount * Tax_rate" instead of "= A5 * B12". In this case, you would name cell A5 "Amount" and cell B12 "Tax_rate."</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4889675" role="paragraph" l10n="NEW">Use the <emph>Define Names</emph> dialog to define names for formulas or parts of formulas you need more often. In order to specify range names,</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153954" role="listitem" l10n="U" oldref="3">Select a cell or range of cells, then choose <emph>Insert - Names - Define</emph>. The <emph>Define Names</emph> dialog appears.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156283" role="listitem" l10n="U" oldref="4">Type the name of the selected area in the <emph>Name</emph> field. Click <emph>Add</emph>. The newly defined name appears in the list below. Click OK to close the dialog.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5774101" role="paragraph" l10n="NEW">You can also name other cell ranges in this dialog by entering the name in the field and then selecting the respective cells.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154942" role="paragraph" l10n="U" oldref="5">If you type the name in a formula, after the first few characters entered you will see the entire name as a tip.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="6">Press the Enter key in order to accept the name from the tip.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150749" role="listitem" l10n="U" oldref="7">If more than one name starts with the same characters, you can scroll through all the names using the Tab key.<comment>mw copied contents from Calc guide address_byname.xhp</comment></paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3153711" role="paragraph" l10n="U" oldref="8"><link href="text/scalc/01/04070100.xhp" name="Insert - Names - Define">Insert - Names - Define</link></paragraph>
+         <embed href="text/scalc/guide/goalseek.xhp#goalseek"/>
+         <embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
+         <embed href="text/scalc/guide/address_auto.xhp#address_auto"/><comment>mw deleted one EMBED paragraph and copied two EMBED paragraphs from Calc guide address_byname.xhp</comment>
+</section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/webquery.xhp b/helpcontent2/source/text/scalc/guide/webquery.xhp
index c9732b92ae..2b84e3feea 100644
--- a/helpcontent2/source/text/scalc/guide/webquery.xhp
+++ b/helpcontent2/source/text/scalc/guide/webquery.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webquery.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/year2000.xhp b/helpcontent2/source/text/scalc/guide/year2000.xhp
index 756b5041d4..d206d791cc 100755
--- a/helpcontent2/source/text/scalc/guide/year2000.xhp
+++ b/helpcontent2/source/text/scalc/guide/year2000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: year2000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="17">The year in a date entry is often entered as two digits. Internally, the year is managed by $[officename] as four digits, so that in the calculation of the difference from 1/1/99 to 1/1/01, the result will correctly be two years.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph>Tools - Options - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
+<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="20">This means that if you enter a date of 1/1/30 or higher, it will be treated internally as 1/1/1930 or higher. All lower two-digit years apply to the 20xx century. So, for example, 1/1/20 is converted into 1/1/2020.</paragraph>
diff --git a/helpcontent2/source/text/scalc/main0000.xhp b/helpcontent2/source/text/scalc/main0000.xhp
index a2ae8e9e65..d33976f6d8 100755
--- a/helpcontent2/source/text/scalc/main0000.xhp
+++ b/helpcontent2/source/text/scalc/main0000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0100.xhp b/helpcontent2/source/text/scalc/main0100.xhp
index 91582fc80c..a31ccfc580 100755
--- a/helpcontent2/source/text/scalc/main0100.xhp
+++ b/helpcontent2/source/text/scalc/main0100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0101.xhp b/helpcontent2/source/text/scalc/main0101.xhp
index ce24c82da5..46a31e7a59 100755
--- a/helpcontent2/source/text/scalc/main0101.xhp
+++ b/helpcontent2/source/text/scalc/main0101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0102.xhp b/helpcontent2/source/text/scalc/main0102.xhp
index 7664419655..79a4f5ee11 100755
--- a/helpcontent2/source/text/scalc/main0102.xhp
+++ b/helpcontent2/source/text/scalc/main0102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0103.xhp b/helpcontent2/source/text/scalc/main0103.xhp
index 4b80db4ea9..8b206fb971 100755
--- a/helpcontent2/source/text/scalc/main0103.xhp
+++ b/helpcontent2/source/text/scalc/main0103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0104.xhp b/helpcontent2/source/text/scalc/main0104.xhp
index ffcdacd4fa..53c8713852 100755
--- a/helpcontent2/source/text/scalc/main0104.xhp
+++ b/helpcontent2/source/text/scalc/main0104.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0104.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,51 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textscalcmain0104xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert</title>
-<filename>/text/scalc/main0104.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einfuegen">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id8230842" localize="false"/><paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0104.xhp" name="Insert">Insert</link></paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements, such as cells, rows, sheets and cell names into the current sheet.</ahelp></paragraph>
-</section>
-<embed href="text/scalc/01/04010000.xhp#manueller"/>
-<paragraph role="heading" id="hd_id3150769" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04020000.xhp" name="Cells">Cells</link></paragraph>
-<embed href="text/scalc/01/04020000.xhp#zelleneinfuegentext"/>
-<embed href="text/scalc/01/04030000.xhp#zeilen"/>
-<embed href="text/scalc/01/04040000.xhp#spalten"/>
-<paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04050000.xhp" name="Sheet">Sheet</link></paragraph>
-<embed href="text/scalc/01/04050000.xhp#tabelleeinfuegentext"/>
-<embed href="text/scalc/01/04050100.xhp#sheetfromfile"/>
-<embed href="text/scalc/01/04090000.xhp#extdata"/>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
-<embed href="text/shared/01/04100000.xhp#sonder"/>
-<embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
-<paragraph role="heading" id="hd_id3156285" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-<embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/scalc/01/04060000.xhp" name="Function">Function</link></paragraph>
-<embed href="text/scalc/01/04060000.xhp#funktionsautopilottext"/>
-<paragraph role="heading" id="hd_id3154511" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/scalc/01/04080000.xhp" name="Function List">Function List</link></paragraph>
-<embed href="text/scalc/01/04080000.xhp#funktionslistetext"/>
-<embed href="text/scalc/01/04070000.xhp#namen"/>
-<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="2" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/01/04050000.xhp" name="Note">Note</link>
-</caseinline><defaultinline><link href="text/shared/01/04050000.xhp" name="Note">Note</link></defaultinline></switchinline></paragraph>
-<embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
-<embed href="text/shared/01/04990000.xhp#grafik"/>
-<embed href="text/shared/01/moviesound.xhp#moviesound"/>
-<embed href="text/shared/01/04150000.xhp#objekt"/>
-<paragraph role="heading" id="hd_id3146918" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
-<paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
-<embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
-</body>
-</helpdocument>
+      <topic id="textscalcmain0104xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Insert</title>
+         <filename>/text/scalc/main0104.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einfuegen">
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id8230842" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/main0104.xhp" name="Insert">Insert</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements, such as cells, rows, sheets and cell names into the current sheet.</ahelp></paragraph>
+      </section>
+      <embed href="text/scalc/01/04010000.xhp#manueller"/>
+      <paragraph xml-lang="en-US" id="hd_id3150769" role="heading" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04020000.xhp" name="Cells">Cells</link></paragraph>
+      <embed href="text/scalc/01/04020000.xhp#zelleneinfuegentext"/>
+      <embed href="text/scalc/01/04030000.xhp#zeilen"/>
+      <embed href="text/scalc/01/04040000.xhp#spalten"/>
+      <paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04050000.xhp" name="Sheet">Sheet</link></paragraph>
+      <embed href="text/scalc/01/04050000.xhp#tabelleeinfuegentext"/>
+      <embed href="text/scalc/01/04050100.xhp#sheetfromfile"/>
+      <embed href="text/scalc/01/04090000.xhp#extdata"/>
+      <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2" l10n="U" oldref="7"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
+      <embed href="text/shared/01/04100000.xhp#sonder"/>
+      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
+      <paragraph xml-lang="en-US" id="hd_id3156285" role="heading" level="2" l10n="U"
+                 oldref="13"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
+      <paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U" oldref="5"><link href="text/scalc/01/04060000.xhp" name="Function">Function</link></paragraph>
+      <embed href="text/scalc/01/04060000.xhp#funktionsautopilottext"/>
+      <paragraph xml-lang="en-US" id="hd_id3154511" role="heading" level="2" l10n="U"
+                 oldref="12"><link href="text/scalc/01/04080000.xhp" name="Function List">Function List</link></paragraph>
+      <embed href="text/scalc/01/04080000.xhp#funktionslistetext"/>
+      <embed href="text/scalc/01/04070000.xhp#namen"/>
+      <paragraph xml-lang="en-US" id="hd_id3145640" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
+      <embed href="text/shared/01/04990000.xhp#grafik"/>
+      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
+      <embed href="text/shared/01/04150000.xhp#objekt"/>
+      <paragraph xml-lang="en-US" id="hd_id3146918" role="heading" level="2" l10n="U"
+                 oldref="11"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200904002496" role="paragraph" l10n="NEW">Inserts a chart.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147003" role="heading" level="2" l10n="U"
+                 oldref="10"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+      <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/main0105.xhp b/helpcontent2/source/text/scalc/main0105.xhp
index 221a7a577e..e4a4c9f978 100644
--- a/helpcontent2/source/text/scalc/main0105.xhp
+++ b/helpcontent2/source/text/scalc/main0105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0105.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0106.xhp b/helpcontent2/source/text/scalc/main0106.xhp
index a798bfc5a2..cde47c5965 100755
--- a/helpcontent2/source/text/scalc/main0106.xhp
+++ b/helpcontent2/source/text/scalc/main0106.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0107.xhp b/helpcontent2/source/text/scalc/main0107.xhp
index ae7910ef33..6a5c2786ec 100755
--- a/helpcontent2/source/text/scalc/main0107.xhp
+++ b/helpcontent2/source/text/scalc/main0107.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0107.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0112.xhp b/helpcontent2/source/text/scalc/main0112.xhp
index 5d18c80beb..070b076ca0 100755
--- a/helpcontent2/source/text/scalc/main0112.xhp
+++ b/helpcontent2/source/text/scalc/main0112.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0112.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0200.xhp b/helpcontent2/source/text/scalc/main0200.xhp
index 6329bad835..0d2f9c370b 100755
--- a/helpcontent2/source/text/scalc/main0200.xhp
+++ b/helpcontent2/source/text/scalc/main0200.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0200.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalcmain0200xml" indexer="include" status="PUBLISH">
@@ -64,6 +61,9 @@
 <section id="Section4">
 <embed href="text/scalc/main0206.xhp#rechenleiste"/>
 </section>
+<section id="Section33">
+<embed href="text/simpress/main0210.xhp#werkzeugleiste"/>
+</section>
 <section id="Section5">
 <embed href="text/scalc/main0214.xhp#grafikobjektleiste"/>
 </section>
diff --git a/helpcontent2/source/text/scalc/main0202.xhp b/helpcontent2/source/text/scalc/main0202.xhp
index dd6c569e48..a7fe3a4585 100755
--- a/helpcontent2/source/text/scalc/main0202.xhp
+++ b/helpcontent2/source/text/scalc/main0202.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0202.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 </meta>
 <body>
 <section id="imnormalmodus">
-<bookmark xml-lang="en-US" branch="hid/HID_SC_TOOLBOX_TABLE" id="bm_id3149670" localize="false"/>
+<!-- removed HID HID_SC_TOOLBOX_TABLE -->
 <paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/scalc/main0202.xhp" name="Formatting Bar">Formatting Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3153897" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SC_TOOLBOX_TABLE">The <emph>Formatting</emph> bar contains basic commands for applying manually formatting.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/scalc/main0203.xhp b/helpcontent2/source/text/scalc/main0203.xhp
index fb78c047bd..21d0dbd679 100755
--- a/helpcontent2/source/text/scalc/main0203.xhp
+++ b/helpcontent2/source/text/scalc/main0203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0203.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0205.xhp b/helpcontent2/source/text/scalc/main0205.xhp
index bcabfb575a..83f2ff538e 100755
--- a/helpcontent2/source/text/scalc/main0205.xhp
+++ b/helpcontent2/source/text/scalc/main0205.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0205.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0206.xhp b/helpcontent2/source/text/scalc/main0206.xhp
index dac8934ce6..c76049661d 100755
--- a/helpcontent2/source/text/scalc/main0206.xhp
+++ b/helpcontent2/source/text/scalc/main0206.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0206.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0208.xhp b/helpcontent2/source/text/scalc/main0208.xhp
index f2e6a8c3b3..63f0a9faa8 100755
--- a/helpcontent2/source/text/scalc/main0208.xhp
+++ b/helpcontent2/source/text/scalc/main0208.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,30 +27,29 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textscalcmain0208xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Status Bar</title>
-<filename>/text/scalc/main0208.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T10:25:20">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="statusleiste">
-<paragraph role="heading" id="hd_id3151385" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="2">The <emph>Status Bar</emph> displays information about the current sheet.</paragraph>
-</section>
-<embed href="text/scalc/02/08010000.xhp#positionimdokument"/>
-<embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
-<embed href="text/shared/02/20030000.xhp#maszstab"/>
-<embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
-<embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
-<embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
-<embed href="text/scalc/02/08080000.xhp#datumzeit"/>
-</body>
-</helpdocument>
+      <topic id="textscalcmain0208xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Status Bar</title>
+         <filename>/text/scalc/main0208.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="statusleiste">
+         <paragraph xml-lang="en-US" id="hd_id3151385" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="2">The <emph>Status Bar</emph> displays information about the current sheet.</paragraph>
+      </section>
+      <embed href="text/scalc/02/08010000.xhp#positionimdokument"/>
+      <embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
+      <embed href="text/shared/02/20030000.xhp#maszstab"/>
+      <embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
+      <embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
+      <embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
+      <paragraph xml-lang="en-US" id="hd_id0821200911024321" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0821200911024344" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+      <embed href="text/scalc/02/08080000.xhp#datumzeit"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/main0210.xhp b/helpcontent2/source/text/scalc/main0210.xhp
index 2a3bd0c150..05a60f40cd 100755
--- a/helpcontent2/source/text/scalc/main0210.xhp
+++ b/helpcontent2/source/text/scalc/main0210.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0210.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="seitenansichtleiste">
-<bookmark xml-lang="en-US" branch="hid/HID_SC_TOOLBOX_PREVIEW" id="bm_id3153897" localize="false"/>
+<!-- removed HID HID_SC_TOOLBOX_PREVIEW -->
 <bookmark xml-lang="en-US" branch="hid/HID_SC_WIN_PREVIEW" id="bm_id3155411" localize="false"/>
 <paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/scalc/main0210.xhp" name="Page Preview  Bar">Page Preview Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SC_WIN_PREVIEW">The <emph>Page Preview</emph> Bar is displayed when you choose <emph>File - Page Preview</emph>.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/main0214.xhp b/helpcontent2/source/text/scalc/main0214.xhp
index f25852c1cf..ae1028af34 100755
--- a/helpcontent2/source/text/scalc/main0214.xhp
+++ b/helpcontent2/source/text/scalc/main0214.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0214.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/main0218.xhp b/helpcontent2/source/text/scalc/main0218.xhp
index 9f73693fd3..88472cb9cb 100755
--- a/helpcontent2/source/text/scalc/main0218.xhp
+++ b/helpcontent2/source/text/scalc/main0218.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0218.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 </meta>
 <body>
 <section id="werkzeugleiste">
-<bookmark xml-lang="en-US" branch="hid/HID_SC_TOOLBOX_TOOLS" id="bm_id3151384" localize="false"/>
+<!-- removed HID HID_SC_TOOLBOX_TOOLS -->
 <paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/scalc/main0218.xhp" name="Tools Bar">Tools Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SC_TOOLBOX_TOOLS">Use the Tools bar to access commonly used commands.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/scalc/main0503.xhp b/helpcontent2/source/text/scalc/main0503.xhp
index 33ab4d5272..21cef33e4b 100755
--- a/helpcontent2/source/text/scalc/main0503.xhp
+++ b/helpcontent2/source/text/scalc/main0503.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/makefile.mk b/helpcontent2/source/text/scalc/makefile.mk
index f4472b0ac3..ac033e79ac 100644
--- a/helpcontent2/source/text/scalc/makefile.mk
+++ b/helpcontent2/source/text/scalc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,4 +68,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/schart/00/00000004.xhp b/helpcontent2/source/text/schart/00/00000004.xhp
index 9fad52f318..9b13c005d4 100644
--- a/helpcontent2/source/text/schart/00/00000004.xhp
+++ b/helpcontent2/source/text/schart/00/00000004.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textschart0000000004xml" indexer="exclude">
 <title id="tit" xml-lang="en-US">To access this function...</title>
@@ -41,7 +38,7 @@
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function... 
+<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function...
 </variable></paragraph>
 <section id="astdgd">
 <paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Chart Data Table</emph> (Charts)</paragraph>
@@ -51,7 +48,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153728" xml-lang="en-US" l10n="E">
-<image id="img_id3147428" src="res/commandimagelist/sc_grid.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147428" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147428" src="res/commandimagelist/sc_grid.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147428" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -62,7 +59,7 @@
 
 </section>
 </section>
-<paragraph role="paragraph" id="par_id3153160" xml-lang="en-US" l10n="CHG" oldref="12"><variable id="efgttl">Choose <emph>Insert - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153160" xml-lang="en-US" l10n="CHG" oldref="12"><variable id="efgttl">Choose <emph>Insert - Title </emph>(Charts)
 </variable></paragraph>
 <section id="efglgd">
 <paragraph role="paragraph" id="par_id3149121" xml-lang="en-US" l10n="CHG" oldref="13">Choose <emph>Insert - Legend </emph>(Charts)</paragraph>
@@ -70,9 +67,9 @@
 </section>
 <section id="efgdbs">
 <paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="CHG" oldref="16">Choose <emph>Insert - Data Labels </emph>(Charts)</paragraph>
-<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="CHG" oldref="68">Choose <emph>Format - Object Properties - Data Point/Data Series - Data Labels</emph> tab (for data series and data point) (Charts)</paragraph>
+<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="CHG" oldref="68">Choose <emph>Format - Format Selection - Data Point/Data Series - Data Labels</emph> tab (for data series and data point) (Charts)</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="CHG" oldref="69"><variable id="efgaug">Choose <emph>Insert - Axes </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="CHG" oldref="69"><variable id="efgaug">Choose <emph>Insert - Axes </emph>(Charts)
 </variable></paragraph>
 <section id="efgaugg">
 <paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Insert - Grids </emph>(Charts)</paragraph>
@@ -81,7 +78,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150307" xml-lang="en-US" l10n="E">
-<image id="img_id3155111" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155111" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155111" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155111" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -91,7 +88,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="E">
-<image id="img_id3152989" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152989" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152989" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152989" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -101,51 +98,51 @@
 </table>
 
 </section>
-<paragraph role="paragraph" id="par_id3148869" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="efgsta">Choose <emph>Insert - Y Error Bars </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3148869" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="efgsta">Choose <emph>Insert - Y Error Bars </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1061738" xml-lang="en-US" l10n="NEW"><variable id="trendlines">Choose Insert - Trend Lines (Charts) 
+<paragraph role="paragraph" id="par_id1061738" xml-lang="en-US" l10n="NEW"><variable id="trendlines">Choose Insert - Trend Lines (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154532" xml-lang="en-US" l10n="CHG" oldref="67"><variable id="sonderz">Choose <emph>Insert - Special Character </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3154532" xml-lang="en-US" l10n="CHG" oldref="67"><variable id="sonderz">Choose <emph>Insert - Special Character </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153246" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="frtoes">Choose <emph>Format - Object Properties </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153246" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="frtoes">Choose <emph>Format - Format Selection </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="CHG" oldref="23"><variable id="frtodd">Choose <emph>Format - Object Properties - Data Point</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="CHG" oldref="23"><variable id="frtodd">Choose <emph>Format - Format Selection - Data Point</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154765" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="frtodr">Choose <emph>Format - Object Properties - Data Series</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3154765" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="frtodr">Choose <emph>Format - Format Selection - Data Series</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="optionen">Choose <emph>Format - Object Properties - Data Series - Options</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="optionen">Choose <emph>Format - Format Selection - Data Series - Options</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154707" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="frtttl">Choose <emph>Format - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3154707" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="frtttl">Choose <emph>Format - Title </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155758" xml-lang="en-US" l10n="CHG" oldref="26"><variable id="frtoe">Choose <emph>Format - Object Properties - Title</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3155758" xml-lang="en-US" l10n="CHG" oldref="26"><variable id="frtoe">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="CHG" oldref="27"><variable id="frtegt">Choose <emph>Format - Object Properties - Title</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="CHG" oldref="27"><variable id="frtegt">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="frttya">Choose <emph>Format - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="frttya">Choose <emph>Format - Title </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147402" xml-lang="en-US" l10n="CHG" oldref="70"><variable id="frttyab">Choose <emph>Format - Axis </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3147402" xml-lang="en-US" l10n="CHG" oldref="70"><variable id="frttyab">Choose <emph>Format - Axis </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="CHG" oldref="29"><variable id="frtlgd">Choose <emph>Format - Legend, or Format - Object Properties</emph> - <emph>Legend </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="CHG" oldref="29"><variable id="frtlgd">Choose <emph>Format - Legend, or Format - Format Selection</emph> - <emph>Legend </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="frtaa">Choose <emph>Format - Axis - X Axis/Secondary X Axis/Z Axis/All Axes </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="frtaa">Choose <emph>Format - Axis - X Axis/Secondary X Axis/Z Axis/All Axes </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="frtyas">Choose <emph>Format - Axis - Y Axis/Secondary Y Axis </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="frtyas">Choose <emph>Format - Axis - Y Axis/Secondary Y Axis </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="frtysk">Choose <emph>Format - Axis - Y Axis - Scale</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="frtysk">Choose <emph>Format - Axis - Y Axis - Scale</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1006200812385491" xml-lang="en-US" l10n="NEW"><variable id="positioning">Choose <emph>Format - Axis - X Axis - Positioning</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id1006200812385491" xml-lang="en-US" l10n="NEW"><variable id="positioning">Choose <emph>Format - Axis - X Axis - Positioning</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id31493459" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="positioningy">Choose <emph>Format - Axis - Y Axis - Positioning</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id31493459" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="positioningy">Choose <emph>Format - Axis - Y Axis - Positioning</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="frtgt">Choose <emph>Format - Grid </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="frtgt">Choose <emph>Format - Grid </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150746" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="frtgtr">Choose <emph>Format - Grid - X, Y, Z Axis Major Grid/ X, Y, Z Minor Grid/ All Axis Grids </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150746" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="frtgtr">Choose <emph>Format - Grid - X, Y, Z Axis Major Grid/ X, Y, Z Minor Grid/ All Axis Grids </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="frtdgw">Choose <emph>Format - Chart Wall - Chart</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="frtdgw">Choose <emph>Format - Chart Wall - Chart</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153039" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="frtdgb">Choose <emph>Format - Chart Floor</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153039" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="frtdgb">Choose <emph>Format - Chart Floor</emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150141" xml-lang="en-US" l10n="CHG" oldref="38"><variable id="frtdgf">Choose <emph>Format - Chart Area</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150141" xml-lang="en-US" l10n="CHG" oldref="38"><variable id="frtdgf">Choose <emph>Format - Chart Area</emph>(Charts)
 </variable></paragraph>
 <section id="frtdgty">
 <paragraph role="paragraph" id="par_id3155830" xml-lang="en-US" l10n="CHG" oldref="39">Choose <emph>Format - Chart Type </emph>(Charts)</paragraph>
@@ -155,7 +152,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148582" xml-lang="en-US" l10n="E">
-<image id="img_id3153124" src="res/commandimagelist/sc_diagramtype.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153124" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153124" src="res/commandimagelist/sc_diagramtype.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153124" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -166,7 +163,7 @@
 
 </section>
 </section><comment>removed frtaft autoformat section</comment>
-<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="frtdda">Choose <emph>Format - 3D View</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="frtdda">Choose <emph>Format - 3D View</emph>(Charts)
 </variable></paragraph>
 <section id="anordnung">
 <paragraph role="paragraph" id="par_id3150661" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Arrangement </emph>(Charts)</paragraph>
@@ -176,7 +173,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151020" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_toggletitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150936" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150936" src="res/commandimagelist/sc_toggletitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -192,7 +189,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149775" xml-lang="en-US" l10n="E">
-<image id="img_id3149781" src="res/commandimagelist/sc_toggleaxistitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149781" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149781" src="res/commandimagelist/sc_toggleaxistitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149781" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -207,7 +204,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3163824" xml-lang="en-US" l10n="E">
-<image id="img_id3149708" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149708" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149708" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149708" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -222,7 +219,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="E">
-<image id="img_id3151189" src="res/commandimagelist/sc_toggleaxisdescr.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151189" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151189" src="res/commandimagelist/sc_toggleaxisdescr.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -237,7 +234,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156315" xml-lang="en-US" l10n="E">
-<image id="img_id3156322" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156322" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156322" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156322" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -248,15 +245,15 @@
 
 </section>
 <section id="wiz">
-<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object - 
-</caseinline></switchinline> Chart <comment>UFI: may be unified for Writer in 2.3, see http://specs.openoffice.org/appwide/toolbars/Toolbar_content_spec.odt</comment></paragraph>
+<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object -
+</caseinline></switchinline> Chart </paragraph>
 </section>
 <section id="wiz_ranges">
-<paragraph role="paragraph" id="par_id2985320" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object - 
+<paragraph role="paragraph" id="par_id2985320" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object -
 </caseinline></switchinline> Chart </paragraph>
 <paragraph role="paragraph" id="par_id1096530" xml-lang="en-US" l10n="NEW">Double-click a chart, then choose Format - Data Ranges</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In a chart of Line type or XY type which displays lines, mark Smooth lines and click the Properties button 
+<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In a chart of Line type or XY type which displays lines, mark Smooth lines and click the Properties button
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/schart/00/makefile.mk b/helpcontent2/source/text/schart/00/makefile.mk
index 2695126e1b..b6b850b4fc 100644
--- a/helpcontent2/source/text/schart/00/makefile.mk
+++ b/helpcontent2/source/text/schart/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/schart/01/03010000.xhp b/helpcontent2/source/text/schart/01/03010000.xhp
index 00802322e3..d9e41eb785 100644
--- a/helpcontent2/source/text/schart/01/03010000.xhp
+++ b/helpcontent2/source/text/schart/01/03010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW">Choose <emph>View - Chart Data Table</emph> to open the Data Table dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3236182" xml-lang="en-US" l10n="NEW">The data series are organized in columns. The role of the left most column is set to categories or data labels respectively. The contents of the left most column are always formatted as text.</paragraph>
+<paragraph role="paragraph" id="par_id3236182" xml-lang="en-US" l10n="CHG">The data series are organized in columns. The role of the left most column is set to categories or data labels respectively. The contents of the left most column are always formatted as text. You can insert more text columns to be used as hierarchical labels.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id9799798" xml-lang="en-US" l10n="NEW">Click a cell in the dialog and change the contents. Click another cell to see the changed contents in the preview.</paragraph>
@@ -84,9 +81,10 @@
 </listitem>
 </list>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_ROW" id="bm_id3154022" localize="false"/><comment>insert row</comment><paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="." visibility="hidden">Inserts a new row below the current row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_COL" id="bm_id3152988" localize="false"/><comment>insert column</comment><paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="." visibility="hidden">Inserts a new column after the current column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_COL" id="bm_id3152988" localize="false"/><comment>insert series</comment><paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="." visibility="hidden">Inserts a new data series after the current column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_INSERT_TEXT_COL" id="bm_id3156022" localize="false"/><comment>insert text column</comment><paragraph role="paragraph" id="par_id3152297" xml-lang="en-US"><ahelp hid="." visibility="hidden">Inserts a new text column after the current column for hierarchical axes descriptions.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_ROW" id="bm_id3150215" localize="false"/><comment>delete row</comment><paragraph role="paragraph" id="par_id3159231" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Deletes the current row. It is not possible to delete the label row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete column</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current column. It is not possible to delete the label column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete series</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current series or text column. It is not possible to delete the first text column.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_SWAP_COL" id="bm_id8501846" localize="false"/><comment>move series right</comment><paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current column with its neighbor at the right.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TBI_DATA_SWAP_ROW" id="bm_id4469130" localize="false"/><comment>move row down</comment><paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current row with its neighbor below.</ahelp></paragraph><comment>edit fields, see i72361</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATA_SERIES_LABEL" id="bm_id3522446" localize="false"/><paragraph role="paragraph" id="par_id6697286" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter names for the data series.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04010000.xhp b/helpcontent2/source/text/schart/01/04010000.xhp
index 33ff18bbfa..25ab4f2963 100644
--- a/helpcontent2/source/text/schart/01/04010000.xhp
+++ b/helpcontent2/source/text/schart/01/04010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,29 +40,29 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertTitle" id="bm_id3146313" localize="false"/><paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="1" l10n="U" oldref="1">Titles</paragraph>
-<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="2"><variable id="titel"><ahelp hid=".uno:InsertTitle">Opens a dialog to enter or modify the titles in a chart.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTitles" id="bm_id3146313" localize="false"/><paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="1" l10n="U" oldref="1">Titles</paragraph>
+<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="2"><variable id="titel"><ahelp hid=".uno:InsertMenuTitles">Opens a dialog to enter or modify the titles in a chart.</ahelp>
 </variable> You can define the text for the main title, subtitle and the axis labels, and specify if they are displayed.</paragraph>
 <section id="howtoget">
   <embed href="text/schart/00/00000004.xhp#efgttl"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_TITLE:CBX_MAINTITLE" id="bm_id3150887" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:EDIT:DLG_TITLE:EDT_MAINTITLE" id="bm_id3166431" localize="false"/><paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2" l10n="U" oldref="3">Main Title</paragraph>
+<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_MAINTITLE -->
+<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_MAINTITLE --><paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2" l10n="U" oldref="3">Main Title</paragraph>
 <paragraph role="paragraph" id="par_id3150371" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_MAINTITLE">Marking the <emph>Main Title</emph> option activates the main title. Enter the desired title in the corresponding text field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_TITLE:CBX_SUBTITLE" id="bm_id3154486" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:EDIT:DLG_TITLE:EDT_SUBTITLE" id="bm_id3145384" localize="false"/><paragraph role="heading" id="hd_id3146980" xml-lang="en-US" level="2" l10n="U" oldref="5">Subtitle</paragraph>
+<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_SUBTITLE -->
+<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_SUBTITLE --><paragraph role="heading" id="hd_id3146980" xml-lang="en-US" level="2" l10n="U" oldref="5">Subtitle</paragraph>
 <paragraph role="paragraph" id="par_id3149404" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_SUBTITLE">Marking the <emph>Subtitle</emph> option activates the subtitle. Enter the desired title in the corresponding text field.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleTitle" id="bm_id3148870" localize="false"/><paragraph role="paragraph" id="par_id3152901" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="sytexttitel"><ahelp hid=".uno:ToggleTitle">Click <emph>Title On/Off</emph> on the Formatting bar to show or hide the title and subtitle.</ahelp>
 </variable></paragraph>
 <embed href="text/schart/00/00000004.xhp#titelanaus"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_X_AXIS" id="bm_id3148605" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:EDIT:DLG_TITLE:EDT_X_AXIS" id="bm_id3159203" localize="false"/><paragraph role="heading" id="hd_id3156018" xml-lang="en-US" level="2" l10n="U" oldref="8">X axis</paragraph>
+<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_X_AXIS -->
+<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_X_AXIS --><paragraph role="heading" id="hd_id3156018" xml-lang="en-US" level="2" l10n="U" oldref="8">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_X_AXIS">Marking the <emph>X axis</emph> option activates the X axis title. Enter the desired title in the corresponding text field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Y_AXIS" id="bm_id3154654" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:EDIT:DLG_TITLE:EDT_Y_AXIS" id="bm_id3145360" localize="false"/><paragraph role="heading" id="hd_id3159226" xml-lang="en-US" level="2" l10n="U" oldref="10">Y axis</paragraph>
+<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Y_AXIS -->
+<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_Y_AXIS --><paragraph role="heading" id="hd_id3159226" xml-lang="en-US" level="2" l10n="U" oldref="10">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3154763" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_Y_AXIS">Marking the <emph>Y axis</emph> option activates the Y axis title. Enter the desired title in the corresponding text field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Z_AXIS" id="bm_id3149312" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:EDIT:DLG_TITLE:EDT_Z_AXIS" id="bm_id3149316" localize="false"/><paragraph role="heading" id="hd_id3153009" xml-lang="en-US" level="2" l10n="U" oldref="12">Z axis</paragraph>
+<!-- removed HID SCH:CHECKBOX:DLG_TITLE:CBX_TITLE_Z_AXIS -->
+<!-- removed HID SCH:EDIT:DLG_TITLE:EDT_Z_AXIS --><paragraph role="heading" id="hd_id3153009" xml-lang="en-US" level="2" l10n="U" oldref="12">Z axis</paragraph>
 <paragraph role="paragraph" id="par_id3154710" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SCH:EDIT:DLG_TITLE:EDT_Z_AXIS">Marking the <emph>Z axis</emph> option activates the Z axis title. Enter the desired title in the corresponding text field.</ahelp> This option is only available for 3-D charts.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleAxisTitle" id="bm_id3149054" localize="false"/><paragraph role="paragraph" id="par_id3153073" xml-lang="en-US" l10n="CHG" oldref="14"><variable id="sytextachse"><ahelp hid=".uno:ToggleAxisTitle">Click <emph>Axes Title On/Off</emph> on the Formatting bar to show or hide the axis labels.</ahelp>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04020000.xhp b/helpcontent2/source/text/schart/01/04020000.xhp
index 87ff3f5919..2dd73539f0 100644
--- a/helpcontent2/source/text/schart/01/04020000.xhp
+++ b/helpcontent2/source/text/schart/01/04020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020000.xhp,v $
- * $Revision: 1.7.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,9 +41,9 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156441"><bookmark_value>chart legends; hiding</bookmark_value>
 <bookmark_value>hiding;chart legends</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertLegend" id="bm_id3149667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuLegend" id="bm_id3149667" localize="false"/>
 <paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="1" l10n="U" oldref="1">Legend</paragraph>
-<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US" l10n="U" oldref="2"><variable id="legende"><ahelp hid=".uno:InsertLegend">Opens the <emph>Legend </emph>dialog, which allows you to change the position of legends in the chart, and to specify whether the legend is displayed.</ahelp>
+<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US" l10n="U" oldref="2"><variable id="legende"><ahelp hid=".uno:InsertMenuLegend">Opens the <emph>Legend </emph>dialog, which allows you to change the position of legends in the chart, and to specify whether the legend is displayed.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
 <embed href="text/schart/00/00000004.xhp#efglgd"/>
@@ -59,7 +56,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="E">
-<image id="img_id3147346" src="res/commandimagelist/sc_togglelegend.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147346" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147346" src="res/commandimagelist/sc_togglelegend.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147346" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -69,33 +66,33 @@
 </table>
 
 </section>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_LEGEND_CBX_SHOW" id="bm_id3150304" localize="false"/>
+<!-- removed HID SCH_CHECKBOX_DLG_LEGEND_CBX_SHOW -->
 <paragraph role="heading" id="hd_id3155114" xml-lang="en-US" level="3" l10n="U" oldref="6">Display</paragraph>
 <paragraph role="paragraph" id="par_id3150206" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SCH_CHECKBOX_DLG_LEGEND_CBX_SHOW">Specifies whether to display a legend for the chart.</ahelp> This option is only visible if you call the dialog by choosing <emph>Insert - Legend</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3150201" xml-lang="en-US" level="2" l10n="U" oldref="4">Position</paragraph>
 <paragraph role="paragraph" id="par_id3155376" xml-lang="en-US" l10n="U" oldref="5">Select the position for the legend:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_LEGEND:RBT_LEFT" id="bm_id3154487" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_LEFT" id="bm_id3145387" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_LEFT -->
+<!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_LEFT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_LEFT" id="bm_id1106200811535392" localize="false"/>
 <paragraph role="heading" id="hd_id3152988" xml-lang="en-US" level="3" l10n="U" oldref="8">Left</paragraph>
 <paragraph role="paragraph" id="par_id3155087" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_LEFT">Positions the legend at the left of the chart.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_LEGEND:RBT_TOP" id="bm_id3153306" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_TOP" id="bm_id3153309" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_TOP -->
+<!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_TOP -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_TOP" id="bm_id8514053" localize="false"/>
 <paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="10">Top</paragraph>
 <paragraph role="paragraph" id="par_id3153912" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_TOP">Positions the legend at the top of the chart.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_LEGEND:RBT_RIGHT" id="bm_id3157983" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_RIGHT" id="bm_id3148607" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_RIGHT -->
+<!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_RIGHT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_RIGHT" id="bm_id5492721" localize="false"/>
 <paragraph role="heading" id="hd_id3144773" xml-lang="en-US" level="3" l10n="U" oldref="12">Right</paragraph>
 <paragraph role="paragraph" id="par_id3155268" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_RIGHT">Positions the legend at the right of the chart.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_LEGEND:RBT_BOTTOM" id="bm_id3149126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOM" id="bm_id3149130" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_BOTTOM -->
+<!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOM -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_BOTTOM" id="bm_id445570" localize="false"/>
 <paragraph role="heading" id="hd_id3152871" xml-lang="en-US" level="3" l10n="U" oldref="14">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3153249" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOM">Positions the legend at the bottom of the chart.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id1106200812072645" xml-lang="en-US" level="2" l10n="NEW">Text Orientation</paragraph>
-<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <item type="menuitem">Tools - Options - Language settings - Languages</item>.</paragraph>
+<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</item>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR" id="bm_id1106200812070599" localize="false"/>
 <paragraph role="heading" id="hd_id1106200812112444" xml-lang="en-US" level="3" l10n="NEW">Text Direction</paragraph>
 <paragraph role="paragraph" id="par_id1106200812112530" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04030000.xhp b/helpcontent2/source/text/schart/01/04030000.xhp
index 7f31d5ad0a..59ef0e1468 100644
--- a/helpcontent2/source/text/schart/01/04030000.xhp
+++ b/helpcontent2/source/text/schart/01/04030000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.11.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,63 +32,75 @@
  
 	
 <meta>
-<topic id="textschart0104030000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Data Labels </title>
-<filename>/text/schart/01/04030000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart0104030000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Data Labels </title>
+         <filename>/text/schart/01/04030000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150275"><bookmark_value>data labels in charts</bookmark_value>
-<bookmark_value>labels; for charts</bookmark_value>
-<bookmark_value>charts; data labels</bookmark_value>
-<bookmark_value>data values in charts</bookmark_value>
-<bookmark_value>chart legends; showing icons with labels</bookmark_value>
+      <bookmark_value>labels; for charts</bookmark_value>
+      <bookmark_value>charts; data labels</bookmark_value>
+      <bookmark_value>data values in charts</bookmark_value>
+      <bookmark_value>chart legends; showing icons with labels</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertDescription" id="bm_id3144510" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuDataLabels" id="bm_id3144510" localize="false"/>
 <section id="datalabels">
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="datenbeschriftung"><link href="text/schart/01/04030000.xhp" name="Data labels">Data Labels</link>
+         <paragraph xml-lang="en-US" id="hd_id3150275" role="heading" level="1" l10n="U" oldref="1"><variable id="datenbeschriftung"><link href="text/schart/01/04030000.xhp" name="Data labels">Data Labels</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="2"><variable id="besch"><ahelp hid=".uno:InsertDescription">Opens the<emph> Data Labels </emph>dialog, which enables you to set the data labels.</ahelp>
+         <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="2"><variable id="besch"><ahelp hid=".uno:InsertMenuDataLabels">Opens the<emph> Data Labels </emph>dialog, which enables you to set the data labels.</ahelp>
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/schart/00/00000004.xhp#efgdbs"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_TP_DATA_DESCR_RB_NUMBER" id="bm_id3149123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER" id="bm_id3146972" localize="false"/>
+      </section>
+      <section id="context">
+         <paragraph xml-lang="en-US" id="par_id0810200912120416" role="paragraph" l10n="NEW">If an element of a data series is selected, this command works on that data series only. If no element is selected, this command works on all data series.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#efgdbs"/>
+      </section>
+<!-- removed HID SCH_RADIOBUTTON_TP_DATA_DESCR_RB_NUMBER -->
+<!-- removed HID SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_NUMBER" id="bm_id901516" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_VALUE" id="bm_id8825342" localize="false"/>
-<paragraph role="heading" id="hd_id3149401" xml-lang="en-US" level="2" l10n="CHG" oldref="17">Show value as number</paragraph>
-<paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER">Displays the absolute values of the data points.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149401" role="heading" level="2" l10n="CHG"
+                 oldref="17">Show value as number</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" oldref="18"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER">Displays the absolute values of the data points.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_NUMBERFORMAT" id="bm_id1717276" localize="false"/>
-<paragraph role="heading" id="hd_id5077059" xml-lang="en-US" level="3" l10n="NEW">Number format</paragraph>
-<paragraph role="paragraph" id="par_id9794610" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog to select the number format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_TP_DATA_DESCR_RB_PERCENT" id="bm_id3155766" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT" id="bm_id3154254" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5077059" role="heading" level="2" l10n="NEW">Number format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9794610" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the number format.</ahelp></paragraph>
+<!-- removed HID SCH_RADIOBUTTON_TP_DATA_DESCR_RB_PERCENT -->
+<!-- removed HID SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PERCENT" id="bm_id9111911" localize="false"/>
-<paragraph role="heading" id="hd_id3145643" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Show value as percentage</paragraph>
-<paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT">Displays the percentage of the data points in each column.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145643" role="heading" level="2" l10n="CHG"
+                 oldref="9">Show value as percentage</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156382" role="paragraph" l10n="U" oldref="10"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT">Displays the percentage of the data points in each column.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_PERCENT_NUMBERFORMAT" id="bm_id381481" localize="false"/>
-<paragraph role="heading" id="hd_id1316873" xml-lang="en-US" level="3" l10n="NEW">Percentage format</paragraph>
-<paragraph role="paragraph" id="par_id5476241" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog to select the percentage format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_TEXT" id="bm_id3149258" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT" id="bm_id3153964" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1316873" role="heading" level="2" l10n="NEW">Percentage format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5476241" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the percentage format.</ahelp></paragraph>
+<!-- removed HID SCH_CHECKBOX_DLG_DATA_DESCR_CB_TEXT -->
+<!-- removed HID SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_TEXT" id="bm_id3015533" localize="false"/>
-<paragraph role="heading" id="hd_id3145228" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Show category</paragraph>
-<paragraph role="paragraph" id="par_id3154702" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT">Shows the data point text labels.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_SYMBOL" id="bm_id3147004" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL" id="bm_id3143220" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="2" l10n="CHG"
+                 oldref="11">Show category</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="U" oldref="12"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT">Shows the data point text labels.</ahelp></paragraph>
+<!-- removed HID SCH_CHECKBOX_DLG_DATA_DESCR_CB_SYMBOL -->
+<!-- removed HID SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SYMBOL" id="bm_id2496108" localize="false"/>
-<paragraph role="heading" id="hd_id3150298" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Show legend key</paragraph>
-<paragraph role="paragraph" id="par_id3150205" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL">Displays the legend icons next to each data point label.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150298" role="heading" level="2" l10n="CHG"
+                 oldref="15">Show legend key</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150205" role="paragraph" l10n="U" oldref="16"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL">Displays the legend icons next to each data point label.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SEPARATOR" id="bm_id6416821" localize="false"/>
-<paragraph role="heading" id="hd_id3836787" xml-lang="en-US" level="2" l10n="NEW">Separator</paragraph>
-<paragraph role="paragraph" id="par_id6668904" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the separator between multiple text strings for the same object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3836787" role="heading" level="2" l10n="NEW">Separator</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6668904" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the separator between multiple text strings for the same object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PLACEMENT" id="bm_id110620081228356" localize="false"/>
-<paragraph role="heading" id="hd_id4319284" xml-lang="en-US" level="2" l10n="NEW">Placement</paragraph>
-<paragraph role="paragraph" id="par_id5159459" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the placement of data labels relative to the objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id4319284" role="heading" level="2" l10n="NEW">Placement</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5159459" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the placement of data labels relative to the objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TEXTDIRECTION" id="bm_id1106200812295486" localize="false"/>
-<paragraph role="heading" id="hd_id1106200812280727" xml-lang="en-US" level="3" l10n="NEW">Text Direction</paragraph>
-<paragraph role="paragraph" id="par_id1106200812280719" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id1106200812280727" role="heading" level="2" l10n="NEW">Text Direction</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1106200812280719" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_KNOB" id="bm_id100720090156524" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1007200901590713" role="heading" level="2" l10n="NEW">Rotate Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1007200901590752" role="paragraph" l10n="NEW"><ahelp hid=".">Click in the dial to set the text orientation for the data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_EDIT" id="bm_id1007200901571849" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1007200901590757" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the rotation angle for the data labels. A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/04040000.xhp b/helpcontent2/source/text/schart/01/04040000.xhp
index 8c9aed771b..2b5d3372ab 100644
--- a/helpcontent2/source/text/schart/01/04040000.xhp
+++ b/helpcontent2/source/text/schart/01/04040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04040000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,28 +48,28 @@
 <bookmark_value>axes; better scaling</bookmark_value>
 <bookmark_value>secondary axes in charts</bookmark_value>
 </bookmark><comment>mw made "secondary axes;" a one level entry, deleted "charts; showing secondary axes" and generated one "axes;" enry out of two "axes;showing..." entries</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAxis" id="bm_id3146121" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="1" l10n="U" oldref="1">Axes</paragraph>
-<paragraph role="paragraph" id="par_id3150330" xml-lang="en-US" l10n="U" oldref="2"><variable id="achsen"><ahelp hid=".uno:InsertAxis">Specifies the axes to be displayed in the chart.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuAxes" id="bm_id3146121" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="1" l10n="U" oldref="1">Axes</paragraph>
+<paragraph role="paragraph" id="par_id3150330" xml-lang="en-US" l10n="U" oldref="2"><variable id="achsen"><ahelp hid=".uno:InsertMenuAxes">Specifies the axes to be displayed in the chart.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/schart/00/00000004.xhp#efgaug"/>
 </section>
 <paragraph role="heading" id="hd_id3156385" xml-lang="en-US" level="2" l10n="U" oldref="46">Major axis</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_AXIS_CB_X_PRIMARY" id="bm_id3147343" localize="false"/>
+<!-- removed HID SCH_CHECKBOX_DLG_AXIS_CB_X_PRIMARY -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_XAXIS" id="bm_id8561357" localize="false"/><paragraph role="heading" id="hd_id3146316" xml-lang="en-US" level="3" l10n="U" oldref="5">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SCH_CHECKBOX_DLG_AXIS_CB_X_PRIMARY">Displays the X axis as a line with subdivisions.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_AXIS:CB_Y_PRIMARY" id="bm_id3148488" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_Y_PRIMARY -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_YAXIS" id="bm_id5721915" localize="false"/><paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="17">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3154020" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SCH:CHECKBOX:DLG_AXIS:CB_Y_PRIMARY">Displays the Y axis as a line with subdivisions.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_AXIS:CB_Z_PRIMARY" id="bm_id3166423" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_Z_PRIMARY -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_ZAXIS" id="bm_id5266884" localize="false"/><paragraph role="heading" id="hd_id3150345" xml-lang="en-US" level="3" l10n="U" oldref="28">Z axis</paragraph>
 <paragraph role="paragraph" id="par_id3155113" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SCH:CHECKBOX:DLG_AXIS:CB_Z_PRIMARY">Displays the Z axis as a line with subdivisions.</ahelp> This axis can only be displayed in 3D charts.</paragraph>
 <paragraph role="heading" id="hd_id3150206" xml-lang="en-US" level="2" l10n="U" oldref="36">Secondary axis</paragraph>
 <paragraph role="paragraph" id="par_id3166428" xml-lang="en-US" l10n="U" oldref="37">Use this area to assign a second axis to your chart. If a data series is already assigned to this axis, $[officename] automatically displays the axis and the label. You can turn off these settings later on. If no data has been assigned to this axis and you activate this area, the values of the primary Y axis are applied to the secondary axis.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_AXIS:CB_X_SECONDARY" id="bm_id3146978" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_X_SECONDARY -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_SECONDARY_XAXIS" id="bm_id7411420" localize="false"/><paragraph role="heading" id="hd_id3152988" xml-lang="en-US" level="3" l10n="U" oldref="44">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3156445" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SCH:CHECKBOX:DLG_AXIS:CB_X_SECONDARY">Displays a secondary X axis in the chart.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_AXIS:CB_Y_SECONDARY" id="bm_id3148700" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_AXIS:CB_Y_SECONDARY -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_SECONDARY_YAXIS" id="bm_id5671559" localize="false"/><paragraph role="heading" id="hd_id3152896" xml-lang="en-US" level="3" l10n="U" oldref="38">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SCH:CHECKBOX:DLG_AXIS:CB_Y_SECONDARY">Displays a secondary Y axis in the chart.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SCH:CHECKBOX:DLG_AXIS:CB_Y_SECONDARY">The major axis and the secondary axis can have different scaling. For example, you can scale one axis to 2 in. and the other to 1.5 in. </ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04050000.xhp b/helpcontent2/source/text/schart/01/04050000.xhp
index b4ee3a429f..75d27aaffb 100644
--- a/helpcontent2/source/text/schart/01/04050000.xhp
+++ b/helpcontent2/source/text/schart/01/04050000.xhp
@@ -4,13 +4,11 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: 04050000.xhp,v $fileonly,v $
- *
- *  $Revision: 1.9.4.3 $
- *
- *  last change: $Author: ufi $ $Date: 2008/09/16 12:40:37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,11 +38,11 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertStatistics" id="bm_id3154013" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertYErrorbar" id="bm_id877101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuYErrorBars" id="bm_id877101" localize="false"/>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/schart/01/04050000.xhp" name="Y Error Bars">Y Error Bars</link></paragraph><comment>i85330</comment>
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="statistik"><ahelp hid=".uno:InsertStatistics">Use the <emph>Y Error Bars</emph> dialog to display error bars for 2D charts.</ahelp>
+<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="statistik"><ahelp hid=".">Use the <emph>Y Error Bars</emph> dialog to display error bars for 2D charts.</ahelp>
 </variable></paragraph>
+<embed href="text/schart/01/04030000.xhp#context"/>
 <section id="howtoget">
 <embed href="text/schart/00/00000004.xhp#efgsta"/>
 </section>
@@ -52,26 +50,26 @@
 <paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="CHG" oldref="23">The <emph>Insert - Y Error Bars</emph> menu command is only available for 2D charts.</paragraph>
 <paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="2" l10n="U" oldref="5">Error category</paragraph>
 <paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="6">In the <emph>Error category</emph> area, you can choose different ways to display the error category.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_NONE" id="bm_id3156445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_NONE" id="bm_id3156449" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_NONE -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_NONE -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_NO_ERROR" id="bm_id3862117" localize="false"/>
 <paragraph role="heading" id="hd_id3152989" xml-lang="en-US" level="3" l10n="CHG" oldref="7">None</paragraph>
 <paragraph role="paragraph" id="par_id3149409" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SCH:RADIOBUTTON:TP_STAT:RBT_NONE">Does not show any error bars.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_CONST" id="bm_id3149052" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_PLUS" id="bm_id3153955" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_MINUS" id="bm_id3153960" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_CONST" id="bm_id3153336" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_STAT:MTR_FLD_PLUS" id="bm_id3153340" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_STAT:MTR_FLD_MINUS" id="bm_id3147298" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_CONST -->
+<!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_PLUS -->
+<!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_MINUS -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_CONST -->
+<!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_PLUS -->
+<!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_MINUS -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_CONSTERROR" id="bm_id3964964" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_PLUS_VALUE" id="bm_id5771965" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_MINUS_VALUE" id="bm_id1989196" localize="false"/>
 <paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="3" l10n="U" oldref="17">Constant value</paragraph>
 <paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SCH:METRICFIELD:TP_STAT:MTR_FLD_MINUS">Displays constant values that you specify in the Parameters area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_PERCENT" id="bm_id3145358" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_PERCENT" id="bm_id3154762" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_PERCENTVALUE" id="bm_id3145362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_STAT:MTR_FLD_PERCENT" id="bm_id3154650" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_PERCENT -->
+<!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_PERCENT -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_PERCENTVALUE -->
+<!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_PERCENT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_PERCENT" id="bm_id3336588" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_PERCENT_VALUE" id="bm_id1381572" localize="false"/>
 <paragraph role="heading" id="hd_id3159204" xml-lang="en-US" level="3" l10n="U" oldref="13">Percentage</paragraph>
@@ -81,18 +79,18 @@
 <paragraph role="heading" id="hd_id8977629" xml-lang="en-US" level="3" l10n="NEW">Functions</paragraph>
 <paragraph role="paragraph" id="par_id7109286" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a function to calculate the error bars.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id5154576" xml-lang="en-US" l10n="NEW">Standard Error: Displays the standard error.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_VARIANT" id="bm_id3148868" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_VARIANT" id="bm_id3151239" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_VARIANT -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_VARIANT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_VARIANT" id="bm_id1840876" localize="false"/>
 <paragraph role="paragraph" id="par_id3157979" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".">Variance: Displays the variance calculated from the number of data points and respective values.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_SIGMA" id="bm_id3156017" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_SIGMA" id="bm_id3156021" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_SIGMA -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_SIGMA -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_SIGMA" id="bm_id1873836" localize="false"/>
 <paragraph role="paragraph" id="par_id3153249" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid=".">Standard Deviation: Displays the standard deviation (square root of the variance).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_BIGERROR" id="bm_id3154707" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_BIGERROR" id="bm_id3154711" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_BIGERROR" id="bm_id3151197" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_STAT:MTR_FLD_BIGERROR" id="bm_id3153070" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_BIGERROR -->
+<!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_BIGERROR -->
+<!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_BIGERROR -->
+<!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_BIGERROR -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_BIGERROR" id="bm_id5876949" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_BIGERROR_VALUE" id="bm_id9021271" localize="false"/>
 <paragraph role="paragraph" id="par_id3149870" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid=".">Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area.</ahelp></paragraph>
@@ -116,7 +114,7 @@
 <paragraph role="heading" id="hd_id0428200810573977" xml-lang="en-US" level="3" l10n="NEW">Same value for both</paragraph>
 <paragraph role="paragraph" id="par_id0428200810573991" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable to use the positive error values also as negative error values. You can only change the value of the "Positve (+)" box. That value gets copied to the "Negative (-)" box automatically.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CT_INDICATE" id="bm_id3166467" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_CT_INDICATE2" id="bm_id3150533" localize="false"/>
+<!-- removed HID HID_SCH_CT_INDICATE2 -->
 <paragraph role="heading" id="hd_id3156396" xml-lang="en-US" level="2" l10n="U" oldref="19">Error indicator</paragraph>
 <paragraph role="paragraph" id="par_id3150539" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="HID_SCH_CT_INDICATE2">Specifies the error indicator.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_SHOW_BOTH" id="bm_id0428200810544351" localize="false"/>
diff --git a/helpcontent2/source/text/schart/01/04050100.xhp b/helpcontent2/source/text/schart/01/04050100.xhp
index 2c728ac160..aec3873dde 100644
--- a/helpcontent2/source/text/schart/01/04050100.xhp
+++ b/helpcontent2/source/text/schart/01/04050100.xhp
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04050100.xhp,v $
- *
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -36,106 +31,118 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textschart0104050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Trend Lines </title>
-<filename>/text/schart/01/04050100.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart0104050100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Trend Lines </title>
+         <filename>/text/schart/01/04050100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1744743"><bookmark_value>calculating;regression curves</bookmark_value>
-<bookmark_value>regression curves in charts</bookmark_value>
-<bookmark_value>trend lines in charts</bookmark_value>
-<bookmark_value>mean value lines in charts</bookmark_value>
+      <bookmark_value>regression curves in charts</bookmark_value>
+      <bookmark_value>trend lines in charts</bookmark_value>
+      <bookmark_value>mean value lines in charts</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendline" id="bm_id2001709" localize="false"/><paragraph role="heading" id="hd_id5409405" xml-lang="en-US" level="1" l10n="CHG"><variable id="regression"><link href="text/schart/01/04050100.xhp">Trend Lines</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTrendlines" id="bm_id2001709" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5409405" role="heading" level="1" l10n="CHG"><variable id="regression"><link href="text/schart/01/04050100.xhp">Trend Lines</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id7272255" xml-lang="en-US" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Regression curves, also known as trend lines, can be added to all 2D chart types except for Pie and Stock charts.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id7272255" role="paragraph" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Regression curves, also known as trend lines, can be added to all 2D chart types except for Pie and Stock charts.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/schart/00/00000004.xhp#trendlines"/>
-</section><comment>None</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_NONE" id="bm_id2659077" localize="false"/><paragraph role="paragraph" id="par_id143436" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">No trend line is shown.</ahelp></paragraph><comment>Linear</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_LINEAR" id="bm_id6944181" localize="false"/><paragraph role="paragraph" id="par_id5716727" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">A linear trend line is shown.</ahelp></paragraph><comment>Logarithmic</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_LOGARITHMIC" id="bm_id886257" localize="false"/><paragraph role="paragraph" id="par_id5840021" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">A logarithmic trend line is shown.</ahelp></paragraph><comment>Exponential</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_EXPONENTIAL" id="bm_id8892483" localize="false"/><paragraph role="paragraph" id="par_id9417096" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An exponential trend line is shown.</ahelp></paragraph><comment>Power</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_POWER" id="bm_id7198400" localize="false"/><paragraph role="paragraph" id="par_id8482924" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">A power trend line is shown.</ahelp></paragraph><comment>Show equation</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_SHOW_EQUATION" id="bm_id4724875" localize="false"/><paragraph role="paragraph" id="par_id8962370" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Shows the trend line equation next to the trend line.</ahelp></paragraph><comment>Show correlation coefficient (R2)</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_SHOW_R_SQUARED" id="bm_id9068880" localize="false"/><paragraph role="paragraph" id="par_id6889858" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Shows the correlation coefficient next to the trend line.</ahelp></paragraph>
-<paragraph role="note" id="par_id8398998" xml-lang="en-US" l10n="CHG">If you insert a trend line to a chart type that uses categories, like <emph>Line </emph>or <emph>Column, </emph>then the numbers 1, 2, 3, <emph>…</emph> are used as x-values to calculate the trend line.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5676747" xml-lang="en-US" l10n="CHG">To insert trend lines for all data series, double-click the chart to enter edit mode. Choose <item type="menuitem">Insert - Trend Lines</item>, then select the type of trend line from None, Linear, Logarithmic, Exponential, or Power trend line.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4349192" xml-lang="en-US" l10n="CHG">To insert a trend line for a single data series, select the data series in the chart, right-click to open the context menu, and choose <item type="menuitem">Insert - Trend Line</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9337443" xml-lang="en-US" l10n="NEW">To delete a single trend line or mean value line, click the line, then press the Del key.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4529251" xml-lang="en-US" l10n="NEW">To delete all trend lines, choose <item type="menuitem">Insert - Trend Lines</item>, then select <emph>None</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id296334" xml-lang="en-US" l10n="CHG">A trend line is shown in the legend automatically.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMeanValues" id="bm_id7854243" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMeanValue" id="bm_id7854245" localize="false"/><paragraph role="paragraph" id="par_id4072084" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Mean Value Lines are special trend lines that show the mean value. Use <item type="menuitem">Insert - Mean Value Lines</item> to insert mean value lines for all data series. A single mean value line can be inserted by the <emph>Insert Mean Value Line</emph> command of the context menu of a data series.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id9569689" xml-lang="en-US" l10n="NEW">The trend line has the same color as the corresponding data series. To change the line properties, select the trend line and choose <item type="menuitem">Format - Object Properties - Line</item>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquation" id="bm_id2754600" localize="false"/><paragraph role="paragraph" id="par_id846888" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <emph>Insert Trend Line Equation</emph>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id8962065" xml-lang="en-US" l10n="CHG">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the correlation coefficient R². Click on the trend line to see the information in the status bar.</paragraph>
-<paragraph role="note" id="par_id1328470" xml-lang="en-US" l10n="NEW">For a category chart (for example a line chart), the regression information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph>
-<paragraph role="paragraph" id="par_id8092593" xml-lang="en-US" l10n="NEW">To show the equation and the correlation coefficient, select the regression curve and choose <item type="menuitem">Format - Object Properties - Equation</item>. <comment>see http://specs.openoffice.org/chart/DisplayTrendLineEquations.odt</comment></paragraph><comment>hid</comment><paragraph role="paragraph" id="par_id7971434" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment><paragraph role="paragraph" id="par_id558793" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show correlation coefficient to see the correlation coefficient of the regression curve.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id7735221" xml-lang="en-US" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph>
-<paragraph role="heading" id="hd_id5744193" xml-lang="en-US" level="2" l10n="NEW">The linear regression equation</paragraph>
-<paragraph role="paragraph" id="par_id9251991" xml-lang="en-US" l10n="NEW">The <emph>linear regression</emph> follows the equation <item type="literal">y=m*x+b</item>.</paragraph>
-<paragraph role="code" id="par_id7951902" xml-lang="en-US" l10n="NEW">m = SLOPE(Data_Y;Data_X) </paragraph>
-<paragraph role="code" id="par_id6637165" xml-lang="en-US" l10n="NEW">b = INTERCEPT(Data_Y ;Data_X) </paragraph>
-<paragraph role="paragraph" id="par_id7879268" xml-lang="en-US" l10n="NEW">Calculate the coefficient of determination by</paragraph>
-<paragraph role="code" id="par_id9244361" xml-lang="en-US" l10n="NEW">r² = RSQ(Data_Y;Data_X) </paragraph>
-<paragraph role="paragraph" id="par_id2083498" xml-lang="en-US" l10n="NEW">Besides m, b and r² the array function <emph>LINEST</emph> provides additional statistics for a regression analysis.</paragraph>
-<paragraph role="heading" id="hd_id2538834" xml-lang="en-US" level="2" l10n="NEW">The logarithm regression equation</paragraph>
-<paragraph role="paragraph" id="par_id394299" xml-lang="en-US" l10n="NEW">The <emph>logarithm regression</emph> follows the equation <item type="literal">y=a*ln(x)+b</item>.</paragraph>
-<paragraph role="code" id="par_id2134159" xml-lang="en-US" l10n="NEW">a = SLOPE(Data_Y;LN(Data_X)) </paragraph>
-<paragraph role="code" id="par_id5946531" xml-lang="en-US" l10n="NEW">b = INTERCEPT(Data_Y ;LN(Data_X)) </paragraph>
-<paragraph role="code" id="par_id5649281" xml-lang="en-US" l10n="NEW">r² = RSQ(Data_Y;LN(Data_X)) </paragraph>
-<paragraph role="heading" id="hd_id7874080" xml-lang="en-US" level="2" l10n="NEW">The exponential regression equation</paragraph>
-<paragraph role="paragraph" id="par_id4679097" xml-lang="en-US" l10n="NEW"> For exponential regression curves a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph>
-<paragraph role="paragraph" id="par_id9112216" xml-lang="en-US" l10n="NEW">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
-<paragraph role="code" id="par_id4416638" xml-lang="en-US" l10n="NEW">a = SLOPE(LN(Data_Y);Data_X) </paragraph>
-<paragraph role="paragraph" id="par_id1039155" xml-lang="en-US" l10n="CHG">The variables for the second variation are calculated as follows:</paragraph>
-<paragraph role="code" id="par_id7184057" xml-lang="en-US" l10n="NEW">m = EXP(SLOPE(LN(Data_Y);Data_X)) </paragraph>
-<paragraph role="code" id="par_id786767" xml-lang="en-US" l10n="NEW">b = EXP(INTERCEPT(LN(Data_Y);Data_X)) </paragraph>
-<paragraph role="paragraph" id="par_id7127292" xml-lang="en-US" l10n="NEW">Calculate the coefficient of determination by</paragraph>
-<paragraph role="code" id="par_id5437177" xml-lang="en-US" l10n="NEW">r² = RSQ(LN(Data_Y);Data_X) </paragraph>
-<paragraph role="paragraph" id="par_id6946317" xml-lang="en-US" l10n="NEW">Besides m, b and r² the array function LOGEST provides additional statistics for a regression analysis.</paragraph>
-<paragraph role="heading" id="hd_id6349375" xml-lang="en-US" level="2" l10n="NEW">The power regression equation</paragraph>
-<paragraph role="paragraph" id="par_id1857661" xml-lang="en-US" l10n="NEW"> For <emph>power regression</emph> curves a transformation to a linear model takes place. The power regression follows the equation <item type="literal">y=b*x^a</item> , which is transformed to <item type="literal">ln(y)=ln(b)+a*ln(x)</item>.</paragraph>
-<paragraph role="code" id="par_id8517105" xml-lang="en-US" l10n="NEW">a = SLOPE(LN(Data_Y);LN(Data_X)) </paragraph>
-<paragraph role="code" id="par_id9827265" xml-lang="en-US" l10n="NEW">b = EXP(INTERCEPT(LN(Data_Y);LN(Data_X)) </paragraph>
-<paragraph role="code" id="par_id2357249" xml-lang="en-US" l10n="NEW">r² = RSQ(LN(Data_Y);LN(Data_X)) </paragraph>
-<paragraph role="heading" id="hd_id9204077" xml-lang="en-US" level="2" l10n="NEW">Constraints<comment>UFI: is this still so?</comment></paragraph>
-<paragraph role="paragraph" id="par_id7393719" xml-lang="en-US" l10n="CHG"> The calculation of the trend line considers only data pairs with the following values:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7212744" xml-lang="en-US" l10n="NEW">logarithm regression: only positive x-values are considered,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1664479" xml-lang="en-US" l10n="NEW">exponential regression: only positive y-values are considered,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8734702" xml-lang="en-US" l10n="NEW">power regression: only positive x-values and positive y-values are considered.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id181279" xml-lang="en-US" l10n="NEW">You should transform your data accordingly; it is best to work on a copy of the original data and transform the copied data.</paragraph>
-<paragraph role="heading" id="hd_id7907040" xml-lang="en-US" level="2" l10n="NEW">The polynomial regression equation</paragraph>
-<paragraph role="paragraph" id="par_id8918729" xml-lang="en-US" l10n="NEW">A <emph>polynomial regression</emph> curve cannot be added automatically. You must calculate this curve manually. </paragraph>
-<paragraph role="paragraph" id="par_id33875" xml-lang="en-US" l10n="NEW">Create a table with the columns x, x², x³, … , xⁿ, y up to the desired degree n. </paragraph>
-<paragraph role="paragraph" id="par_id8720053" xml-lang="en-US" l10n="NEW">Use the formula <item type="literal">=LINEST(Data_Y,Data_X)</item> with the complete range x to xⁿ (without headings) as Data_X. </paragraph>
-<paragraph role="paragraph" id="par_id5068514" xml-lang="en-US" l10n="NEW">The first row of the LINEST output contains the coefficients of the regression polynomial, with the coefficient of xⁿ at the leftmost position.</paragraph>
-<paragraph role="paragraph" id="par_id8202154" xml-lang="en-US" l10n="NEW">The first element of the third row of the LINEST output is the value of r². See the <link href="text/scalc/01/04060107.xhp#Section8">LINEST</link> function for details on proper use and an explanation of the other output parameters.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id4562211" xml-lang="en-US" l10n="CHG"><link href="text/schart/01/04050000.xhp">Y Error Bars tab page</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <embed href="text/schart/01/04030000.xhp#context"/>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#trendlines"/>
+      </section><comment>None</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_NONE" id="bm_id2659077" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id143436" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">No trend line is shown.</ahelp></paragraph><comment>Linear</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_LINEAR" id="bm_id6944181" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5716727" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">A linear trend line is shown.</ahelp></paragraph><comment>Logarithmic</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_LOGARITHMIC" id="bm_id886257" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5840021" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">A logarithmic trend line is shown.</ahelp></paragraph><comment>Exponential</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_EXPONENTIAL" id="bm_id8892483" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id9417096" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">An exponential trend line is shown.</ahelp></paragraph><comment>Power</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_RB_POWER" id="bm_id7198400" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8482924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">A power trend line is shown.</ahelp></paragraph><comment>Show equation</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_SHOW_EQUATION" id="bm_id4724875" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8962370" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows the trend line equation next to the trend line.</ahelp></paragraph><comment>Show correlation coefficient (R2)</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_TRENDLINE_SHOW_R_SQUARED" id="bm_id9068880" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6889858" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Shows the coefficient of determination next to the trend line.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id8398998" role="note" l10n="CHG">If you insert a trend line to a chart type that uses categories, like <emph>Line </emph>or <emph>Column, </emph>then the numbers 1, 2, 3, <emph>…</emph> are used as x-values to calculate the trend line.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5676747" role="paragraph" l10n="CHG">To insert trend lines for all data series, double-click the chart to enter edit mode. Choose <item type="menuitem">Insert - Trend Lines</item>, then select the type of trend line from None, Linear, Logarithmic, Exponential, or Power trend line.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4349192" role="paragraph" l10n="CHG">To insert a trend line for a single data series, select the data series in the chart, right-click to open the context menu, and choose <item type="menuitem">Insert - Trend Line</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9337443" role="paragraph" l10n="NEW">To delete a single trend line or mean value line, click the line, then press the Del key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4529251" role="paragraph" l10n="NEW">To delete all trend lines, choose <item type="menuitem">Insert - Trend Lines</item>, then select <emph>None</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id296334" role="note" l10n="CHG">A trend line is shown in the legend automatically.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuMeanValues" id="bm_id7854243" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4072084" role="paragraph" l10n="NEW"><ahelp hid=".">Mean Value Lines are special trend lines that show the mean value. Use <item type="menuitem">Insert - Mean Value Lines</item> to insert mean value lines for data series.</ahelp></paragraph>
+<embed href="text/schart/01/04030000.xhp#context"/>
+      <paragraph xml-lang="en-US" id="par_id9569689" role="paragraph" l10n="NEW">The trend line has the same color as the corresponding data series. To change the line properties, select the trend line and choose <item type="menuitem">Format - Format Selection - Line</item>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquation" id="bm_id2754600" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id846888" role="paragraph" l10n="NEW"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <emph>Insert Trend Line Equation</emph>.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id8962065" role="paragraph" l10n="CHG">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the coefficient of determination R². Click on the trend line to see the information in the status bar.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="NEW">For a category chart (for example a line chart), the regression information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the regression curve and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment>
+<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the regression curve.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id7735221" role="paragraph" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5744193" role="heading" level="2" l10n="NEW">The linear regression equation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9251991" role="paragraph" l10n="NEW">The <emph>linear regression</emph> follows the equation <item type="literal">y=m*x+b</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7951902" role="code" l10n="NEW">m = SLOPE(Data_Y;Data_X) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6637165" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;Data_X) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id7879268" role="paragraph" l10n="NEW">Calculate the coefficient of determination by</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9244361" role="code" l10n="NEW">r² = RSQ(Data_Y;Data_X) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2083498" role="paragraph" l10n="NEW">Besides m, b and r² the array function <emph>LINEST</emph> provides additional statistics for a regression analysis.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2538834" role="heading" level="2" l10n="NEW">The logarithm regression equation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id394299" role="paragraph" l10n="NEW">The <emph>logarithm regression</emph> follows the equation <item type="literal">y=a*ln(x)+b</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2134159" role="code" l10n="NEW">a = SLOPE(Data_Y;LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id5946531" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id5649281" role="code" l10n="NEW">r² = RSQ(Data_Y;LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7874080" role="heading" level="2" l10n="NEW">The exponential regression equation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="NEW"> For exponential regression curves a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id9112216" role="paragraph" l10n="NEW">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4416638" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);Data_X) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id1039155" role="paragraph" l10n="CHG">The variables for the second variation are calculated as follows:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7184057" role="code" l10n="NEW">m = EXP(SLOPE(LN(Data_Y);Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id786767" role="code" l10n="NEW">b = EXP(INTERCEPT(LN(Data_Y);Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id7127292" role="paragraph" l10n="NEW">Calculate the coefficient of determination by</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5437177" role="code" l10n="NEW">r² = RSQ(LN(Data_Y);Data_X) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6946317" role="paragraph" l10n="NEW">Besides m, b and r² the array function LOGEST provides additional statistics for a regression analysis.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6349375" role="heading" level="2" l10n="NEW">The power regression equation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1857661" role="paragraph" l10n="NEW"> For <emph>power regression</emph> curves a transformation to a linear model takes place. The power regression follows the equation <item type="literal">y=b*x^a</item> , which is transformed to <item type="literal">ln(y)=ln(b)+a*ln(x)</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8517105" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id9827265" role="code" l10n="NEW">b = EXP(INTERCEPT(LN(Data_Y);LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2357249" role="code" l10n="NEW">r² = RSQ(LN(Data_Y);LN(Data_X)) </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9204077" role="heading" level="2" l10n="NEW">Constraints<comment>UFI: is this still so?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id7393719" role="paragraph" l10n="CHG"> The calculation of the trend line considers only data pairs with the following values:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7212744" role="paragraph" l10n="NEW">logarithm regression: only positive x-values are considered,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1664479" role="paragraph" l10n="NEW">exponential regression: only positive y-values are considered,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8734702" role="paragraph" l10n="NEW">power regression: only positive x-values and positive y-values are considered.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id181279" role="paragraph" l10n="NEW">You should transform your data accordingly; it is best to work on a copy of the original data and transform the copied data.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7907040" role="heading" level="2" l10n="NEW">The polynomial regression equation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8918729" role="paragraph" l10n="NEW">A <emph>polynomial regression</emph> curve cannot be added automatically. You must calculate this curve manually. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id33875" role="paragraph" l10n="NEW">Create a table with the columns x, x², x³, … , xⁿ, y up to the desired degree n. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id8720053" role="paragraph" l10n="NEW">Use the formula <item type="literal">=LINEST(Data_Y,Data_X)</item> with the complete range x to xⁿ (without headings) as Data_X. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id5068514" role="paragraph" l10n="NEW">The first row of the LINEST output contains the coefficients of the regression polynomial, with the coefficient of xⁿ at the leftmost position.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8202154" role="paragraph" l10n="NEW">The first element of the third row of the LINEST output is the value of r². See the <link href="text/scalc/01/04060107.xhp#Section8">LINEST</link> function for details on proper use and an explanation of the other output parameters.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id4562211" role="paragraph" l10n="CHG"><link href="text/schart/01/04050000.xhp">Y Error Bars tab page</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/04060000.xhp b/helpcontent2/source/text/schart/01/04060000.xhp
index 303638dc53..b7efbb2e79 100755
--- a/helpcontent2/source/text/schart/01/04060000.xhp
+++ b/helpcontent2/source/text/schart/01/04060000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,56 +29,79 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textschart0104060000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/schart/01/04060000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="optionen">
+      <topic id="textschart0104060000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Options</title>
+         <filename>/text/schart/01/04060000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="optionen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149400"><bookmark_value>aligning; 2D charts</bookmark_value>
-<bookmark_value>charts; aligning</bookmark_value>
-<bookmark_value>pie charts;options</bookmark_value>
+         <bookmark_value>charts; aligning</bookmark_value>
+         <bookmark_value>pie charts;options</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/schart/01/04060000.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="CHG" oldref="2">Use this dialog to define some options that are available for specific chart types. The contents of the Options dialog vary with the chart type.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/schart/00/00000004.xhp#optionen"/>
-</section>
-<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="2" l10n="U" oldref="9">Align data series to:</paragraph>
-<paragraph role="paragraph" id="par_id3145228" xml-lang="en-US" l10n="U" oldref="10">In this area you can choose between two Y axis scaling modes. The axes can only be scaled and given properties separately.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1" id="bm_id3154703" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1" id="bm_id8064516" localize="false"/><paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="4">Primary Y axis</paragraph>
-<paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1">This option is active as default. All data series are aligned to the primary Y axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_2" id="bm_id3150205" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2" id="bm_id9959715" localize="false"/><paragraph role="heading" id="hd_id3143221" xml-lang="en-US" level="3" l10n="U" oldref="5">Secondary Y axis</paragraph>
-<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_2">Changes the scaling of the Y axis. This axis is only visible when at least one data series is assigned to it and the axis view is active.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3166423" xml-lang="en-US" level="2" l10n="U" oldref="6">Settings</paragraph>
-<paragraph role="paragraph" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="12">Define the settings for a bar chart in this area. Any changes apply to all data series of the chart, not to the selected data only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_OPTIONS:MT_GAP" id="bm_id3166428" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_OPTIONS:MT_GAP" id="bm_id6286812" localize="false"/><paragraph role="heading" id="hd_id3145584" xml-lang="en-US" level="3" l10n="U" oldref="7">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3155376" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SCH:METRICFIELD:TP_OPTIONS:MT_GAP">Defines the spacing between the columns in percent.</ahelp> The maximal spacing is 600%.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_OPTIONS:MT_OVERLAP" id="bm_id3146978" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_OPTIONS:MT_OVERLAP" id="bm_id119022" localize="false"/><paragraph role="heading" id="hd_id3145384" xml-lang="en-US" level="3" l10n="U" oldref="8">Overlap</paragraph>
-<paragraph role="paragraph" id="par_id3156447" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SCH:METRICFIELD:TP_OPTIONS:MT_OVERLAP">Defines the necessary settings for overlapping data series.</ahelp> You can choose between -100 and +100%.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_OPTIONS:CB_CONNECTOR" id="bm_id3153815" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR" id="bm_id5567491" localize="false"/><paragraph role="heading" id="hd_id3153305" xml-lang="en-US" level="3" l10n="U" oldref="16">Connection Lines</paragraph>
-<paragraph role="paragraph" id="par_id3148868" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_OPTIONS:CB_CONNECTOR">For "stacked" and "percent" column (vertical bar) charts, mark this check box to connect the column layers that belong together with lines.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2_CheckBox_TP_OPTIONS_CB_BARS_SIDE_BY_SIDE" id="bm_id8464003" localize="false"/><paragraph role="heading" id="hd_id9842219" xml-lang="en-US" level="3" l10n="NEW">Show bars side by side</paragraph>
-<paragraph role="paragraph" id="par_id9800103" xml-lang="en-US" l10n="NEW">If two axes are shown in a bar chart, and some data series are attached to the first axis, while some other data series are attached to the second axis, then both sets of data series are shown independently, overlapping each other.</paragraph>
-<paragraph role="paragraph" id="par_id2144535" xml-lang="en-US" l10n="NEW">As a result, bars attached to the first y-axis are partly or completely hidden by bars attached to the second y-axis. To avoid this, enable the option to display bars side by side. <ahelp hid=".">The bars from different data series are shown as if they were attached only to one axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE" id="bm_id7622913" localize="false"/><paragraph role="heading" id="hd_id24414" xml-lang="en-US" level="2" l10n="NEW">Clockwise direction</paragraph>
-<paragraph role="paragraph" id="par_id2527237" xml-lang="en-US" l10n="NEW">Available for pie and donut charts. <ahelp hid=".">The default direction in which the pieces of a pie chart are ordered is counterclockwise. Enable the <emph>Clockwise direction</emph> checkbox to draw the pieces in opposite direction.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCH_STARTING_ANGLE_DIAL" id="bm_id2421643" localize="false"/><paragraph role="heading" id="hd_id401013" xml-lang="en-US" level="2" l10n="NEW">Starting angle</paragraph>
-<paragraph role="paragraph" id="par_id761131" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Drag the small dot along the circle or click any position on the circle to set the starting angle of a pie or donut chart. The starting angle is the mathematical angle position where the first piece is drawn. The value of 90 degrees draws the first piece at the 12 o'clock position. A value of 0 degrees starts at the 3 o'clock position.</ahelp></paragraph>
-<paragraph role="note" id="par_id553910" xml-lang="en-US" l10n="NEW">In 3D pie and donut charts that were created with older versions of the software, the starting angle is 0 degrees instead of 90 degrees. For old and new 2D charts the default starting angle is 90 degrees.</paragraph>
-<paragraph role="note" id="par_id1414838" xml-lang="en-US" l10n="NEW">When you change the starting angle or the direction, only current versions of the software show the changed values. Older versions of the software display the same document using the default values: Always counterclockwise direction and a starting value of 90 degrees (2D pie charts) or 0 degrees (3D pie charts).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE" id="bm_id5705740" localize="false"/><paragraph role="heading" id="hd_id3179723" xml-lang="en-US" level="3" l10n="NEW">Degrees</paragraph>
-<paragraph role="paragraph" id="par_id2164067" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the starting angle between 0 and 359 degrees. You can also click the arrows to change the displayed value.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3149400" role="heading" level="1" l10n="U" oldref="1"><link href="text/schart/01/04060000.xhp" name="Options">Options</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155067" role="paragraph" l10n="CHG" oldref="2">Use this dialog to define some options that are available for specific chart types. The contents of the Options dialog vary with the chart type.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#optionen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3150043" role="heading" level="2" l10n="U" oldref="9">Align data series to:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145228" role="paragraph" l10n="U" oldref="10">In this area you can choose between two Y axis scaling modes. The axes can only be scaled and given properties separately.</paragraph>
+<!-- removed HID SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1 -->
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1" id="bm_id8064516" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147346" role="heading" level="2" l10n="U" oldref="4">Primary Y axis</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="15"><ahelp hid="SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1">This option is active as default. All data series are aligned to the primary Y axis.</ahelp></paragraph>
+<!-- removed HID SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_2 -->
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2" id="bm_id9959715" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3143221" role="heading" level="2" l10n="U" oldref="5">Secondary Y axis</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="11"><ahelp hid="SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_2">Changes the scaling of the Y axis. This axis is only visible when at least one data series is assigned to it and the axis view is active.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3166423" role="heading" level="2" l10n="U" oldref="6">Settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150365" role="paragraph" l10n="U" oldref="12">Define the settings for a bar chart in this area. Any changes apply to all data series of the chart, not to the selected data only.</paragraph>
+<!-- removed HID SCH:METRICFIELD:TP_OPTIONS:MT_GAP -->
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_OPTIONS:MT_GAP" id="bm_id6286812" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145584" role="heading" level="2" l10n="U" oldref="7">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155376" role="paragraph" l10n="U" oldref="13"><ahelp hid="SCH:METRICFIELD:TP_OPTIONS:MT_GAP">Defines the spacing between the columns in percent.</ahelp> The maximal spacing is 600%.</paragraph>
+<!-- removed HID SCH:METRICFIELD:TP_OPTIONS:MT_OVERLAP -->
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_OPTIONS:MT_OVERLAP" id="bm_id119022" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145384" role="heading" level="2" l10n="U" oldref="8">Overlap</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156447" role="paragraph" l10n="U" oldref="14"><ahelp hid="SCH:METRICFIELD:TP_OPTIONS:MT_OVERLAP">Defines the necessary settings for overlapping data series.</ahelp> You can choose between -100 and +100%.</paragraph>
+<!-- removed HID SCH:CHECKBOX:TP_OPTIONS:CB_CONNECTOR -->
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR" id="bm_id5567491" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153305" role="heading" level="2" l10n="U"
+                 oldref="16">Connection Lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148868" role="paragraph" l10n="U" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_OPTIONS:CB_CONNECTOR">For "stacked" and "percent" column (vertical bar) charts, mark this check box to connect the column layers that belong together with lines.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE" id="bm_id8464003" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9842219" role="heading" level="2" l10n="NEW">Show bars side by side</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9800103" role="paragraph" l10n="NEW">If two axes are shown in a bar chart, and some data series are attached to the first axis, while some other data series are attached to the second axis, then both sets of data series are shown independently, overlapping each other.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2144535" role="paragraph" l10n="NEW">As a result, bars attached to the first y-axis are partly or completely hidden by bars attached to the second y-axis. To avoid this, enable the option to display bars side by side. <ahelp hid=".">The bars from different data series are shown as if they were attached only to one axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE" id="bm_id7622913" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id24414" role="heading" level="2" l10n="NEW">Clockwise direction</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2527237" role="paragraph" l10n="NEW">Available for pie and donut charts. <ahelp hid=".">The default direction in which the pieces of a pie chart are ordered is counterclockwise. Enable the <emph>Clockwise direction</emph> checkbox to draw the pieces in opposite direction.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_STARTING_ANGLE_DIAL" id="bm_id2421643" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id401013" role="heading" level="2" l10n="NEW">Starting angle</paragraph>
+      <paragraph xml-lang="en-US" id="par_id761131" role="paragraph" l10n="NEW"><ahelp hid=".">Drag the small dot along the circle or click any position on the circle to set the starting angle of a pie or donut chart. The starting angle is the mathematical angle position where the first piece is drawn. The value of 90 degrees draws the first piece at the 12 o'clock position. A value of 0 degrees starts at the 3 o'clock position.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id553910" role="note" l10n="NEW">In 3D pie and donut charts that were created with older versions of the software, the starting angle is 0 degrees instead of 90 degrees. For old and new 2D charts the default starting angle is 90 degrees.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1414838" role="note" l10n="NEW">When you change the starting angle or the direction, only current versions of the software show the changed values. Older versions of the software display the same document using the default values: Always counterclockwise direction and a starting value of 90 degrees (2D pie charts) or 0 degrees (3D pie charts).</paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE" id="bm_id5705740" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3179723" role="heading" level="2" l10n="NEW">Degrees</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2164067" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the starting angle between 0 and 359 degrees. You can also click the arrows to change the displayed value.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0305200910524613" role="heading" level="2" l10n="NEW">Plot missing values</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0305200910524650" role="paragraph" l10n="NEW">Sometimes values are missing in a data series that is shown in a chart. You can select from different options how to plot the missing values. The options are available for some chart types only.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT" id="bm_id0305200910520854" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200910524823" role="heading" level="2" l10n="NEW">Leave gap</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0305200910524811" role="paragraph" l10n="NEW"><ahelp hid=".">For a missing value, no data will be shown. This is the default for chart types Column, Bar, Line, Net.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO" id="bm_id0305200910522325" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200910524811" role="heading" level="2" l10n="NEW">Assume zero</paragraph>
+      <paragraph xml-lang="en-US" id="par_id030520091052489" role="paragraph" l10n="NEW"><ahelp hid=".">For a missing value, the y-value will be shown as zero. This is the default for chart type Area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE" id="bm_id0305200910523975" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200910524837" role="heading" level="2" l10n="NEW">Continue line</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0305200910524938" role="paragraph" l10n="NEW"><ahelp hid=".">For a missing value, the interpolation from the neighbor values will be shown. This is the default for chart type XY.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS" id="bm_id0825200904350621" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200910524937" role="heading" level="2" l10n="NEW">Include values from hidden cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id030520091052494" role="paragraph" l10n="NEW"><ahelp hid=".">Check to also show values of currently hidden cells within the source cell range.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/04070000.xhp b/helpcontent2/source/text/schart/01/04070000.xhp
index 95d2e02b27..fda0a36573 100644
--- a/helpcontent2/source/text/schart/01/04070000.xhp
+++ b/helpcontent2/source/text/schart/01/04070000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,43 +45,43 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>axes; inserting grids</bookmark_value>
 <bookmark_value>grids; inserting in charts</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertGrids" id="bm_id3145748" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuGrids" id="bm_id3145748" localize="false"/>
 <paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="1" l10n="U" oldref="1">Grids</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="2"><variable id="gitter"><ahelp hid=".uno:InsertGrids">You can divide the axes into sections by assigning gridlines to them. This allows you to get a better overview of the chart, especially if you are working with large charts.</ahelp>
+<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="2"><variable id="gitter"><ahelp hid=".">You can divide the axes into sections by assigning gridlines to them. This allows you to get a better overview of the chart, especially if you are working with large charts.</ahelp>
 </variable> The Y axis major grid is activated by default.</paragraph>
 <section id="howtoget">
   <embed href="text/schart/00/00000004.xhp#efgaugg"/>
 </section>
 <paragraph role="heading" id="hd_id3156286" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Major grids</paragraph>
 <paragraph role="paragraph" id="par_id3154511" xml-lang="en-US" l10n="U" oldref="4">Defines the axis to be set as the major grid.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_X_MAIN" id="bm_id3155067" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_X_MAIN -->
 <paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="5">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_X_MAIN">Adds gridlines to the X axis of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleGridHorizontal" id="bm_id3149020" localize="false"/>
 <paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="sytextxgitter"><ahelp hid=".uno:ToggleGridHorizontal">The <emph>Horizontal Grid On/Off</emph> icon on the <emph>Formatting</emph> bar toggles the visibility of the grid display for the X axis. Note: This only works if the <emph>Minor grid</emph> check boxes in <emph>Insert - Grids</emph> are cleared.</ahelp>
 </variable> Otherwise, the minor grid remains visible when the major grid is turned off.</paragraph>
 <embed href="text/schart/00/00000004.xhp#gitterx"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_Y_MAIN" id="bm_id3150298" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_Y_MAIN -->
 <paragraph role="heading" id="hd_id3145228" xml-lang="en-US" level="3" l10n="U" oldref="8">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_Y_MAIN">Adds gridlines to the Y axis of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleGridVertical" id="bm_id3155115" localize="false"/>
 <paragraph role="paragraph" id="par_id3150344" xml-lang="en-US" l10n="CHG" oldref="10"><variable id="sytextygitter"><ahelp hid=".uno:ToggleGridVertical">The <emph>Vertical Grid On/Off</emph> icon on the <emph>Formatting</emph> bar toggles the visibility of the grid display for the Y axis. Note: This only works if the X-axis <emph>Minor grid</emph> is not selected in <emph>Insert - Grids</emph>.</ahelp>
 </variable> Otherwise, the minor grid remains visible when the major grid is turned off.</paragraph>
 <embed href="text/schart/00/00000004.xhp#gittery"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_Z_MAIN" id="bm_id3150200" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_Z_MAIN -->
 <paragraph role="heading" id="hd_id3166430" xml-lang="en-US" level="3" l10n="U" oldref="11">Z axis</paragraph>
 <paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_Z_MAIN">Adds gridlines to the Z axis of the chart.</ahelp> This option is only available if you're working with 3D charts.</paragraph>
 <paragraph role="heading" id="hd_id3146978" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Minor grids</paragraph>
 <paragraph role="paragraph" id="par_id3156449" xml-lang="en-US" l10n="U" oldref="14">Use this area to assign a minor grid for each axis. Assigning minor grids to the axis reduces the distance between the major grids.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_X_HELP" id="bm_id3152900" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_X_HELP -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_SECONDARY_XGRID" id="bm_id1858882" localize="false"/>
 <paragraph role="heading" id="hd_id3153308" xml-lang="en-US" level="3" l10n="U" oldref="15">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3148704" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_X_HELP">Adds gridlines that subdivide the X axis into smaller sections.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_Y_HELP" id="bm_id3155268" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_Y_HELP -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_SECONDARY_YGRID" id="bm_id2156132" localize="false"/>
 <paragraph role="heading" id="hd_id3153917" xml-lang="en-US" level="3" l10n="U" oldref="17">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3154536" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_Y_HELP">Adds gridlines that subdivide the Y axis into smaller sections.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:DLG_GRID:CB_Z_HELP" id="bm_id3150212" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:DLG_GRID:CB_Z_HELP -->
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_SECONDARY_ZGRID" id="bm_id9931943" localize="false"/>
 <paragraph role="heading" id="hd_id3148607" xml-lang="en-US" level="3" l10n="U" oldref="19">Z axis</paragraph>
 <paragraph role="paragraph" id="par_id3153247" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SCH:CHECKBOX:DLG_GRID:CB_Z_HELP">Adds gridlines that subdivide the Z axis into smaller sections.</ahelp> This option is only available if you're working with 3D charts.</paragraph>
diff --git a/helpcontent2/source/text/schart/01/05010000.xhp b/helpcontent2/source/text/schart/01/05010000.xhp
index 5ba1a8b5c5..054e04b518 100644
--- a/helpcontent2/source/text/schart/01/05010000.xhp
+++ b/helpcontent2/source/text/schart/01/05010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,22 +33,18 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textschart0105010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Object Properties</title>
+<title id="tit" xml-lang="en-US">Format Selection</title>
 <filename>/text/schart/01/05010000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-29T10:31:37">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149666"><bookmark_value>objects;properties of charts</bookmark_value>
 <bookmark_value>charts; properties</bookmark_value>
 <bookmark_value>properties;charts</bookmark_value>
 </bookmark><comment>mw changed "properties;"</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:DiagramObjects" id="bm_id3147436" localize="false"/>
-<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1" l10n="U" oldref="1">Object Properties</paragraph>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="2"><variable id="objekteigenschaften"><ahelp hid=".uno:DiagramObjects">Assigns certain properties to the selected object.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatSelection" id="bm_id3147436" localize="false"/>
+<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Selection</paragraph>
+<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="2"><variable id="objekteigenschaften"><ahelp hid=".">Formats the selected object.</ahelp>
 </variable> Depending on the object selected, the command opens dialogs that you can also open by choosing the following commands from the <emph>Format</emph> menu:</paragraph>
 <section id="howtoget">
   <embed href="text/schart/00/00000004.xhp#frtoes"/>
diff --git a/helpcontent2/source/text/schart/01/05010100.xhp b/helpcontent2/source/text/schart/01/05010100.xhp
index 8b715fa095..6996698f33 100644
--- a/helpcontent2/source/text/schart/01/05010100.xhp
+++ b/helpcontent2/source/text/schart/01/05010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
   
   <section id="datenpunkt">
   <paragraph id="hd_id3153768" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/schart/01/05010100.xhp" name="Data Point">Data Point</link></paragraph>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3152577" l10n="U" oldref="2">This dialog allows you to change the properties of a selected data point. The dialog appears when there is only one data point selected when you choose <emph>Format - Object Properties</emph>. Some of the menu entries are only available for 2D or 3D charts.</paragraph>
+  <paragraph xml-lang="en-US" role="paragraph" id="par_id3152577" l10n="U" oldref="2">This dialog allows you to change the properties of a selected data point. The dialog appears when there is only one data point selected when you choose <emph>Format - Format Selection</emph>. Some of the menu entries are only available for 2D or 3D charts.</paragraph>
   </section>
   <paragraph role="note" id="par_id3149121" l10n="U" xml-lang="en-US" oldref="3">Any changes made only affect this one data point. For example, if you edit the color of a bar, only the color of that bar will be different.</paragraph>
   <section id="howtoget">
diff --git a/helpcontent2/source/text/schart/01/05010200.xhp b/helpcontent2/source/text/schart/01/05010200.xhp
index d7d3b263b0..5d1cfc427f 100644
--- a/helpcontent2/source/text/schart/01/05010200.xhp
+++ b/helpcontent2/source/text/schart/01/05010200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <section id="datenreihe">
 <paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/schart/01/05010200.xhp" name="Data Series">Data Series</link></paragraph>
-<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="2">Use this to change the properties of a selected data series. This dialog appears when one data series is selected when you choose <emph>Format - Object Properties</emph>. Some of the menu entries are only available for 2D or 3D charts.</paragraph>
+<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="2">Use this to change the properties of a selected data series. This dialog appears when one data series is selected when you choose <emph>Format - Format Selection</emph>. Some of the menu entries are only available for 2D or 3D charts.</paragraph>
 </section>
 <paragraph role="note" id="par_id3154015" xml-lang="en-US" l10n="U" oldref="4">Any changes made here affect the entire data series. For example, if you change the color, all elements belonging to this data series will change color.</paragraph>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/schart/01/05020000.xhp b/helpcontent2/source/text/schart/01/05020000.xhp
index ddfd4b9867..4cac653f13 100755
--- a/helpcontent2/source/text/schart/01/05020000.xhp
+++ b/helpcontent2/source/text/schart/01/05020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05020100.xhp b/helpcontent2/source/text/schart/01/05020100.xhp
index bcc3a69d70..d75952bcdc 100644
--- a/helpcontent2/source/text/schart/01/05020100.xhp
+++ b/helpcontent2/source/text/schart/01/05020100.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,37 +29,35 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textschart0105020100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Title</title>
-<filename>/text/schart/01/05020100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:26:49">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textschart0105020100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Title</title>
+         <filename>/text/schart/01/05020100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150769"><bookmark_value>editing; titles</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:MainTitle" id="bm_id3150870" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:XTitle" id="bm_id3150441" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZTitle" id="bm_id3153771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SubTitle" id="bm_id3154686" localize="false"/><comment>moved the subtitle bookmark here from 0502020</comment>
-<paragraph role="heading" id="hd_id3150769" xml-lang="en-US" level="1" l10n="U" oldref="2">Title</paragraph>
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="U" oldref="1"><variable id="titel"><ahelp hid=".uno:ZTitle">Modifies the properties of the selected title.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:SubTitle" id="bm_id3154686" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SecondaryXTitle" id="bm_id082520090430086" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SecondaryYTitle" id="bm_id0825200904302515" localize="false"/><comment>moved the subtitle bookmark here from 0502020</comment>
+<paragraph xml-lang="en-US" id="hd_id3150769" role="heading" level="1" l10n="U" oldref="2">Title</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149666" role="paragraph" l10n="U" oldref="1"><variable id="titel"><ahelp hid=".uno:ZTitle">Modifies the properties of the selected title.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#frtoe"/>
-</section>
-<embed href="text/shared/01/05200100.xhp#linie"/>
-<embed href="text/shared/01/05210100.xhp#flaeche"/>
-<embed href="text/shared/01/05210700.xhp#transparenz"/>
-<paragraph role="heading" id="hd_id3149378" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/05020100.xhp" name="Character">Character</link></paragraph>
-<embed href="text/shared/01/05020100.xhp#zn"/>
-<embed href="text/schart/01/05020101.xhp#ausricht"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#frtoe"/>
+      </section>
+      <embed href="text/shared/01/05200100.xhp#linie"/>
+      <embed href="text/shared/01/05210100.xhp#flaeche"/>
+      <embed href="text/shared/01/05210700.xhp#transparenz"/>
+      <paragraph xml-lang="en-US" id="hd_id3149378" role="heading" level="2" l10n="U" oldref="3"><link href="text/shared/01/05020100.xhp" name="Character">Character</link></paragraph>
+      <embed href="text/shared/01/05020100.xhp#zn"/>
+      <embed href="text/schart/01/05020101.xhp#ausricht"/>
+      <embed href="text/shared/00/00000001.xhp#zurueck"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/05020101.xhp b/helpcontent2/source/text/schart/01/05020101.xhp
index da23522185..03faf7b3c0 100644
--- a/helpcontent2/source/text/schart/01/05020101.xhp
+++ b/helpcontent2/source/text/schart/01/05020101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05020200.xhp b/helpcontent2/source/text/schart/01/05020200.xhp
index 90abebb27c..a324aaa9b9 100644
--- a/helpcontent2/source/text/schart/01/05020200.xhp
+++ b/helpcontent2/source/text/schart/01/05020200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05020201.xhp b/helpcontent2/source/text/schart/01/05020201.xhp
index e69fc55dae..663c6be648 100644
--- a/helpcontent2/source/text/schart/01/05020201.xhp
+++ b/helpcontent2/source/text/schart/01/05020201.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020201.xhp,v $
- * $Revision: 1.7.36.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <section id="howtoget">
 <embed href="text/schart/00/00000004.xhp#frttyab"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR" id="bm_id3153726" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR -->
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR" id="bm_id8467055" localize="false"/>
 <paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="2" l10n="U" oldref="71">Show labels</paragraph>
 <paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR">Specifies whether to show or hide the axis labels.</ahelp></paragraph>
@@ -73,37 +70,37 @@
 </section>
 <paragraph role="heading" id="hd_id3152985" xml-lang="en-US" level="2" l10n="U" oldref="73">Text flow</paragraph>
 <paragraph role="paragraph" id="par_id3155089" xml-lang="en-US" l10n="U" oldref="74">Determines the text flow of the data label.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP" id="bm_id3148868" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP -->
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP" id="bm_id9935911" localize="false"/>
 <paragraph role="heading" id="hd_id3148837" xml-lang="en-US" level="3" l10n="U" oldref="57">Overlap</paragraph>
 <paragraph role="paragraph" id="par_id3151240" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP">Specifies that the text in cells may overlap other cells.</ahelp> This can be especially useful if there is a lack of space. This option is not available with different title directions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK" id="bm_id3154535" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK -->
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK" id="bm_id4753868" localize="false"/>
 <paragraph role="heading" id="hd_id3157982" xml-lang="en-US" level="3" l10n="U" oldref="68">Break</paragraph>
 <paragraph role="paragraph" id="par_id3155268" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK">Allows a text break.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159205" xml-lang="en-US" level="3" l10n="U" oldref="56">The following options are not available for all chart types:</paragraph>
 <paragraph role="heading" id="hd_id3152872" xml-lang="en-US" level="2" l10n="U" oldref="59">Order</paragraph>
 <paragraph role="paragraph" id="par_id3159230" xml-lang="en-US" l10n="U" oldref="11">The options on this tab are only available for a 2D chart, under <emph>Format - Axis - Y Axis</emph> or <emph>X Axis</emph>. In this area, you can define the alignment of the number labels on the X or Y axis.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE" id="bm_id3153809" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE -->
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE" id="bm_id4744407" localize="false"/>
 <paragraph role="heading" id="hd_id3146963" xml-lang="en-US" level="3" l10n="U" oldref="60">Tile</paragraph>
 <paragraph role="paragraph" id="par_id3155758" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE">Arranges numbers on the axis side by side.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN" id="bm_id3149873" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN -->
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN" id="bm_id6054261" localize="false"/>
 <paragraph role="heading" id="hd_id3151195" xml-lang="en-US" level="3" l10n="U" oldref="62">Stagger odd</paragraph>
 <paragraph role="paragraph" id="par_id3145114" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN">Staggers numbers on the axis, even numbers lower than odd numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP" id="bm_id3153337" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP -->
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP" id="bm_id2744224" localize="false"/>
 <paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="3" l10n="U" oldref="64">Stagger even</paragraph>
 <paragraph role="paragraph" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP">Stagger numbers on the axes, odd numbers lower than even numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER" id="bm_id3151389" localize="false"/>
+<!-- removed HID SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER -->
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER" id="bm_id9631946" localize="false"/>
 <paragraph role="heading" id="hd_id3147301" xml-lang="en-US" level="3" l10n="U" oldref="66">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SCH:RADIOBUTTON:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER">Automatically arranges numbers on the axis.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149353" xml-lang="en-US" l10n="U" oldref="70">Problems may arise in displaying labels if the size of your chart is too small. You can avoid this by either enlarging the view or decreasing the font size.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TEXTDIRECTION_TITLE" id="bm_id110620080215497" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TEXTDIRECTION_EQUATION" id="bm_id1106200802172848" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551947796" id="bm_id1110200804221568" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_LISTBOX_TP_AXIS_LABEL_LB_AXIS_TEXTDIR" id="bm_id1110200804221568" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR" id="bm_id1110200804243271" localize="false"/><comment>need to create a new Equation dialog box main page with links to sub pages later. This page then contains only the Text Direction control.</comment>
 <paragraph role="heading" id="hd_id1106200812235146" xml-lang="en-US" level="3" l10n="NEW">Text Direction</paragraph>
 <paragraph role="paragraph" id="par_id1106200812235271" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/05030000.xhp b/helpcontent2/source/text/schart/01/05030000.xhp
index 172ff5b55f..6aec5c6ee4 100644
--- a/helpcontent2/source/text/schart/01/05030000.xhp
+++ b/helpcontent2/source/text/schart/01/05030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05040000.xhp b/helpcontent2/source/text/schart/01/05040000.xhp
index ed89390407..4705f8c2dc 100644
--- a/helpcontent2/source/text/schart/01/05040000.xhp
+++ b/helpcontent2/source/text/schart/01/05040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05040100.xhp b/helpcontent2/source/text/schart/01/05040100.xhp
index cb66c58789..4b125e260a 100644
--- a/helpcontent2/source/text/schart/01/05040100.xhp
+++ b/helpcontent2/source/text/schart/01/05040100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05040200.xhp b/helpcontent2/source/text/schart/01/05040200.xhp
index b41d67472d..b9b5a23a22 100644
--- a/helpcontent2/source/text/schart/01/05040200.xhp
+++ b/helpcontent2/source/text/schart/01/05040200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05040201.xhp b/helpcontent2/source/text/schart/01/05040201.xhp
index 801d22d5cc..aa195e17f5 100644
--- a/helpcontent2/source/text/schart/01/05040201.xhp
+++ b/helpcontent2/source/text/schart/01/05040201.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05040201.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textschart0105040201xml" indexer="include">
 <title id="tit" xml-lang="en-US">Scale</title>
@@ -58,52 +55,52 @@
 <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="3">To achieve specific results, you can manually change the axis scaling. For example, you can display only the top areas of the columns by shifting the zero line upwards.</paragraph>
 <paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="2" l10n="U" oldref="4">Scale</paragraph>
 <paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="CHG" oldref="5">You can enter values for subdividing axes in this area. You can automatically set the properties <emph>Minimum, Maximum, Major interval, Minor interval count</emph> and <emph>Reference value</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_SPINFIELD_TP_SCALE_EDT_MIN" id="bm_id3154754" localize="false"/>
+<!-- removed HID SCH_SPINFIELD_TP_SCALE_EDT_MIN -->
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_SCALE:EDT_MIN" id="bm_id2984710" localize="false"/>
 <paragraph role="heading" id="hd_id3150751" xml-lang="en-US" level="3" l10n="U" oldref="6">Minimum</paragraph>
 <paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="SCH_SPINFIELD_TP_SCALE_EDT_MIN">Defines the minimum value for the beginning of the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_SPINFIELD_TP_SCALE_EDT_MAX" id="bm_id3147338" localize="false"/>
+<!-- removed HID SCH_SPINFIELD_TP_SCALE_EDT_MAX -->
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_SCALE:EDT_MAX" id="bm_id2057252" localize="false"/>
 <paragraph role="heading" id="hd_id3156385" xml-lang="en-US" level="3" l10n="U" oldref="8">Maximum</paragraph>
 <paragraph role="paragraph" id="par_id3159266" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SCH_SPINFIELD_TP_SCALE_EDT_MAX">Defines the maximum value for the end of the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_SPINFIELD_TP_SCALE_EDT_STEP_MAIN" id="bm_id3155960" localize="false"/>
+<!-- removed HID SCH_SPINFIELD_TP_SCALE_EDT_STEP_MAIN -->
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_SCALE:EDT_STEP_MAIN" id="bm_id6926786" localize="false"/>
 <paragraph role="heading" id="hd_id3155336" xml-lang="en-US" level="3" l10n="U" oldref="10">Major interval</paragraph>
 <paragraph role="paragraph" id="par_id3143218" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SCH_SPINFIELD_TP_SCALE_EDT_STEP_MAIN">Defines the interval for the main division of the axes.</ahelp> The main interval cannot be larger than the value area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:METRICFIELD:TP_SCALE:MT_STEPHELP" id="bm_id3150344" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH_SPINFIELD_TP_SCALE_EDT_STEP_HELP" id="bm_id3150305" localize="false"/>
+<!-- removed HID SCH:METRICFIELD:TP_SCALE:MT_STEPHELP -->
+<!-- removed HID SCH_SPINFIELD_TP_SCALE_EDT_STEP_HELP -->
 <bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_SCALE:MT_STEPHELP" id="bm_id8941618" localize="false"/>
 <paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="3" l10n="CHG" oldref="12">Minor interval count</paragraph>
 <paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SCH_SPINFIELD_TP_SCALE_EDT_STEP_HELP">Defines the interval for the subdivision of the axes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH_SPINFIELD_TP_SCALE_EDT_ORIGIN" id="bm_id3155376" localize="false"/>
+<!-- removed HID SCH_SPINFIELD_TP_SCALE_EDT_ORIGIN -->
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_SCALE:EDT_ORIGIN" id="bm_id6544083" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551670788" id="bm_id1006200803185455" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_SPINFIELD_TP_SCALE_EDT_ORIGIN" id="bm_id1006200803185455" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_SCALE:EDT_ORIGIN" id="bm_id1006200805182181" localize="false"/>
 <paragraph role="heading" id="hd_id3150089" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Reference value</paragraph>
 <paragraph role="paragraph" id="par_id3152990" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SCH_SPINFIELD_TP_SCALE_EDT_ORIGIN">Specifies at which position to display the values along the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_AUTO_MIN" id="bm_id3155530" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_AUTO_MAX" id="bm_id3156445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_AUTO_STEP_MAIN" id="bm_id3156450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_AUTO_STEP_HELP" id="bm_id3154487" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id3152987" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_AUTO_MIN -->
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_AUTO_MAX -->
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_AUTO_STEP_MAIN -->
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_AUTO_STEP_HELP -->
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_AUTO_ORIGIN -->
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN" id="bm_id1964476" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX" id="bm_id1011688" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN" id="bm_id708639" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP" id="bm_id5169225" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id6670125" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551666693" id="bm_id1006200803192265" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_SCALE_CBX_AUTO_ORIGIN" id="bm_id1006200803192265" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id1006200805190759" localize="false"/>
 <paragraph role="heading" id="hd_id3166432" xml-lang="en-US" level="3" l10n="U" oldref="62">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3145389" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_AUTO_ORIGIN">You must first deselect the <emph>Automatic</emph> option in order to modify the values.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="64">Disable this feature if you are working with "fixed" values, as it does not permit automatic scaling.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE:CBX_LOGARITHM" id="bm_id3154651" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE:CBX_LOGARITHM -->
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_LOGARITHM" id="bm_id2118594" localize="false"/>
 <paragraph role="heading" id="hd_id3159206" xml-lang="en-US" level="3" l10n="U" oldref="16">Logarithmic scale</paragraph>
 <paragraph role="paragraph" id="par_id3145360" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</ahelp></paragraph>
 <paragraph role="note" id="par_id3153956" xml-lang="en-US" l10n="U" oldref="61">Use this feature if you are working with values that differ sharply from each other. You can use logarithmic scaling to make the grid lines of the axis equidistant but have values that may increase or decrease.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2_CheckBox_TP_SCALE_CBX_REVERSE" id="bm_id4007080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id4007080" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id1024200803164240" localize="false"/>
 <paragraph role="heading" id="hd_id9941404" xml-lang="en-US" level="3" l10n="NEW">Reverse direction</paragraph>
-<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.<comment>http://specs.openoffice.org/chart/Chart_Scales_and_Intervals.odt</comment></paragraph>
+<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/schart/01/05040202.xhp b/helpcontent2/source/text/schart/01/05040202.xhp
index e92a57be53..afa0ecf5a9 100644
--- a/helpcontent2/source/text/schart/01/05040202.xhp
+++ b/helpcontent2/source/text/schart/01/05040202.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040202.xhp,v $
- * $Revision: 1.1.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,50 +52,50 @@
 <embed href="text/schart/00/00000004.xhp#positioning"/>
 </section>
 <paragraph role="heading" id="hd_id1006200801024782" xml-lang="en-US" level="2" l10n="NEW">Axis line</paragraph>
-<bookmark xml-lang="en-US" branch="hid/551685633" id="bm_id1006200812484446" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_LISTBOX_TP_AXIS_POSITIONS_LB_CROSSES_OTHER_AXIS_AT" id="bm_id1006200812484446" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT" id="bm_id1006200805113310" localize="false"/>
 <paragraph role="paragraph" id="par_id1006200801024970" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select where to cross the other axis: at start, at end, at a specified value, or at a category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/551687171" id="bm_id1006200801472176" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_SPINFIELD_TP_AXIS_POSITIONS_EDT_CROSSES_OTHER_AXIS_AT" id="bm_id1006200801472176" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT" id="bm_id1006200805121926" localize="false"/><comment>value selected</comment>
 <paragraph role="paragraph" id="par_id1006200801024957" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the value where the axis line should cross the other axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/551686148" id="bm_id1006200801475131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_COMBOBOX_TP_AXIS_POSITIONS_EDT_CROSSES_OTHER_AXIS_AT_CATEGORY" id="bm_id1006200801475131" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY" id="bm_id1006200805134034" localize="false"/><comment>category selected</comment>
 <paragraph role="paragraph" id="par_id100620080102503" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the category where the axis line should cross the other axis.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id100620080102509" xml-lang="en-US" level="2" l10n="NEW">Labels</paragraph>
-<bookmark xml-lang="en-US" branch="hid/551685634" id="bm_id1006200801483463" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_LISTBOX_TP_AXIS_POSITIONS_LB_PLACE_LABELS" id="bm_id1006200801483463" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS" id="bm_id1006200805141692" localize="false"/>
 <paragraph role="heading" id="hd_id1006200801523879" xml-lang="en-US" level="3" l10n="NEW">Place labels</paragraph>
 <paragraph role="paragraph" id="par_id1006200801523889" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select where to place the labels: near axis, near axis (other side), outside start, or outside end.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id1006200801025030" xml-lang="en-US" level="2" l10n="NEW">Interval marks</paragraph>
 <paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="3" l10n="CHG" oldref="65">Major:</paragraph>
 <paragraph role="paragraph" id="par_id3150397" xml-lang="en-US" l10n="U" oldref="71">Specifies whether the marks are to be on the inner or outer side of the axis. It is possible to combine both: you will then see marks on both sides.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_INNER" id="bm_id3146322" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE_Y:CBX_TICKS_INNER" id="bm_id166020" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551683074" id="bm_id1006200801511432" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_INNER -->
+<!-- removed HID chart2:CheckBox:TP_SCALE_Y:CBX_TICKS_INNER -->
+<bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_AXIS_POSITIONS_CB_TICKS_INNER" id="bm_id1006200801511432" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER" id="bm_id1006200805150554" localize="false"/>
 <paragraph role="heading" id="hd_id3151387" xml-lang="en-US" level="3" l10n="U" oldref="66">Inner</paragraph>
 <paragraph role="paragraph" id="par_id3156399" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_INNER">Specifies that marks are placed on the inner side of the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_OUTER" id="bm_id3157873" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE_Y:CBX_TICKS_OUTER" id="bm_id6386913" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551683075" id="bm_id1006200801513081" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_OUTER -->
+<!-- removed HID chart2:CheckBox:TP_SCALE_Y:CBX_TICKS_OUTER -->
+<bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_AXIS_POSITIONS_CB_TICKS_OUTER" id="bm_id1006200801513081" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER" id="bm_id100620080515253" localize="false"/>
 <paragraph role="heading" id="hd_id3166469" xml-lang="en-US" level="3" l10n="U" oldref="67">Outer</paragraph>
 <paragraph role="paragraph" id="par_id3153120" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_OUTER">Specifies that marks are placed on the outer side of the axis.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159128" xml-lang="en-US" level="2" l10n="U" oldref="68">Minor:</paragraph>
 <paragraph role="paragraph" id="par_id3146885" xml-lang="en-US" l10n="U" oldref="74">This area is used to define the marking dashes between the axis marks. It is possible to activate both fields. This will result in a marking line running from the outside to the inside.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_INNER" id="bm_id3157906" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE_Y:CBX_HELPTICKS_INNER" id="bm_id6062196" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551683076" id="bm_id1006200801514858" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_INNER -->
+<!-- removed HID chart2:CheckBox:TP_SCALE_Y:CBX_HELPTICKS_INNER -->
+<bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_AXIS_POSITIONS_CB_MINOR_INNER" id="bm_id1006200801514858" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER" id="bm_id100620080515528" localize="false"/>
 <paragraph role="heading" id="hd_id3150654" xml-lang="en-US" level="3" l10n="U" oldref="69">Inner</paragraph>
 <paragraph role="paragraph" id="par_id3146880" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_INNER">Specifies that minor interval marks are placed on the inner side of the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_OUTER" id="bm_id3146943" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE_Y:CBX_HELPTICKS_OUTER" id="bm_id1811578" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/551683077" id="bm_id1006200801520545" localize="false"/>
+<!-- removed HID SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_OUTER -->
+<!-- removed HID chart2:CheckBox:TP_SCALE_Y:CBX_HELPTICKS_OUTER -->
+<bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_AXIS_POSITIONS_CB_MINOR_OUTER" id="bm_id1006200801520545" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER" id="bm_id1006200805160860" localize="false"/>
 <paragraph role="heading" id="hd_id3154677" xml-lang="en-US" level="3" l10n="U" oldref="70">Outer</paragraph>
 <paragraph role="paragraph" id="par_id3150745" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid="SCH:CHECKBOX:TP_SCALE_Y:CBX_HELPTICKS_OUTER">Specifies that minor interval marks are placed on the outer side of the axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/551685638" id="bm_id1006200801523066" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CHART2_LISTBOX_TP_AXIS_POSITIONS_LB_PLACE_TICKS" id="bm_id1006200801523066" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS" id="bm_id1006200805165355" localize="false"/>
 <paragraph role="heading" id="hd_id1006200801025271" xml-lang="en-US" level="3" l10n="NEW">Place marks</paragraph>
 <paragraph role="paragraph" id="par_id1006200801025278" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select where to place the marks: at labels, at axis, or at axis and labels.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/05050000.xhp b/helpcontent2/source/text/schart/01/05050000.xhp
index 7fedc1aa0e..106db1721e 100755
--- a/helpcontent2/source/text/schart/01/05050000.xhp
+++ b/helpcontent2/source/text/schart/01/05050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05050100.xhp b/helpcontent2/source/text/schart/01/05050100.xhp
index 84cf875a6f..6ee28012d6 100644
--- a/helpcontent2/source/text/schart/01/05050100.xhp
+++ b/helpcontent2/source/text/schart/01/05050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05060000.xhp b/helpcontent2/source/text/schart/01/05060000.xhp
index 3e033f5b8a..f98612a6cd 100644
--- a/helpcontent2/source/text/schart/01/05060000.xhp
+++ b/helpcontent2/source/text/schart/01/05060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05070000.xhp b/helpcontent2/source/text/schart/01/05070000.xhp
index 602efefce9..d53146b6b8 100644
--- a/helpcontent2/source/text/schart/01/05070000.xhp
+++ b/helpcontent2/source/text/schart/01/05070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05080000.xhp b/helpcontent2/source/text/schart/01/05080000.xhp
index daaa2292dd..26e998d103 100644
--- a/helpcontent2/source/text/schart/01/05080000.xhp
+++ b/helpcontent2/source/text/schart/01/05080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/05120000.xhp b/helpcontent2/source/text/schart/01/05120000.xhp
index c8cd64dbbe..e6c563188e 100644
--- a/helpcontent2/source/text/schart/01/05120000.xhp
+++ b/helpcontent2/source/text/schart/01/05120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/choose_chart_type.xhp b/helpcontent2/source/text/schart/01/choose_chart_type.xhp
index 3e69cabfa2..8ebd4e6b7b 100644
--- a/helpcontent2/source/text/schart/01/choose_chart_type.xhp
+++ b/helpcontent2/source/text/schart/01/choose_chart_type.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: choose_chart_type.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,119 +29,125 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textschart01choose_chart_typexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Choosing a Chart Type</title>
-<filename>/text/schart/01/choose_chart_type.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-05T11:23:09">new file</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id9072237" xml-lang="en-US" level="1" l10n="NEW"><variable id="choose_chart_type"><link href="text/schart/01/choose_chart_type.xhp">Choosing a Chart Type</link>
+      <topic id="textschart01choose_chart_typexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Choosing a Chart Type</title>
+         <filename>/text/schart/01/choose_chart_type.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id9072237" role="heading" level="1" l10n="NEW"><variable id="choose_chart_type"><link href="text/schart/01/choose_chart_type.xhp">Choosing a Chart Type</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id7085787" xml-lang="en-US" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#wiz"/>
-</section>
-<paragraph role="heading" id="hd_id6820886" xml-lang="en-US" level="2" l10n="NEW">The available chart types</paragraph>
-<paragraph role="paragraph" id="par_id7309488" xml-lang="en-US" l10n="CHG">Choose from the following chart types, depending on data type and intended presentation effect.</paragraph>
-<table id="tbl_id2579119">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4673604" xml-lang="en-US" l10n="NEW">
-<image id="img_id3145172" src="chart2/res/columns_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145172" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id7085787" role="paragraph" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id6820886" role="heading" level="2" l10n="NEW">The available chart types</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7309488" role="paragraph" l10n="CHG">Choose from the following chart types, depending on data type and intended presentation effect.</paragraph>
+      <table id="tbl_id2579119">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4673604" role="tablecontent" l10n="NEW">
+<image id="img_id3145172" src="chart2/res/columns_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_id3145172">Icon</alt>
 	</image> and 
-<image id="Graphic8" src="chart2/res/bar_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic8" src="chart2/res/bar_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
+	</image></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2586138" role="tablecontent" l10n="CHG"><link href="text/schart/01/type_column_bar.xhp">Column or Bar</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4343394" role="tablecontent" l10n="NEW">
+<image id="Graphic2" src="chart2/res/pie_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2586138" xml-lang="en-US" l10n="CHG"><link href="text/schart/01/type_column_bar.xhp">Column or Bar</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4343394" xml-lang="en-US" l10n="NEW">
-<image id="Graphic2" src="chart2/res/pie_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3859065" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_pie.xhp">Pie</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id292672" role="tablecontent" l10n="NEW">
+<image id="Graphic21" src="chart2/res/areas_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3859065" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_pie.xhp">Pie</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id292672" xml-lang="en-US" l10n="NEW">
-<image id="Graphic21" src="chart2/res/areas_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4043092" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_area.xhp">Area</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2578814" role="tablecontent" l10n="NEW">
+<image id="Graphic3" src="chart2/res/nostackdirectboth_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4043092" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_area.xhp">Area</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2578814" xml-lang="en-US" l10n="NEW">
-<image id="Graphic3" src="chart2/res/nostackdirectlines_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4660481" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_line.xhp">Line</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3946653" role="tablecontent" l10n="NEW">
+<image id="Graphic4" src="chart2/res/valueaxisdirectpoints_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4660481" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_line.xhp">Line</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3946653" xml-lang="en-US" l10n="NEW">
-<image id="Graphic4" src="chart2/res/valueaxisdirectboth_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5882747" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_xy.xhp">XY (scatter)</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0526200904431454" role="tablecontent" l10n="NEW">
+<image id="graphics1" src="chart2/res/bubble_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5882747" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_xy.xhp">XY (scatter)</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8752403" xml-lang="en-US" l10n="NEW">
-<image id="Graphic5" src="chart2/res/net_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0526200904431497" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_bubble.xhp">Bubble</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8752403" role="tablecontent" l10n="NEW">
+<image id="Graphic5" src="chart2/res/net_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8425550" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_net.xhp">Net</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1846369" xml-lang="en-US" l10n="NEW">
-<image id="Graphic6" src="chart2/res/stock_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8425550" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_net.xhp">Net</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1846369" role="tablecontent" l10n="NEW">
+<image id="Graphic6" src="chart2/res/stock_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1680654" xml-lang="en-US" l10n="NEW"><link href="text/schart/01/type_stock.xhp">Stock</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1592150" xml-lang="en-US" l10n="NEW">
-<image id="Graphic7" src="chart2/res/columnline_52x60.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1680654" role="tablecontent" l10n="NEW"><link href="text/schart/01/type_stock.xhp">Stock</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1592150" role="tablecontent" l10n="NEW">
+<image id="Graphic7" src="chart2/res/columnline_52x60.png" width="0.6252in" height="0.5417in"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3308816" xml-lang="en-US" l10n="CHG"><link href="text/schart/01/type_column_line.xhp">Column and Line</link></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3308816" role="tablecontent" l10n="CHG"><link href="text/schart/01/type_column_line.xhp">Column and Line</link></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id8174687" xml-lang="en-US" l10n="NEW"> </paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id8174687" role="paragraph" l10n="NEW"> </paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/makefile.mk b/helpcontent2/source/text/schart/01/makefile.mk
index ddacc17ede..0e744ac56e 100644
--- a/helpcontent2/source/text/schart/01/makefile.mk
+++ b/helpcontent2/source/text/schart/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,6 +77,7 @@ XHPFILES = \
    smooth_line_properties.xhp \
    three_d_view.xhp \
    type_area.xhp \
+   type_bubble.xhp \
    type_column_bar.xhp \
    type_column_line.xhp \
    type_line.xhp \
@@ -96,4 +93,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
index d128ab84fe..463c4a5ffa 100644
--- a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
+++ b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smooth_line_properties.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/three_d_view.xhp b/helpcontent2/source/text/schart/01/three_d_view.xhp
index 8c64baccd5..24c396959a 100644
--- a/helpcontent2/source/text/schart/01/three_d_view.xhp
+++ b/helpcontent2/source/text/schart/01/three_d_view.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: three_d_view.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,126 +31,147 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textschart01three_d_viewxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">3D View </title>
-<filename>/text/schart/01/three_d_view.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart01three_d_viewxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">3D View </title>
+         <filename>/text/schart/01/three_d_view.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156423"><bookmark_value>3D charts</bookmark_value>
-<bookmark_value>charts; 3D views</bookmark_value>
-<bookmark_value>illumination; 3D charts</bookmark_value>
+      <bookmark_value>charts; 3D views</bookmark_value>
+      <bookmark_value>illumination; 3D charts</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:View3D" id="bm_id3150449" localize="false"/><comment>mw made "3D charts;" a one level entry</comment><paragraph role="heading" id="hd_id3464461" xml-lang="en-US" level="1" l10n="NEW"><variable id="three_d_view"><link href="text/schart/01/three_d_view.xhp">3D View</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:View3D" id="bm_id3150449" localize="false"/><comment>mw made "3D charts;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3464461" role="heading" level="1" l10n="NEW"><variable id="three_d_view"><link href="text/schart/01/three_d_view.xhp">3D View</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="CHG">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> or in the context menu of a chart you can choose a chart type. <ahelp hid="." visibility="hidden">Enables a three dimensional view for Column, Bar, Pie, and Area charts. For Line and XY (Scatter) charts you can see 3D lines.</ahelp><comment>must be AHID, see i80656</comment></paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#wiz"/>
-</section>
-<embed href="text/shared/00/00000001.xhp#ShiftF1"/>
-<paragraph role="paragraph" id="par_id6942045" xml-lang="en-US" l10n="NEW">The chart preview responds to the new settings that you enter in the dialog. </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3806878" xml-lang="en-US" l10n="NEW">When you leave the dialog with OK, the settings are applied permanently. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id130619" xml-lang="en-US" l10n="NEW">When you leave the dialog with Cancel or Escape, the chart returns to the state when you opened the dialog.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8081911" xml-lang="en-US" l10n="NEW">For a 3D chart you can choose <item type="menuitem">Format - 3D View</item> to set perspective, appearance and illumination.</paragraph>
-<paragraph role="heading" id="hd_id2924283" xml-lang="en-US" level="2" l10n="NEW">Perspective</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW">Enter the values for rotation of the chart on the three axes and for a perspective view.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9999694" xml-lang="en-US" l10n="NEW">Set all angles to 0 for a front view of the chart. Pie charts and donut charts are shown as circles.</paragraph>
-<paragraph role="paragraph" id="par_id2861720" xml-lang="en-US" l10n="NEW">With Right-angled axes enabled, you can rotate the chart contents only in X and Y direction, that is, parallel to the chart borders.</paragraph>
-<paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">An x value of 90, with y and z set to 0, provides a view from top down to the chart. With x set to -90, you see the bottom of the chart.</paragraph>
-<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US" l10n="NEW">The rotations are applied in the order first x, then y, last z.</paragraph>
-<paragraph role="paragraph" id="par_id9852900" xml-lang="en-US" l10n="NEW">When shading is enabled and you rotate a chart, the lights are rotated as if they are fixed to the chart.</paragraph>
-<paragraph role="note" id="par_id2578203" xml-lang="en-US" l10n="NEW">The rotation axes always relate to the page, not to the chart's axes. This is different from some other chart programs.</paragraph>
-<paragraph role="paragraph" id="par_id4923245" xml-lang="en-US" l10n="NEW">Select the Perspective check box to view the chart in central perspective as through a camera lens instead of using a parallel projection. </paragraph>
-<paragraph role="paragraph" id="par_id3416547" xml-lang="en-US" l10n="NEW">Set the focus length with the spin button. 100% gives a perspective view where a far edge in the chart looks approximately half as big as a near edge.</paragraph>
-<paragraph role="note" id="par_id3791924" xml-lang="en-US" l10n="NEW">Older versions of %PRODUCTNAME cannot display the percentage of perspective the same way as the current version.</paragraph><comment>Right-angled axes</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2_CheckBox_TP_3D_SCENEGEOMETRY_CBX_RIGHT_ANGLED_AXES" id="bm_id5293740" localize="false"/><paragraph role="paragraph" id="par_id7623828" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If Right-angled axes is enabled, you can rotate the chart contents only in X and Y direction, that is, parallel to the chart borders. Right-angled axes is enabled by default for newly created 3D charts. Pie and Donut charts do not support right-angled axes.</ahelp></paragraph><comment>X rotation</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION" id="bm_id6549272" localize="false"/><paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the x axis. The preview responds to the new settings.</ahelp></paragraph><comment>Y rotation </comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION" id="bm_id6529740" localize="false"/><paragraph role="paragraph" id="par_id5806756" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the y axis. The preview responds to the new settings.</ahelp></paragraph><comment>z rotation</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION" id="bm_id9121982" localize="false"/><paragraph role="paragraph" id="par_id8915372" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the z axis. The preview responds to the new settings.</ahelp></paragraph><comment>perspective</comment>
+      <paragraph xml-lang="en-US" id="par_id6998809" role="paragraph" l10n="CHG">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> or in the context menu of a chart you can choose a chart type. <ahelp hid="." visibility="hidden">Opens a dialog to edit the properties of a three dimensional view for Column, Bar, Pie, and Area charts. For Line and XY (Scatter) charts you can see 3D lines.</ahelp><comment>must be AHID, see i80656</comment></paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
+      <embed href="text/shared/00/00000001.xhp#ShiftF1"/>
+      <paragraph xml-lang="en-US" id="par_id6942045" role="paragraph" l10n="NEW">The chart preview responds to the new settings that you enter in the dialog. </paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">When you leave the dialog with OK, the settings are applied permanently. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">When you leave the dialog with Cancel or Escape, the chart returns to the state when you opened the dialog.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8081911" role="paragraph" l10n="NEW">For a 3D chart you can choose <item type="menuitem">Format - 3D View</item> to set perspective, appearance and illumination.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2924283" role="heading" level="2" l10n="NEW">Perspective</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5781731" role="paragraph" l10n="NEW">Enter the values for rotation of the chart on the three axes and for a perspective view.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9999694" role="paragraph" l10n="NEW">Set all angles to 0 for a front view of the chart. Pie charts and donut charts are shown as circles.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2861720" role="paragraph" l10n="NEW">With Right-angled axes enabled, you can rotate the chart contents only in X and Y direction, that is, parallel to the chart borders.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">An x value of 90, with y and z set to 0, provides a view from top down to the chart. With x set to -90, you see the bottom of the chart.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="NEW">The rotations are applied in the order first x, then y, last z.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="NEW">When shading is enabled and you rotate a chart, the lights are rotated as if they are fixed to the chart.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2578203" role="note" l10n="NEW">The rotation axes always relate to the page, not to the chart's axes. This is different from some other chart programs.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4923245" role="paragraph" l10n="NEW">Select the Perspective check box to view the chart in central perspective as through a camera lens instead of using a parallel projection. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3416547" role="paragraph" l10n="NEW">Set the focus length with the spin button. 100% gives a perspective view where a far edge in the chart looks approximately half as big as a near edge.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3791924" role="note" l10n="NEW">Older versions of %PRODUCTNAME cannot display the percentage of perspective the same way as the current version.</paragraph><comment>Right-angled axes</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_RIGHT_ANGLED_AXES" id="bm_id5293740" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7623828" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If Right-angled axes is enabled, you can rotate the chart contents only in X and Y direction, that is, parallel to the chart borders. Right-angled axes is enabled by default for newly created 3D charts. Pie and Donut charts do not support right-angled axes.</ahelp></paragraph><comment>X rotation</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION" id="bm_id6549272" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4721823" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the x axis. The preview responds to the new settings.</ahelp></paragraph><comment>Y rotation </comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION" id="bm_id6529740" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the y axis. The preview responds to the new settings.</ahelp></paragraph><comment>z rotation</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION" id="bm_id9121982" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8915372" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the rotation of the chart on the z axis. The preview responds to the new settings.</ahelp></paragraph><comment>perspective</comment>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE" id="bm_id2394482" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE" id="bm_id3808404" localize="false"/><paragraph role="paragraph" id="par_id6070436" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Mark the Perspective box to view the chart as through a camera lens. Use the spin button to set the percentage. With a high percentage nearer objects look bigger than more distant objects.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7564012" xml-lang="en-US" level="2" l10n="NEW">Appearance</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1186254" xml-lang="en-US" l10n="NEW">Select a scheme from the list box.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7432477" xml-lang="en-US" l10n="NEW">By selecting a scheme, the check boxes and the light sources are set accordingly.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7141026" xml-lang="en-US" l10n="NEW">If you mark or unmark a combination of check boxes that is not given by the Realistic or Simple scheme, you create a Custom scheme.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1579027" xml-lang="en-US" l10n="NEW">Mark <emph>Shading</emph> to use the Gouraud method for rendering the surface, otherwise a flat method is used. </paragraph>
-<paragraph role="paragraph" id="par_id5624561" xml-lang="en-US" l10n="NEW">The flat method sets a single color and brightness for each polygon. The edges are visible, soft gradients and spot lights are not possible. </paragraph>
-<paragraph role="paragraph" id="par_id5901058" xml-lang="en-US" l10n="NEW">The Gouraud method applies gradients for a smoother, more realistic look.<comment>Regina: Need an external article on web, which describes the 3D engine in detail. Till that, the user should get some information on Gouraud and Flat.</comment></paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8469191" xml-lang="en-US" l10n="NEW">Mark <emph>Object Borders</emph> to draw lines along the edges.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4407483" xml-lang="en-US" l10n="NEW">Mark <emph>Rounded Edges</emph> to smooth the edges of box shapes.</paragraph>
-</listitem>
-</list><comment>Scheme</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME" id="bm_id631733" localize="false"/><paragraph role="paragraph" id="par_id8531449" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a scheme from the list box, or click any of the check boxes below.</ahelp></paragraph><comment>Shading</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING" id="bm_id7811822" localize="false"/><paragraph role="paragraph" id="par_id9183935" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies Gouraud shading if marked, or flat shading if unmarked.</ahelp></paragraph><comment>Object borders</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES" id="bm_id3640247" localize="false"/><paragraph role="paragraph" id="par_id946684" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Shows borders around the areas by setting the line style to Solid.</ahelp></paragraph><comment>Rounded Edges</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:Checkbox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE" id="bm_id4585100" localize="false"/><paragraph role="paragraph" id="par_id9607226" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Edges are rounded by 5%.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id1939451" xml-lang="en-US" level="2" l10n="NEW">Illumination</paragraph>
-<paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW">Set the light sources for the 3D view.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6531266" xml-lang="en-US" l10n="NEW">Click any of the eight buttons to switch a directed light source on or off.</paragraph>
-<paragraph role="paragraph" id="par_id6173894" xml-lang="en-US" l10n="NEW">By default, the second light source is switched on. It is the first of seven "normal", uniform light sources. The light source number one projects a specular light with highlights.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2761314" xml-lang="en-US" l10n="CHG">For the selected light source, you can then choose a color and intensity in the list box just below the eight buttons. The brightness values of all lights are added, so use dark colors when you enable multiple lights.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3912778" xml-lang="en-US" l10n="NEW">The small preview inside this tab page has two sliders to set the vertical and horizontal position of the selected light source. The light source always aims to the middle of the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3163853" xml-lang="en-US" l10n="NEW">The button in the corner of the small preview switches the internal illumination model between a sphere and a cube.<comment>Regina: Are you sure? I thought, that it only toggles the preview in the dialog.</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id121158" xml-lang="en-US" l10n="NEW">Use the Ambient light list box to define the ambient light which shines with a uniform intensity from all directions.</paragraph>
-</listitem>
-</list><comment>preview right bar</comment>
-<bookmark xml-lang="en-US" branch="hid/34145" id="bm_id8956572" localize="false"/><paragraph role="paragraph" id="par_id2423780" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the right slider to set the vertical height and direction of the selected light source.</ahelp></paragraph><comment>preview bottom bar</comment>
-<bookmark xml-lang="en-US" branch="hid/34144" id="bm_id500808" localize="false"/><paragraph role="paragraph" id="par_id2569658" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the bottom slider to set the horizontal position and direction of the selected light source.</ahelp></paragraph><comment>preview right bottom button</comment>
-<bookmark xml-lang="en-US" branch="hid/34146" id="bm_id8366649" localize="false"/><paragraph role="paragraph" id="par_id6394238" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to switch between an illumination model of a sphere or a cube.</ahelp></paragraph><comment>Light source</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1" id="bm_id2334665" localize="false"/><paragraph role="paragraph" id="par_id533768" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to enable or disable the specular light source with highlights.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE" id="bm_id3808404" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6070436" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Mark the Perspective box to view the chart as through a camera lens. Use the spin button to set the percentage. With a high percentage nearer objects look bigger than more distant objects.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7564012" role="heading" level="2" l10n="NEW">Appearance</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1186254" role="paragraph" l10n="NEW">Select a scheme from the list box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id7432477" role="paragraph" l10n="NEW">By selecting a scheme, the check boxes and the light sources are set accordingly.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7141026" role="paragraph" l10n="NEW">If you mark or unmark a combination of check boxes that is not given by the Realistic or Simple scheme, you create a Custom scheme.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1579027" role="paragraph" l10n="NEW">Mark <emph>Shading</emph> to use the Gouraud method for rendering the surface, otherwise a flat method is used. </paragraph>
+            <paragraph xml-lang="en-US" id="par_id5624561" role="paragraph" l10n="NEW">The flat method sets a single color and brightness for each polygon. The edges are visible, soft gradients and spot lights are not possible. </paragraph>
+            <paragraph xml-lang="en-US" id="par_id5901058" role="paragraph" l10n="NEW">The Gouraud method applies gradients for a smoother, more realistic look.<comment>Regina: Need an external article on web, which describes the 3D engine in detail. Till that, the user should get some information on Gouraud and Flat.</comment></paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW">Mark <emph>Object Borders</emph> to draw lines along the edges.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4407483" role="paragraph" l10n="NEW">Mark <emph>Rounded Edges</emph> to smooth the edges of box shapes.</paragraph>
+         </listitem>
+      </list><comment>Scheme</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME" id="bm_id631733" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8531449" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select a scheme from the list box, or click any of the check boxes below.</ahelp></paragraph><comment>Shading</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING" id="bm_id7811822" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id9183935" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Applies Gouraud shading if marked, or flat shading if unmarked.</ahelp></paragraph><comment>Object borders</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES" id="bm_id3640247" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id946684" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows borders around the areas by setting the line style to Solid.</ahelp></paragraph><comment>Rounded Edges</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:Checkbox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE" id="bm_id4585100" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id9607226" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Edges are rounded by 5%.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id1939451" role="heading" level="2" l10n="NEW">Illumination</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW">Set the light sources for the 3D view.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6531266" role="paragraph" l10n="NEW">Click any of the eight buttons to switch a directed light source on or off.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6173894" role="paragraph" l10n="NEW">By default, the second light source is switched on. It is the first of seven "normal", uniform light sources. The light source number one projects a specular light with highlights.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2761314" role="paragraph" l10n="CHG">For the selected light source, you can then choose a color and intensity in the list box just below the eight buttons. The brightness values of all lights are added, so use dark colors when you enable multiple lights.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="NEW">The small preview inside this tab page has two sliders to set the vertical and horizontal position of the selected light source. The light source always aims to the middle of the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">The button in the corner of the small preview switches the internal illumination model between a sphere and a cube.<comment>Regina: Are you sure? I thought, that it only toggles the preview in the dialog.</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Use the Ambient light list box to define the ambient light which shines with a uniform intensity from all directions.</paragraph>
+         </listitem>
+      </list><comment>preview right bar</comment>
+<!-- removed HID 34145 33796 -->
+
+<paragraph xml-lang="en-US" id="par_id2423780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the right slider to set the vertical height and direction of the selected light source.</ahelp></paragraph><comment>preview bottom bar</comment>
+<!-- removed HID 34144 33794 -->
+
+<paragraph xml-lang="en-US" id="par_id2569658" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Drag the bottom slider to set the horizontal position and direction of the selected light source.</ahelp></paragraph><comment>preview right bottom button</comment>
+<!-- removed HID 34146 33795 -->
+
+<paragraph xml-lang="en-US" id="par_id6394238" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to switch between an illumination model of a sphere or a cube.</ahelp></paragraph><comment>Light source</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1" id="bm_id2334665" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id533768" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to enable or disable the specular light source with highlights.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2" id="bm_id476393" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3" id="bm_id2655720" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4" id="bm_id3682058" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5" id="bm_id5977965" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6" id="bm_id3050325" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7" id="bm_id9421979" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8" id="bm_id1646778" localize="false"/><paragraph role="paragraph" id="par_id7214270" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to enable or disable the uniform light source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE" id="bm_id1601611" localize="false"/><paragraph role="paragraph" id="par_id2186346" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color for the selected light source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR" id="bm_id733359" localize="false"/><paragraph role="paragraph" id="par_id1331217" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph><comment>Ambient light</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT" id="bm_id1228370" localize="false"/><paragraph role="paragraph" id="par_id393993" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color for the ambient light.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR" id="bm_id879848" localize="false"/><paragraph role="paragraph" id="par_id5871761" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8" id="bm_id1646778" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7214270" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to enable or disable the uniform light source.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE" id="bm_id1601611" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2186346" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color for the selected light source.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR" id="bm_id733359" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1331217" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph><comment>Ambient light</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT" id="bm_id1228370" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id393993" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color for the ambient light.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR" id="bm_id879848" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5871761" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/type_area.xhp b/helpcontent2/source/text/schart/01/type_area.xhp
index 0ffbd8fe3e..c00a39bcf4 100644
--- a/helpcontent2/source/text/schart/01/type_area.xhp
+++ b/helpcontent2/source/text/schart/01/type_area.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_area.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/type_bubble.xhp b/helpcontent2/source/text/schart/01/type_bubble.xhp
new file mode 100644
index 0000000000..3179cf590a
--- /dev/null
+++ b/helpcontent2/source/text/schart/01/type_bubble.xhp
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textschart01type_bubblexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Chart Type Bubble</title>
+         <filename>/text/schart/01/type_bubble.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id2183975"><bookmark_value>bubble charts</bookmark_value>
+      <bookmark_value>chart types;bubble</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id1970722" role="heading" level="1" l10n="NEW"><variable id="type_bubble"><link href="text/schart/01/type_bubble.xhp">Chart Type Bubble</link>
+</variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id40589" role="paragraph" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type.</paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id0526200904491284" role="heading" level="2" l10n="NEW">Bubble</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200904491222" role="paragraph" l10n="NEW">A bubble chart shows the relations of three variables. Two variables are used for the position on the X-axis and Y-axis, while the third variable is shown as the relative size of each bubble.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200906040162" role="paragraph" l10n="NEW">The data series dialog for a bubble chart has an entry to define the data range for the Bubble Sizes.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/type_column_bar.xhp b/helpcontent2/source/text/schart/01/type_column_bar.xhp
index 8bd6481185..a91823b947 100644
--- a/helpcontent2/source/text/schart/01/type_column_bar.xhp
+++ b/helpcontent2/source/text/schart/01/type_column_bar.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_column_bar.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/type_column_line.xhp b/helpcontent2/source/text/schart/01/type_column_line.xhp
index 1bb8c20020..da7ac3860b 100644
--- a/helpcontent2/source/text/schart/01/type_column_line.xhp
+++ b/helpcontent2/source/text/schart/01/type_column_line.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_column_line.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/type_line.xhp b/helpcontent2/source/text/schart/01/type_line.xhp
index b85037af9c..e57d9ecc5b 100644
--- a/helpcontent2/source/text/schart/01/type_line.xhp
+++ b/helpcontent2/source/text/schart/01/type_line.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_line.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/type_net.xhp b/helpcontent2/source/text/schart/01/type_net.xhp
index 5ada36e9a4..68940df33c 100644
--- a/helpcontent2/source/text/schart/01/type_net.xhp
+++ b/helpcontent2/source/text/schart/01/type_net.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_net.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/type_pie.xhp b/helpcontent2/source/text/schart/01/type_pie.xhp
index 17e196ba09..d49bfe094c 100644
--- a/helpcontent2/source/text/schart/01/type_pie.xhp
+++ b/helpcontent2/source/text/schart/01/type_pie.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_pie.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,37 +29,37 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textschart01type_piexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chart Type Pie </title>
-<filename>/text/schart/01/type_pie.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart01type_piexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Chart Type Pie </title>
+         <filename>/text/schart/01/type_pie.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7621997"><bookmark_value>donut charts</bookmark_value>
-<bookmark_value>pie charts</bookmark_value>
-<bookmark_value>chart types;pie/donut</bookmark_value>
-</bookmark><comment>mw made one index entry out of two "chart types;"</comment><paragraph role="heading" id="hd_id3365276" xml-lang="en-US" level="1" l10n="NEW"><variable id="type_pie"><link href="text/schart/01/type_pie.xhp">Chart Type Pie</link>
+      <bookmark_value>pie charts;types</bookmark_value>
+      <bookmark_value>chart types;pie/donut</bookmark_value>
+</bookmark><comment>mw made one index entry out of two "chart types;"</comment><comment>mw  made "pie charts" a two level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3365276" role="heading" level="1" l10n="NEW"><variable id="type_pie"><link href="text/schart/01/type_pie.xhp">Chart Type Pie</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id245979" xml-lang="en-US" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#wiz"/>
-</section>
-<paragraph role="heading" id="hd_id5799432" xml-lang="en-US" level="2" l10n="NEW">Pie</paragraph>
-<paragraph role="paragraph" id="par_id6549272" xml-lang="en-US" l10n="NEW">A pie chart shows values as circular sectors of the total circle. The length of the arc, or the area of each sector, is proportional to its value.</paragraph>
-<paragraph role="paragraph" id="par_id6529740" xml-lang="en-US" l10n="NEW">Pie - this subtype shows sectors as colored areas of the total pie, for one data column only. In the created chart, you can click and drag any sector to separate that sector from the remaining pie or to join it back.</paragraph>
-<paragraph role="paragraph" id="par_id9121982" xml-lang="en-US" l10n="NEW">Exploded pie - this subtype shows the sectors already separated from each other. In the created chart, you can click and drag any sector to move it along a radial from the pie's center.</paragraph>
-<paragraph role="paragraph" id="par_id3808404" xml-lang="en-US" l10n="NEW">Donut - this subtype can show multiple data columns. Each data column is shown as one donut shape with a hole inside, where the next data column can be shown. In the created chart, you can click and drag an outer sector to move it along a radial from the donut's center.</paragraph>
-<paragraph role="paragraph" id="par_id2394482" xml-lang="en-US" l10n="NEW">Exploded donut - this subtype shows the outer sectors already separated from the remaining donut. In the created chart, you can click and drag an outer sector to move it along a radial from the donut's center.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id245979" role="paragraph" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id5799432" role="heading" level="2" l10n="NEW">Pie</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6549272" role="paragraph" l10n="NEW">A pie chart shows values as circular sectors of the total circle. The length of the arc, or the area of each sector, is proportional to its value.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6529740" role="paragraph" l10n="NEW">Pie - this subtype shows sectors as colored areas of the total pie, for one data column only. In the created chart, you can click and drag any sector to separate that sector from the remaining pie or to join it back.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9121982" role="paragraph" l10n="NEW">Exploded pie - this subtype shows the sectors already separated from each other. In the created chart, you can click and drag any sector to move it along a radial from the pie's center.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3808404" role="paragraph" l10n="NEW">Donut - this subtype can show multiple data columns. Each data column is shown as one donut shape with a hole inside, where the next data column can be shown. In the created chart, you can click and drag an outer sector to move it along a radial from the donut's center.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2394482" role="paragraph" l10n="NEW">Exploded donut - this subtype shows the outer sectors already separated from the remaining donut. In the created chart, you can click and drag an outer sector to move it along a radial from the donut's center.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/type_stock.xhp b/helpcontent2/source/text/schart/01/type_stock.xhp
index 230e8aada7..180ab47dba 100644
--- a/helpcontent2/source/text/schart/01/type_stock.xhp
+++ b/helpcontent2/source/text/schart/01/type_stock.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: type_stock.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,247 +29,253 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textschart01type_stockxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chart Type Stock</title>
-<filename>/text/schart/01/type_stock.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart01type_stockxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Chart Type Stock</title>
+         <filename>/text/schart/01/type_stock.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2959990"><bookmark_value>stock charts</bookmark_value>
-<bookmark_value>chart types;stock</bookmark_value>
-<bookmark_value>data sources;setting for stock charts</bookmark_value>
-</bookmark><comment>mw added one entry</comment><paragraph role="heading" id="hd_id966216" xml-lang="en-US" level="1" l10n="NEW"><variable id="type_stock"><link href="text/schart/01/type_stock.xhp">Chart Type Stock</link>
+      <bookmark_value>chart types;stock</bookmark_value>
+      <bookmark_value>data sources;setting for stock charts</bookmark_value>
+</bookmark><comment>mw added one entry</comment>
+<paragraph xml-lang="en-US" id="hd_id966216" role="heading" level="1" l10n="NEW"><variable id="type_stock"><link href="text/schart/01/type_stock.xhp">Chart Type Stock</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3516953" xml-lang="en-US" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#wiz"/>
-</section>
-<paragraph role="heading" id="hd_id5268410" xml-lang="en-US" level="2" l10n="NEW">Stock</paragraph>
-<paragraph role="paragraph" id="par_id61342" xml-lang="en-US" l10n="NEW">A Stock chart illustrates the market trend given by opening price, bottom price, top price and closing price. The transaction volume can also be shown.<comment>UFI: should we show example charts for every type?</comment></paragraph>
-<paragraph role="paragraph" id="par_id2131412" xml-lang="en-US" l10n="NEW">For a Stock chart the order of the data series is important. The data should be arranged as shown in the example table below.</paragraph>
-<table id="tbl_id1370586">
-<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id1022064" xml-lang="en-US" l10n="NEW">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id1924192" xml-lang="en-US" l10n="NEW">B</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3258156" xml-lang="en-US" l10n="NEW">C</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3161412" xml-lang="en-US" l10n="NEW">D</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id5619373" xml-lang="en-US" l10n="NEW">E</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id6474501" xml-lang="en-US" l10n="NEW">F</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7411725" xml-lang="en-US" l10n="NEW">1</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1933957" xml-lang="en-US" l10n="NEW">Transaction volume</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1274452" xml-lang="en-US" l10n="NEW">Opening price</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5044404" xml-lang="en-US" l10n="NEW">Low (bottom price)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3892635" xml-lang="en-US" l10n="NEW">High (top price)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4641865" xml-lang="en-US" l10n="NEW">Closing price</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7684560" xml-lang="en-US" l10n="NEW">2</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3998840" xml-lang="en-US" l10n="NEW">Monday</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7675099" xml-lang="en-US" l10n="NEW">2500</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7806329" xml-lang="en-US" l10n="NEW">20</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5589159" xml-lang="en-US" l10n="NEW">15</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9936216" xml-lang="en-US" l10n="NEW">25</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7953123" xml-lang="en-US" l10n="NEW">17</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4013794" xml-lang="en-US" l10n="NEW">3</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1631824" xml-lang="en-US" l10n="NEW">Tuesday</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7271645" xml-lang="en-US" l10n="NEW">3500</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2136295" xml-lang="en-US" l10n="NEW">32</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4186223" xml-lang="en-US" l10n="NEW">22</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1491134" xml-lang="en-US" l10n="NEW">37</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2873622" xml-lang="en-US" l10n="NEW">30</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2374034" xml-lang="en-US" l10n="NEW">4</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1687063" xml-lang="en-US" l10n="NEW">Wednesday</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8982207" xml-lang="en-US" l10n="NEW">1000</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7074190" xml-lang="en-US" l10n="NEW">15</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5452436" xml-lang="en-US" l10n="NEW">15</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9527878" xml-lang="en-US" l10n="NEW">17</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6342356" xml-lang="en-US" l10n="NEW">17</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id166936" xml-lang="en-US" l10n="NEW">5</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6826990" xml-lang="en-US" l10n="NEW">Thursday</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6897183" xml-lang="en-US" l10n="NEW">2200</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7003387" xml-lang="en-US" l10n="NEW">40</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4897915" xml-lang="en-US" l10n="NEW">30</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3105868" xml-lang="en-US" l10n="NEW">47</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3908810" xml-lang="en-US" l10n="NEW">35</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9461653" xml-lang="en-US" l10n="NEW">6</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9239173" xml-lang="en-US" l10n="NEW">Friday</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2656941" xml-lang="en-US" l10n="NEW">4600</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1481063" xml-lang="en-US" l10n="NEW">27</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7921079" xml-lang="en-US" l10n="NEW">20</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id636921" xml-lang="en-US" l10n="NEW">32</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2799157" xml-lang="en-US" l10n="NEW">31</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3004547" xml-lang="en-US" l10n="NEW">The open, low, high, and closing values of a row build together one data unit in the chart. A stock price data series consists of several rows containing such data units. The column containing the transaction volume builds an optional second data series.</paragraph>
-<paragraph role="paragraph" id="par_id6401867" xml-lang="en-US" l10n="NEW">Depending on the chosen variant, you do not need all columns.</paragraph>
-<paragraph role="heading" id="hd_id18616" xml-lang="en-US" level="2" l10n="NEW">Stock Chart Variants</paragraph>
-<paragraph role="paragraph" id="par_id6138492" xml-lang="en-US" l10n="NEW">Choose the <emph>Stock</emph> chart type on the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart wizard</link>. Then select one of the four variants.</paragraph>
-<paragraph role="heading" id="hd_id4569231" xml-lang="en-US" level="3" l10n="NEW">Type 1</paragraph>
-<paragraph role="paragraph" id="par_id291451" xml-lang="en-US" l10n="NEW">Based on<emph> low</emph>
-<emph>and high </emph>column the Type 1 shows the distance between bottom price (low) and top price (high) by a vertical line.</paragraph>
-<paragraph role="paragraph" id="par_id3341776" xml-lang="en-US" l10n="NEW">Based on<emph> low, high,</emph> and <emph>close</emph> column Type 1 shows an additional horizontal mark <emph>for</emph> the closing price.</paragraph>
-<paragraph role="heading" id="hd_id5947141" xml-lang="en-US" level="3" l10n="NEW">Type 2</paragraph>
-<paragraph role="paragraph" id="par_id1911679" xml-lang="en-US" l10n="CHG">Based on <emph>open, low, high</emph>, and <emph>close</emph> column Type 2 generates the traditional "candle stick" chart. Type 2 draws the vertical line between the bottom and top price and adds a rectangle in front, which visualizes the range between the opening and closing price. If you click on the rectangle you see more information in the status bar. %PRODUCTNAME uses different fill colors for rising values (the opening price is lower than the closing price) and falling values.</paragraph>
-<paragraph role="heading" id="hd_id9364909" xml-lang="en-US" level="3" l10n="NEW">Type 3</paragraph>
-<paragraph role="paragraph" id="par_id4473403" xml-lang="en-US" l10n="CHG">Based on <emph>volume, low, high</emph>, and <emph>close</emph> column chart Type 3 draws a chart like Type 1, with additional columns for the transaction volume.<comment>i80596</comment></paragraph>
-<paragraph role="heading" id="hd_id4313791" xml-lang="en-US" level="3" l10n="NEW">Type 4</paragraph>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="CHG">Based on all five data columns <emph>volume, open, low, high</emph>, and <emph>close</emph>, Type 4 combines a chart of Type 2 with a column chart for the transaction volume.</paragraph>
-<paragraph role="paragraph" id="par_id4191717" xml-lang="en-US" l10n="NEW">Because measurement for transaction volume might be "units", a second y axis is introduced in chart Type 3 and Type 4. The price axis is shown on the right side and the volume axis on the left side.</paragraph>
-<paragraph role="heading" id="hd_id2318796" xml-lang="en-US" level="2" l10n="NEW">Setting the Data Source</paragraph>
-<paragraph role="heading" id="hd_id399182" xml-lang="en-US" level="3" l10n="NEW">Charts based on its own data</paragraph>
-<paragraph role="paragraph" id="par_id5298318" xml-lang="en-US" l10n="NEW">To change the data series of a chart having its own data, choose <link href="text/schart/01/03010000.xhp">Chart Data Table</link> from the View menu or from the context menu of the chart in edit mode.</paragraph>
-<paragraph role="paragraph" id="par_id7588732" xml-lang="en-US" l10n="NEW">In an embedded chart data table, the data series are always organized in columns.</paragraph>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="CHG">For a new stock chart first use a column chart. Add the columns you need and enter your data in the order which is shown in the example, omitting any columns not required for the desired variant. Use Move Series Right to change the column order. Close the chart data table. Now use the Chart Type dialog to change to the stock chart variant. </paragraph>
-<paragraph role="paragraph" id="par_id6182744" xml-lang="en-US" l10n="NEW">If you have already got a stock chart and you want to change the variant, then first change the chart type to a column chart, add or remove columns so that it fits to the variant, and then change the chart type back to a stock chart.<comment>Watch issue 72433 to see whether a change in the handling is done.</comment></paragraph>
-<paragraph role="paragraph" id="par_id3496200" xml-lang="en-US" l10n="NEW">Do not write the name of a data series in a row. Write the name into the field above the role name.</paragraph>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="CHG">The order of the rows determines how the categories are arranged in the chart. Use Move Row Down to change the order.</paragraph>
-<paragraph role="heading" id="hd_id888698" xml-lang="en-US" level="3" l10n="NEW">Charts based on Calc or Writer tables</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW">You can choose or alter a data range on the second page of the Chart wizard or in the <link href="text/schart/01/wiz_data_range.xhp">Data Range</link> dialog. For fine tuning use the <link href="text/schart/01/wiz_data_series.xhp">Data Series</link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id7594225" xml-lang="en-US" l10n="NEW">To specify a data range do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5081637" xml-lang="en-US" l10n="NEW">Enter the data range in the text box.</paragraph>
-<paragraph role="paragraph" id="par_id9759514" xml-lang="en-US" l10n="NEW">In Calc, an example data range would be "$Sheet1.$B$3:$B$14". Note that a data range may consist of more than one region in a spreadsheet, e.g. "$Sheet1.A1:A5;$Sheet1.D1:D5" is also a valid data range. In Writer, an example data range would be "Table1.A1:E4".</paragraph>
-<paragraph role="paragraph" id="par_id1614429" xml-lang="en-US" l10n="NEW">As long as the syntax is not correct, %PRODUCTNAME shows the text in red.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW">In Calc, click <emph>Select data range</emph> to minimize the dialog, then drag to select the data range. When you release the mouse, the data are entered. Click <emph>Select data range</emph> again to add a data range. In the input field of the minimized dialog, click after the entry and type a semicolon. Then drag to select the next range.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8746910" xml-lang="en-US" l10n="NEW">Click one of the options for data series in rows or in columns. </paragraph>
-<paragraph role="paragraph" id="par_id9636524" xml-lang="en-US" l10n="NEW">Your stock chart data are "in columns", if the information in a row belongs to the same "candle stick".<comment>I don't know whether copying a table based chart to draw or impress needs chart data arranged in columns, and I cannot test it, because the clipboard is broken.</comment></paragraph>
-<paragraph role="heading" id="hd_id5675527" xml-lang="en-US" level="2" l10n="NEW">Fine Tuning the Data Ranges of Table Based Stock Charts</paragraph>
-<paragraph role="paragraph" id="par_id3486434" xml-lang="en-US" l10n="NEW">You can organize data series and edit the source for parts of single data series on the third page of the Chart wizard or on the page Data Series in the Data Range dialog.</paragraph>
-<paragraph role="heading" id="hd_id3068636" xml-lang="en-US" level="3" l10n="NEW">Organize Data Series</paragraph>
-<paragraph role="paragraph" id="par_id2480849" xml-lang="en-US" l10n="NEW">In the <emph>data series</emph> area on the left side of the dialog, you can organize the data series of the actual chart. A stock chart has at least one data series containing the prices. It might have a second data series for transaction volume.</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="CHG">If you have got more than one price data series, use the Up and Down arrow buttons to order them. The order determines the arrangement in the chart. Do the same for volume data series. You cannot switch price and volume data series.</paragraph>
-<paragraph role="paragraph" id="par_id2927335" xml-lang="en-US" l10n="NEW">To remove a data series, select the data series in the list and click <emph>Remove</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW">To add a data series, select one of the existing data series and click <emph>Add</emph>. You get an empty entry below the selected one, which has the same type. If you have no price data series or no volume data series, you must first select a range for these series in the <emph>Data Range</emph> dialog.<comment>Regina: The behavior is odd, but I don't know a better solution. Therefore I have not written an issue.</comment></paragraph>
-<paragraph role="heading" id="hd_id4071779" xml-lang="en-US" level="3" l10n="NEW">Setting Data Ranges</paragraph>
-<paragraph role="paragraph" id="par_id7844477" xml-lang="en-US" l10n="NEW">In the <emph>Data Ranges</emph> dialog you can set or change the data range of each component of the selected data series.</paragraph>
-<paragraph role="paragraph" id="par_id6478469" xml-lang="en-US" l10n="NEW">In the upper list you see the role name of the components and the current values. When you have selected a role, you can change the value in the text box below the list. The label shows the selected role.</paragraph><comment>deleted a para, see i80596</comment><paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW">Enter the range into the text box or click on <emph>Select data range</emph> to minimize the dialog and select the range with the mouse.</paragraph>
-<paragraph role="paragraph" id="par_id7985168" xml-lang="en-US" l10n="NEW">Select Open Values, Close Values, High Values, and Low Values in any order. Specify only the ranges for those roles which you need for the chosen variant of the stock chart. The ranges need not be next to each other in the table.</paragraph>
-<paragraph role="heading" id="hd_id876186" xml-lang="en-US" level="3" l10n="NEW">Legend</paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW">The legend displays the labels from the first row or column or from the special range that you have set in the <emph>Data Series</emph> dialog. If your chart does not contain labels, the legend displays text like "Row 1, Row 2, ...", or "Column A, Column B, ..." according to the row number or column letter of the chart data.</paragraph><comment>deleted 3 paras</comment><paragraph role="paragraph" id="par_id2377697" xml-lang="en-US" l10n="NEW">The legend shows the value from the range, which you entered in the <emph>Range for Name</emph> field in the <emph>Data Range</emph> dialog. The default entry is the column header of the closing price column.</paragraph>
-<paragraph role="paragraph" id="par_id2188787" xml-lang="en-US" l10n="NEW">Select one of the position options. When the chart is finished, you can specify other positions using the Format menu.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3516953" role="paragraph" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id5268410" role="heading" level="2" l10n="NEW">Stock</paragraph>
+      <paragraph xml-lang="en-US" id="par_id61342" role="paragraph" l10n="NEW">A Stock chart illustrates the market trend given by opening price, bottom price, top price and closing price. The transaction volume can also be shown.<comment>UFI: should we show example charts for every type?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2131412" role="paragraph" l10n="NEW">For a Stock chart the order of the data series is important. The data should be arranged as shown in the example table below.</paragraph>
+      <table id="tbl_id1370586">
+         <tablerow>
+            <tablecell>
+</tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1022064" role="tablehead" l10n="NEW">A</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1924192" role="tablehead" l10n="NEW">B</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3258156" role="tablehead" l10n="NEW">C</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3161412" role="tablehead" l10n="NEW">D</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5619373" role="tablehead" l10n="NEW">E</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6474501" role="tablehead" l10n="NEW">F</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7411725" role="tablecontent" l10n="NEW">1</paragraph>
+            </tablecell>
+            <tablecell>
+</tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1933957" role="tablecontent" l10n="NEW">Transaction volume</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1274452" role="tablecontent" l10n="NEW">Opening price</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5044404" role="tablecontent" l10n="NEW">Low (bottom price)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3892635" role="tablecontent" l10n="NEW">High (top price)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4641865" role="tablecontent" l10n="NEW">Closing price</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7684560" role="tablecontent" l10n="NEW">2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3998840" role="tablecontent" l10n="NEW">Monday</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7675099" role="tablecontent" l10n="NEW">2500</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7806329" role="tablecontent" l10n="NEW">20</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5589159" role="tablecontent" l10n="NEW">15</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9936216" role="tablecontent" l10n="NEW">25</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7953123" role="tablecontent" l10n="NEW">17</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4013794" role="tablecontent" l10n="NEW">3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1631824" role="tablecontent" l10n="NEW">Tuesday</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7271645" role="tablecontent" l10n="NEW">3500</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2136295" role="tablecontent" l10n="NEW">32</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4186223" role="tablecontent" l10n="NEW">22</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1491134" role="tablecontent" l10n="NEW">37</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2873622" role="tablecontent" l10n="NEW">30</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2374034" role="tablecontent" l10n="NEW">4</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1687063" role="tablecontent" l10n="NEW">Wednesday</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8982207" role="tablecontent" l10n="NEW">1000</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7074190" role="tablecontent" l10n="NEW">15</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5452436" role="tablecontent" l10n="NEW">15</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9527878" role="tablecontent" l10n="NEW">17</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6342356" role="tablecontent" l10n="NEW">17</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id166936" role="tablecontent" l10n="NEW">5</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6826990" role="tablecontent" l10n="NEW">Thursday</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6897183" role="tablecontent" l10n="NEW">2200</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7003387" role="tablecontent" l10n="NEW">40</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4897915" role="tablecontent" l10n="NEW">30</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3105868" role="tablecontent" l10n="NEW">47</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3908810" role="tablecontent" l10n="NEW">35</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9461653" role="tablecontent" l10n="NEW">6</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9239173" role="tablecontent" l10n="NEW">Friday</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2656941" role="tablecontent" l10n="NEW">4600</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1481063" role="tablecontent" l10n="NEW">27</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7921079" role="tablecontent" l10n="NEW">20</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id636921" role="tablecontent" l10n="NEW">32</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2799157" role="tablecontent" l10n="NEW">31</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3004547" role="paragraph" l10n="NEW">The open, low, high, and closing values of a row build together one data unit in the chart. A stock price data series consists of several rows containing such data units. The column containing the transaction volume builds an optional second data series.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6401867" role="paragraph" l10n="NEW">Depending on the chosen variant, you do not need all columns.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id18616" role="heading" level="2" l10n="NEW">Stock Chart Variants</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6138492" role="paragraph" l10n="NEW">Choose the <emph>Stock</emph> chart type on the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart wizard</link>. Then select one of the four variants.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4569231" role="heading" level="2" l10n="NEW">Type 1</paragraph>
+      <paragraph xml-lang="en-US" id="par_id291451" role="paragraph" l10n="NEW">Based on<emph> low</emph>
+         <emph>and high </emph>column the Type 1 shows the distance between bottom price (low) and top price (high) by a vertical line.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3341776" role="paragraph" l10n="NEW">Based on<emph> low, high,</emph> and <emph>close</emph> column Type 1 shows an additional horizontal mark <emph>for</emph> the closing price.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5947141" role="heading" level="2" l10n="NEW">Type 2</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1911679" role="paragraph" l10n="CHG">Based on <emph>open, low, high</emph>, and <emph>close</emph> column Type 2 generates the traditional "candle stick" chart. Type 2 draws the vertical line between the bottom and top price and adds a rectangle in front, which visualizes the range between the opening and closing price. If you click on the rectangle you see more information in the status bar. %PRODUCTNAME uses different fill colors for rising values (the opening price is lower than the closing price) and falling values.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="2" l10n="NEW">Type 3</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4473403" role="paragraph" l10n="CHG">Based on <emph>volume, low, high</emph>, and <emph>close</emph> column chart Type 3 draws a chart like Type 1, with additional columns for the transaction volume.<comment>i80596</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4313791" role="heading" level="2" l10n="NEW">Type 4</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="CHG">Based on all five data columns <emph>volume, open, low, high</emph>, and <emph>close</emph>, Type 4 combines a chart of Type 2 with a column chart for the transaction volume.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4191717" role="paragraph" l10n="NEW">Because measurement for transaction volume might be "units", a second y axis is introduced in chart Type 3 and Type 4. The price axis is shown on the right side and the volume axis on the left side.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2318796" role="heading" level="2" l10n="NEW">Setting the Data Source</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id399182" role="heading" level="2" l10n="NEW">Charts based on its own data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5298318" role="paragraph" l10n="NEW">To change the data series of a chart having its own data, choose <link href="text/schart/01/03010000.xhp">Chart Data Table</link> from the View menu or from the context menu of the chart in edit mode.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7588732" role="paragraph" l10n="NEW">In an embedded chart data table, the data series are always organized in columns.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="CHG">For a new stock chart first use a column chart. Add the columns you need and enter your data in the order which is shown in the example, omitting any columns not required for the desired variant. Use Move Series Right to change the column order. Close the chart data table. Now use the Chart Type dialog to change to the stock chart variant. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6182744" role="paragraph" l10n="NEW">If you have already got a stock chart and you want to change the variant, then first change the chart type to a column chart, add or remove columns so that it fits to the variant, and then change the chart type back to a stock chart.<comment>Watch issue 72433 to see whether a change in the handling is done.</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3496200" role="paragraph" l10n="NEW">Do not write the name of a data series in a row. Write the name into the field above the role name.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="CHG">The order of the rows determines how the categories are arranged in the chart. Use Move Row Down to change the order.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="2" l10n="NEW">Charts based on Calc or Writer tables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">You can choose or alter a data range on the second page of the Chart wizard or in the <link href="text/schart/01/wiz_data_range.xhp">Data Range</link> dialog. For fine tuning use the <link href="text/schart/01/wiz_data_series.xhp">Data Series</link> dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">To specify a data range do one of the following:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5081637" role="paragraph" l10n="NEW">Enter the data range in the text box.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9759514" role="paragraph" l10n="NEW">In Calc, an example data range would be "$Sheet1.$B$3:$B$14". Note that a data range may consist of more than one region in a spreadsheet, e.g. "$Sheet1.A1:A5;$Sheet1.D1:D5" is also a valid data range. In Writer, an example data range would be "Table1.A1:E4".</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1614429" role="paragraph" l10n="NEW">As long as the syntax is not correct, %PRODUCTNAME shows the text in red.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW">In Calc, click <emph>Select data range</emph> to minimize the dialog, then drag to select the data range. When you release the mouse, the data are entered. Click <emph>Select </emph>
+               <emph>data range</emph> again to add a data range. In the input field of the minimized dialog, click after the entry and type a semicolon. Then drag to select the next range.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8746910" role="paragraph" l10n="NEW">Click one of the options for data series in rows or in columns. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">Your stock chart data are "in columns", if the information in a row belongs to the same "candle stick".<comment>I don't know whether copying a table based chart to draw or impress needs chart data arranged in columns, and I cannot test it, because the clipboard is broken.</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5675527" role="heading" level="2" l10n="NEW">Fine Tuning the Data Ranges of Table Based Stock Charts</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3486434" role="paragraph" l10n="NEW">You can organize data series and edit the source for parts of single data series on the third page of the Chart wizard or on the page Data Series in the Data Range dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Organize Data Series</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2480849" role="paragraph" l10n="NEW">In the <emph>data series</emph> area on the left side of the dialog, you can organize the data series of the actual chart. A stock chart has at least one data series containing the prices. It might have a second data series for transaction volume.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="CHG">If you have got more than one price data series, use the Up and Down arrow buttons to order them. The order determines the arrangement in the chart. Do the same for volume data series. You cannot switch price and volume data series.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2927335" role="paragraph" l10n="NEW">To remove a data series, select the data series in the list and click <emph>Remove</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW">To add a data series, select one of the existing data series and click <emph>Add</emph>. You get an empty entry below the selected one, which has the same type. If you have no price data series or no volume data series, you must first select a range for these series in the <emph>Data Range</emph> dialog.<comment>Regina: The behavior is odd, but I don't know a better solution. Therefore I have not written an issue.</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Setting Data Ranges</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW">In the <emph>Data Ranges</emph> dialog you can set or change the data range of each component of the selected data series.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6478469" role="paragraph" l10n="NEW">In the upper list you see the role name of the components and the current values. When you have selected a role, you can change the value in the text box below the list. The label shows the selected role.</paragraph><comment>deleted a para, see i80596</comment>
+<paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW">Enter the range into the text box or click on <emph>Select data range</emph> to minimize the dialog and select the range with the mouse.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7985168" role="paragraph" l10n="NEW">Select Open Values, Close Values, High Values, and Low Values in any order. Specify only the ranges for those roles which you need for the chosen variant of the stock chart. The ranges need not be next to each other in the table.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Legend</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">The legend displays the labels from the first row or column or from the special range that you have set in the <emph>Data Series</emph> dialog. If your chart does not contain labels, the legend displays text like "Row 1, Row 2, ...", or "Column A, Column B, ..." according to the row number or column letter of the chart data.</paragraph><comment>deleted 3 paras</comment>
+<paragraph xml-lang="en-US" id="par_id2377697" role="paragraph" l10n="NEW">The legend shows the value from the range, which you entered in the <emph>Range for Name</emph> field in the <emph>Data Range</emph> dialog. The default entry is the column header of the closing price column.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW">Select one of the position options. When the chart is finished, you can specify other positions using the Format menu.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp
index b708e34516..967eecc780 100644
--- a/helpcontent2/source/text/schart/01/type_xy.xhp
+++ b/helpcontent2/source/text/schart/01/type_xy.xhp
@@ -4,13 +4,11 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: type_xy.xhp,v $fileonly,v $
- *
- *  $Revision: 1.6.4.2 $
- *
- *  last change: $Author: ufi $ $Date: 2008/09/16 12:40:37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -81,7 +79,7 @@
 <paragraph role="paragraph" id="par_id0805200810492449" xml-lang="en-US" l10n="NEW">For 2D charts, you can choose <item type="menuitem">Insert - Y Error Bars</item> to enable the display of error bars.</paragraph>
 <paragraph role="paragraph" id="par_id6221198" xml-lang="en-US" l10n="NEW">You can enable the display of mean value lines and trend lines using commands on the Insert menu.</paragraph>
 <paragraph role="heading" id="hd_id1393475" xml-lang="en-US" level="3" l10n="NEW">Points only</paragraph>
-<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem">Tools - Options - Charts - Default Colors</item>. </paragraph>
+<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</item>. </paragraph>
 <paragraph role="heading" id="hd_id5376140" xml-lang="en-US" level="3" l10n="NEW">Lines Only</paragraph>
 <paragraph role="paragraph" id="par_id4408093" xml-lang="en-US" l10n="NEW">This variant draws straight lines from one data point to the next. The data points are not shown by icons. </paragraph>
 <paragraph role="paragraph" id="par_id7261268" xml-lang="en-US" l10n="NEW">The drawing order is the same as the order in the data series. Mark <emph>Sort by X Values</emph> to draw the lines in the order of the x values. This sorting applies only to the chart, not to the data in the table.</paragraph>
diff --git a/helpcontent2/source/text/schart/01/wiz_chart_elements.xhp b/helpcontent2/source/text/schart/01/wiz_chart_elements.xhp
index 613a89d97b..ad31093f88 100644
--- a/helpcontent2/source/text/schart/01/wiz_chart_elements.xhp
+++ b/helpcontent2/source/text/schart/01/wiz_chart_elements.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wiz_chart_elements.xhp,v $
- * $Revision: 1.6.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,90 +32,90 @@
  
 	
 <meta>
-<topic id="textschart01wiz_chart_elementsxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Chart Wizard - Chart Elements</title>
-<filename>/text/schart/01/wiz_chart_elements.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id70802" xml-lang="en-US" level="1" l10n="NEW"><variable id="wiz_chart_elements"><link href="text/schart/01/wiz_chart_elements.xhp">Chart Wizard - Chart Elements</link>
+      <topic id="textschart01wiz_chart_elementsxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Chart Wizard - Chart Elements</title>
+         <filename>/text/schart/01/wiz_chart_elements.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id70802" role="heading" level="1" l10n="NEW"><variable id="wiz_chart_elements"><link href="text/schart/01/wiz_chart_elements.xhp">Chart Wizard - Chart Elements</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id8746604" xml-lang="en-US" l10n="NEW">On this page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose the chart elements to be shown.</paragraph>
-<section id="howtoget">
-<embed href="text/schart/00/00000004.xhp#wiz"/>
-</section>
+      <paragraph xml-lang="en-US" id="par_id8746604" role="paragraph" l10n="NEW">On this page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose the chart elements to be shown.</paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz"/>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_MAIN" id="bm_id5977050" localize="false"/><comment>titles title</comment>
-<paragraph role="paragraph" id="par_id6437269" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a title for your chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id6437269" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a title for your chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_SUB" id="bm_id1355937" localize="false"/><comment>subtitle</comment>
-<paragraph role="paragraph" id="par_id9469893" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a subtitle for your chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id9469893" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a subtitle for your chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_X" id="bm_id3793145" localize="false"/><comment>x axis</comment>
-<paragraph role="paragraph" id="par_id130008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the x-axis (horizontal).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id130008" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the x-axis (horizontal).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_Y" id="bm_id1741996" localize="false"/><comment>y axisx axis</comment>
-<paragraph role="paragraph" id="par_id5821710" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the y-axis (vertical).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the y-axis (vertical).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_Z" id="bm_id9927365" localize="false"/><comment>z axis</comment>
-<paragraph role="paragraph" id="par_id2871791" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id2871791" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_SHOW" id="bm_id9610889" localize="false"/><comment>legend</comment>
-<paragraph role="paragraph" id="par_id7333597" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays a legend in your chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays a legend in your chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_LEFT" id="bm_id2193449" localize="false"/><comment>legend left</comment>
-<paragraph role="paragraph" id="par_id9976195" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the left of the chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id9976195" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the left of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_TOP" id="bm_id8514053" localize="false"/><comment>top</comment>
-<paragraph role="paragraph" id="par_id2507400" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the top of the chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id2507400" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the top of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_RIGHT" id="bm_id5466721" localize="false"/><comment>right</comment>
-<paragraph role="paragraph" id="par_id216681" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the right of the chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id216681" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the right of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_LEGEND_POS_BOTTOM" id="bm_id446570" localize="false"/><comment>bottom</comment>
-<paragraph role="paragraph" id="par_id7709585" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the bottom of the chart.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7709585" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Positions the legend to the bottom of the chart.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_XGRID" id="bm_id8159123" localize="false"/><comment>grid x axis</comment>
-<paragraph role="paragraph" id="par_id4309518" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the x-axis.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id4309518" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the x-axis.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_YGRID" id="bm_id2890102" localize="false"/><comment>y axis</comment>
-<paragraph role="paragraph" id="par_id206610" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the y-axis.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the y-axis.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_ZGRID" id="bm_id5801568" localize="false"/><comment>z axis</comment>
-<paragraph role="paragraph" id="par_id6917020" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id6917020" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_SECONDARY_X" id="bm_id2484817" localize="false"/><comment>secondary x axis ("2nd x axis" in spec doc)</comment>
-<paragraph role="paragraph" id="par_id9969481" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the secondary x-axis. This option is only available for charts that support a secondary x-axis.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id9969481" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the secondary x-axis. This option is only available for charts that support a secondary x-axis.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_TITLE_SECONDARY_Y" id="bm_id2484819" localize="false"/><comment>secondary y axis ("2nd y axis" in spec doc)</comment>
-<paragraph role="paragraph" id="par_id816675" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the secondary y-axis. This option is only available for charts that support a secondary y-axis.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#ShiftF1"/>
-<paragraph role="heading" id="hd_id4411145" xml-lang="en-US" level="2" l10n="NEW">To enter chart elements</paragraph>
-<paragraph role="paragraph" id="par_id3274941" xml-lang="en-US" l10n="NEW">Enter titles or click the elements that you want to be shown on the current chart.</paragraph>
-<paragraph role="heading" id="hd_id9804681" xml-lang="en-US" level="3" l10n="NEW">Titles</paragraph>
-<paragraph role="paragraph" id="par_id3614917" xml-lang="en-US" l10n="NEW">If you enter text for a title, subtitle, or any axis, the necessary space will be reserved to display the text next to the chart. If you do not enter a text, no space will be reserved, leaving more space to display the chart.</paragraph>
-<paragraph role="paragraph" id="par_id156865" xml-lang="en-US" l10n="NEW">It is not possible to link the title text to a cell. You must enter the text directly.<comment>Regina: See wishlist and issues 8099, 64825</comment></paragraph>
-<paragraph role="paragraph" id="par_id6034424" xml-lang="en-US" l10n="NEW">When the chart is finished, you can change the position and other properties by the <emph>Format</emph> menu.</paragraph>
-<paragraph role="heading" id="par_id9033783" xml-lang="en-US" level="3" l10n="NEW">Legend</paragraph>
-<paragraph role="paragraph" id="par_id1069368" xml-lang="en-US" l10n="CHG">The legend displays the labels from the first row or column, or from the range that you have set in the Data Series dialog. If your chart does not contain labels, the legend displays text like "Row 1, Row 2, ...", or "Column A, Column B, ..." according to the row number or column letter of the chart data.</paragraph>
-<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW">You cannot enter the text directly, it is automatically generated from the Name cell range.</paragraph>
-<paragraph role="paragraph" id="par_id71413" xml-lang="en-US" l10n="NEW">Select one of the position options. When the chart is finished, you can specify other positions using the Format menu.</paragraph>
-<paragraph role="heading" id="par_id4776757" xml-lang="en-US" level="3" l10n="NEW">Grids</paragraph>
+<paragraph xml-lang="en-US" id="par_id816675" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a label for the secondary y-axis. This option is only available for charts that support a secondary y-axis.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#ShiftF1"/>
+      <paragraph xml-lang="en-US" id="hd_id4411145" role="heading" level="2" l10n="NEW">To enter chart elements</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3274941" role="paragraph" l10n="NEW">Enter titles or click the elements that you want to be shown on the current chart.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9804681" role="heading" level="3" l10n="NEW">Titles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3614917" role="paragraph" l10n="NEW">If you enter text for a title, subtitle, or any axis, the necessary space will be reserved to display the text next to the chart. If you do not enter a text, no space will be reserved, leaving more space to display the chart.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id156865" role="paragraph" l10n="NEW">It is not possible to link the title text to a cell. You must enter the text directly.<comment>Regina: See wishlist and issues 8099, 64825</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6034424" role="paragraph" l10n="NEW">When the chart is finished, you can change the position and other properties by the <emph>Format</emph> menu.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9033783" role="heading" level="3" l10n="NEW">Legend</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1069368" role="paragraph" l10n="CHG">The legend displays the labels from the first row or column, or from the range that you have set in the Data Series dialog. If your chart does not contain labels, the legend displays text like "Row 1, Row 2, ...", or "Column A, Column B, ..." according to the row number or column letter of the chart data.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6998809" role="paragraph" l10n="NEW">You cannot enter the text directly, it is automatically generated from the Name cell range.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id71413" role="paragraph" l10n="NEW">Select one of the position options. When the chart is finished, you can specify other positions using the Format menu.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4776757" role="heading" level="3" l10n="NEW">Grids</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_XGRID" id="bm_id8159123" localize="false"/><comment>grid x axis</comment>
-<paragraph role="paragraph" id="par_id6737876" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the x-axis.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id6737876" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the x-axis.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_YGRID" id="bm_id2890102" localize="false"/><comment>y axis</comment>
-<paragraph role="paragraph" id="par_id1058992" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the y-axis.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id1058992" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the y-axis.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SCH_CB_ZGRID" id="bm_id5801568" localize="false"/><comment>z axis</comment>
-<paragraph role="paragraph" id="par_id7366557" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are parallel to the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6527298" xml-lang="en-US" l10n="NEW">The visible grid lines can help to estimate the data values in the chart.</paragraph>
-<paragraph role="paragraph" id="par_id2924283" xml-lang="en-US" l10n="NEW">The distance of the grid lines corresponds to the interval settings in the Scale tab of the axis properties.</paragraph>
-<paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW">Grid lines are not available for pie charts.</paragraph>
-<paragraph role="heading" id="hd_id6942045" xml-lang="en-US" level="2" l10n="NEW">Additional elements</paragraph>
-<paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW">For additional elements use the Insert menu of the chart in edit mode. There you can define the following elements:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5806756" xml-lang="en-US" l10n="NEW">Secondary axes</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8915372" xml-lang="en-US" l10n="NEW">Minor grids</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6070436" xml-lang="en-US" l10n="NEW">Data labels</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7564012" xml-lang="en-US" l10n="CHG">Statistics, for example mean values, y error bars and trend lines</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id7366557" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6527298" role="paragraph" l10n="NEW">The visible grid lines can help to estimate the data values in the chart.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2924283" role="paragraph" l10n="NEW">The distance of the grid lines corresponds to the interval settings in the Scale tab of the axis properties.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5781731" role="paragraph" l10n="NEW">Grid lines are not available for pie charts.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6942045" role="heading" level="2" l10n="NEW">Additional elements</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4721823" role="paragraph" l10n="NEW">For additional elements use the Insert menu of the chart in edit mode. There you can define the following elements:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">Secondary axes</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8915372" role="paragraph" l10n="NEW">Minor grids</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6070436" role="paragraph" l10n="NEW">Data labels</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7564012" role="paragraph" l10n="CHG">Statistics, for example mean values, y error bars and trend lines</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/wiz_chart_type.xhp b/helpcontent2/source/text/schart/01/wiz_chart_type.xhp
index 94df17a33c..08caae2a3d 100644
--- a/helpcontent2/source/text/schart/01/wiz_chart_type.xhp
+++ b/helpcontent2/source/text/schart/01/wiz_chart_type.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wiz_chart_type.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/01/wiz_data_range.xhp b/helpcontent2/source/text/schart/01/wiz_data_range.xhp
index fc7a90386d..f811e9c900 100644
--- a/helpcontent2/source/text/schart/01/wiz_data_range.xhp
+++ b/helpcontent2/source/text/schart/01/wiz_data_range.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wiz_data_range.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,55 +29,61 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textschart01wiz_data_rangexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chart Wizard - Data Range</title>
-<filename>/text/schart/01/wiz_data_range.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschart01wiz_data_rangexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Chart Wizard - Data Range</title>
+         <filename>/text/schart/01/wiz_data_range.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2429578"><bookmark_value>data ranges in charts</bookmark_value>
-</bookmark><comment>mw added one entry</comment><paragraph role="heading" id="hd_id8313852" xml-lang="en-US" level="1" l10n="NEW"><variable id="wiz_data_range"><link href="text/schart/01/wiz_data_range.xhp">Chart Wizard - Data Range</link>
+</bookmark><comment>mw added one entry</comment>
+<paragraph xml-lang="en-US" id="hd_id8313852" role="heading" level="1" l10n="NEW"><variable id="wiz_data_range"><link href="text/schart/01/wiz_data_range.xhp">Chart Wizard - Data Range</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id8829309" xml-lang="en-US" l10n="NEW">On this page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can select one single source of data range. This range may consist of more than one rectangular range of cells.</paragraph><comment>context menu Data Ranges</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:DataRanges" id="bm_id7543259" localize="false"/><paragraph role="paragraph" id="par_id6401867" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Data Ranges dialog where you can edit Data Range and Data Series.</ahelp></paragraph>
-<paragraph role="tip" id="par_id2025818" xml-lang="en-US" l10n="NEW">Use the Chart Wizard - Data Series page if you need more control over the data ranges.</paragraph>
-<section id="howtoget">
-  <embed href="text/schart/00/00000004.xhp#wiz_ranges"/>
-</section>
-<paragraph role="paragraph" id="par_id8466139" xml-lang="en-US" l10n="NEW">This dialog is only available for charts based on a Calc or Writer table.</paragraph>
-<embed href="text/shared/00/00000001.xhp#ShiftF1"/>
-<paragraph role="heading" id="hd_id1877193" xml-lang="en-US" level="2" l10n="NEW">To specify a data range</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5924863" xml-lang="en-US" l10n="NEW">Select the data range. Do one of the following:</paragraph>
-<paragraph role="paragraph" id="par_id4357432" xml-lang="en-US" l10n="NEW">Enter the data range in the text box.</paragraph>
-<paragraph role="paragraph" id="par_id5626392" xml-lang="en-US" l10n="NEW">In Calc, an example data range would be "$Sheet1.$B$3:$B$14". Note that a data range may consist of more than one region in a spreadsheet, e.g. "$Sheet1.A1:A5;$Sheet1.D1:D5" is also a valid data range. In Writer, an example data range would be "Table1.A1:E4".</paragraph>
-<paragraph role="paragraph" id="par_id1363872" xml-lang="en-US" l10n="NEW">In Calc, click <emph>Select data range</emph> to minimize the dialog, then drag to select the data range. Click <emph>Select data range</emph> again to enter the data range. <comment>Hold down the Ctrl key and drag to select multiple ranges. --- see issue 71894</comment></paragraph>
-<paragraph role="paragraph" id="par_id6823938" xml-lang="en-US" l10n="NEW">If you want a data range of multiple cell areas that are not next to each other, enter the first range, then manually add a semicolon at the end of the text box, then enter the other ranges. Use a semicolon as delimiter between ranges.<comment>UFI: not sure if you can use the mouse to "enter the other ranges". May be you must use the keyboard.</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1434369" xml-lang="en-US" l10n="NEW">Click one of the options for data series in rows or in columns.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7524033" xml-lang="en-US" l10n="NEW">Check whether the data range has labels in the first row or in the first column or both.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5256508" xml-lang="en-US" l10n="NEW">In the preview you can see how the final chart will look.</paragraph><comment>data range text box &amp; shrinky</comment>
+      <paragraph xml-lang="en-US" id="par_id8829309" role="paragraph" l10n="NEW">On this page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can select one single source of data range. This range may consist of more than one rectangular range of cells.</paragraph><comment>context menu Data Ranges</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:DataRanges" id="bm_id7543259" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6401867" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Data Ranges dialog where you can edit Data Range and Data Series.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2025818" role="tip" l10n="NEW">Use the Chart Wizard - Data Series page if you need more control over the data ranges.</paragraph>
+      <section id="howtoget">
+         <embed href="text/schart/00/00000004.xhp#wiz_ranges"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id8466139" role="paragraph" l10n="NEW">This dialog is only available for charts based on a Calc or Writer table.</paragraph>
+      <embed href="text/shared/00/00000001.xhp#ShiftF1"/>
+      <paragraph xml-lang="en-US" id="hd_id1877193" role="heading" level="2" l10n="NEW">To specify a data range</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5924863" role="paragraph" l10n="NEW">Select the data range. Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4357432" role="paragraph" l10n="NEW">Enter the data range in the text box.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id5626392" role="paragraph" l10n="NEW">In Calc, an example data range would be "$Sheet1.$B$3:$B$14". Note that a data range may consist of more than one region in a spreadsheet, e.g. "$Sheet1.A1:A5;$Sheet1.D1:D5" is also a valid data range. In Writer, an example data range would be "Table1.A1:E4".</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1363872" role="paragraph" l10n="CHG">In Calc, click <emph>Select data range</emph> to minimize the dialog, then drag over a cell area to select the data range.<comment>Hold down the Ctrl key and drag to select multiple ranges. --- see issue 71894</comment></paragraph>
+            <paragraph xml-lang="en-US" id="par_id6823938" role="paragraph" l10n="NEW">If you want a data range of multiple cell areas that are not next to each other, enter the first range, then manually add a semicolon at the end of the text box, then enter the other ranges. Use a semicolon as delimiter between ranges.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1434369" role="paragraph" l10n="NEW">Click one of the options for data series in rows or in columns.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7524033" role="paragraph" l10n="NEW">Check whether the data range has labels in the first row or in the first column or both.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5256508" role="paragraph" l10n="NEW">In the preview you can see how the final chart will look.</paragraph><comment>data range text box &amp; shrinky</comment>
 <bookmark xml-lang="en-US" branch="hid/chart2:Edit:TP_RANGECHOOSER:ED_RANGE" id="bm_id2121951" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE" id="bm_id4829554" localize="false"/><paragraph role="paragraph" id="par_id379650" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the data range that you want to include in your chart. To minimize this dialog while you select the data range in Calc, click the <emph>Select data range</emph> button.</ahelp></paragraph><comment>data series in rows</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS" id="bm_id2901699" localize="false"/><paragraph role="paragraph" id="par_id953703" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Data series get their data from consecutive rows in the selected range. For scatter charts, the first data series will contain x-values for all series. All other data series are used as y-values, one for each series.</ahelp></paragraph><comment>data series in columns</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS" id="bm_id5534226" localize="false"/><paragraph role="paragraph" id="par_id4496597" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Data series get their data from consecutive columns in the selected range. For scatter charts, the first data column will contain x-values for all series. All other data columns are used as y-values, one for each series.</ahelp></paragraph><comment>first row as label</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS" id="bm_id49134" localize="false"/><paragraph role="paragraph" id="par_id2898953" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For data series in columns: The first row in the range is used as names for data series. For data series in rows: The first row in the range is used as categories. The remaining rows comprise the data series. If this check box is not selected, all rows are data series.</ahelp></paragraph><comment>first column as label</comment>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS" id="bm_id8939481" localize="false"/><paragraph role="paragraph" id="par_id7546311" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For data series in columns: The first column in the range is used as names for data series. For data series in rows: The first column in the range is used as categories. The remaining columns comprise the data columns. If this check box is not selected, all columns are data columns.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE" id="bm_id4829554" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id379650" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the data range that you want to include in your chart. To minimize this dialog while you select the data range in Calc, click the <emph>Select data range</emph> button.</ahelp></paragraph><comment>data series in rows</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS" id="bm_id2901699" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id953703" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Data series get their data from consecutive rows in the selected range. For scatter charts, the first data series will contain x-values for all series. All other data series are used as y-values, one for each series.</ahelp></paragraph><comment>data series in columns</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS" id="bm_id5534226" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4496597" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Data series get their data from consecutive columns in the selected range. For scatter charts, the first data column will contain x-values for all series. All other data columns are used as y-values, one for each series.</ahelp></paragraph><comment>first row as label</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS" id="bm_id49134" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2898953" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For data series in columns: The first row in the range is used as names for data series. For data series in rows: The first row in the range is used as categories. The remaining rows comprise the data series. If this check box is not selected, all rows are data series.</ahelp></paragraph><comment>first column as label</comment>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS" id="bm_id8939481" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7546311" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For data series in columns: The first column in the range is used as names for data series. For data series in rows: The first column in the range is used as categories. The remaining columns comprise the data columns. If this check box is not selected, all columns are data columns.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+         <embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+         <embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+         <embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/wiz_data_series.xhp b/helpcontent2/source/text/schart/01/wiz_data_series.xhp
index 8821799be4..861e0cc24c 100644
--- a/helpcontent2/source/text/schart/01/wiz_data_series.xhp
+++ b/helpcontent2/source/text/schart/01/wiz_data_series.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wiz_data_series.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -83,7 +80,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3931699" xml-lang="en-US" l10n="NEW">Enter the range or click <emph>Select data range</emph> to minimize the dialog and select the range with the mouse.</paragraph>
-<paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW">If you want a data range of multiple cell areas that are not next to each other, enter the first range, then manually add a semikolon at the end of the text box, then enter the other ranges. Use a semikolon as delimiter between ranges.<comment>UFI: not sure if you can use the mouse to "enter the other ranges". May be you must use the keyboard.</comment></paragraph>
+<paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW">If you want a data range of multiple cell areas that are not next to each other, enter the first range, then manually add a semicolon at the end of the text box, then enter the other ranges. Use a semicolon as delimiter between ranges.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id5971556" xml-lang="en-US" l10n="NEW">The range for a data role, like Y-Values, must not include a label cell.</paragraph>
diff --git a/helpcontent2/source/text/schart/02/01190000.xhp b/helpcontent2/source/text/schart/02/01190000.xhp
index d02d7e8529..83cbc4e913 100644
--- a/helpcontent2/source/text/schart/02/01190000.xhp
+++ b/helpcontent2/source/text/schart/02/01190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01190000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/02/01200000.xhp b/helpcontent2/source/text/schart/02/01200000.xhp
index 94080a9e5b..f04cb2d1c6 100644
--- a/helpcontent2/source/text/schart/02/01200000.xhp
+++ b/helpcontent2/source/text/schart/02/01200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01200000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/02/01210000.xhp b/helpcontent2/source/text/schart/02/01210000.xhp
index 240acb30cb..dadebf2d7c 100644
--- a/helpcontent2/source/text/schart/02/01210000.xhp
+++ b/helpcontent2/source/text/schart/02/01210000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01210000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/02/01220000.xhp b/helpcontent2/source/text/schart/02/01220000.xhp
index e0450f543e..e3bfd68129 100644
--- a/helpcontent2/source/text/schart/02/01220000.xhp
+++ b/helpcontent2/source/text/schart/02/01220000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01220000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/02/02020000.xhp b/helpcontent2/source/text/schart/02/02020000.xhp
index 0b1d5952c3..f640e6f937 100644
--- a/helpcontent2/source/text/schart/02/02020000.xhp
+++ b/helpcontent2/source/text/schart/02/02020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/02/makefile.mk b/helpcontent2/source/text/schart/02/makefile.mk
index acdebe7a5f..0e97effbb0 100644
--- a/helpcontent2/source/text/schart/02/makefile.mk
+++ b/helpcontent2/source/text/schart/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,4 +53,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/schart/04/01020000.xhp b/helpcontent2/source/text/schart/04/01020000.xhp
index e8c9909d30..dd9b507525 100755
--- a/helpcontent2/source/text/schart/04/01020000.xhp
+++ b/helpcontent2/source/text/schart/04/01020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/04/makefile.mk b/helpcontent2/source/text/schart/04/makefile.mk
index 8e1b65540b..bf3a3a85c3 100644
--- a/helpcontent2/source/text/schart/04/makefile.mk
+++ b/helpcontent2/source/text/schart/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/schart/main0000.xhp b/helpcontent2/source/text/schart/main0000.xhp
index 651ac2e471..22036fefd2 100755
--- a/helpcontent2/source/text/schart/main0000.xhp
+++ b/helpcontent2/source/text/schart/main0000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,157 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textschartmain0000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Charts in $[officename]</title>
-<filename>/text/schart/main0000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textschartmain0000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Charts in $[officename]</title>
+         <filename>/text/schart/main0000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148664"><bookmark_value>charts; overview</bookmark_value>
-<bookmark_value>HowTos for charts</bookmark_value>
-</bookmark><comment>MW added one entry</comment><paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="chart_main"><link href="text/schart/main0000.xhp" name="Charts in $[officename]">Using Charts in %PRODUCTNAME</link>
+      <bookmark_value>HowTos for charts</bookmark_value>
+</bookmark><comment>MW added one entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="1" l10n="U" oldref="1"><variable id="chart_main"><link href="text/schart/main0000.xhp" name="Charts in $[officename]">Using Charts in %PRODUCTNAME</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154685" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="chart">$[officename] lets you present data graphically in a chart, so that you can visually compare data series and view trends in the data. You can insert charts into spreadsheets, text documents, drawings, and presentations. 
+      <paragraph xml-lang="en-US" id="par_id3154685" role="paragraph" l10n="CHG" oldref="2"><variable id="chart">$[officename] lets you present data graphically in a chart, so that you can visually compare data series and view trends in the data. You can insert charts into spreadsheets, text documents, drawings, and presentations. 
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3153143" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Chart Data</paragraph>
-<paragraph role="paragraph" id="par_id5181432" xml-lang="en-US" l10n="NEW">Charts can be based on the following data:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7787102" xml-lang="en-US" l10n="NEW">Spreadsheet values from Calc cell ranges<comment>also Excel...</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7929929" xml-lang="en-US" l10n="NEW">Cell values from a Writer table</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4727011" xml-lang="en-US" l10n="NEW">Values that you enter in the Chart Data Table dialog (you can create these charts in Writer, Draw, or Impress, and you can copy and paste them also to Calc)</paragraph>
-</listitem>
-</list><comment>command line Insert - (Object -) Chart, moved here from deleted shared/01/04160100.xhp</comment>
+      <paragraph xml-lang="en-US" id="hd_id3153143" role="heading" level="2" l10n="CHG"
+                 oldref="5">Chart Data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5181432" role="paragraph" l10n="NEW">Charts can be based on the following data:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7787102" role="paragraph" l10n="NEW">Spreadsheet values from Calc cell ranges<comment>also Excel...</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7929929" role="paragraph" l10n="NEW">Cell values from a Writer table</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4727011" role="paragraph" l10n="NEW">Values that you enter in the Chart Data Table dialog (you can create these charts in Writer, Draw, or Impress, and you can copy and paste them also to Calc)</paragraph>
+         </listitem>
+      </list><comment>command line Insert - (Object -) Chart, moved here from deleted shared/01/04160100.xhp</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_DIAGRAM" id="bm_id2038889" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectChart" id="bm_id3149551" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_CHART" id="bm_id6209730" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DrawChart" id="bm_id3154688" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_CHART" id="bm_id7389470" localize="false"/>
+<!-- removed HID SID_OPENDLG_CHART -->
 <bookmark xml-lang="en-US" branch="hid/.uno:StarChartDialog" id="bm_id3146060" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_INSERT_CHART" id="bm_id3149532" localize="false"/><paragraph role="paragraph" id="par_id76601" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Creates a chart in the current document. To use a range of cells as the data source for your chart, select the cells, and then choose this command.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id5345011" xml-lang="en-US" level="2" l10n="NEW">To insert a chart</paragraph>
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/choose_chart_type.xhp#choose_chart_type"/>
-<paragraph role="heading" id="hd_id5631580" xml-lang="en-US" level="2" l10n="NEW">To edit a chart</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7911008" xml-lang="en-US" l10n="NEW">Click a chart to edit the chart object properties:</paragraph>
-<paragraph role="paragraph" id="par_id9844660" xml-lang="en-US" l10n="NEW">size and position on the current page</paragraph>
-<paragraph role="paragraph" id="par_id8039796" xml-lang="en-US" l10n="NEW">alignment, text wrap, outer borders, and more</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7986693" xml-lang="en-US" l10n="NEW">Double-click a chart to enter the chart edit mode:</paragraph>
-<paragraph role="paragraph" id="par_id2350840" xml-lang="en-US" l10n="NEW">chart data values (for charts with own data)</paragraph>
-<paragraph role="paragraph" id="par_id3776055" xml-lang="en-US" l10n="NEW">chart type, axes, titles, walls, grid, and more</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8442335" xml-lang="en-US" l10n="NEW">Double-click a chart element in chart edit mode:</paragraph>
-<paragraph role="paragraph" id="par_id4194769" xml-lang="en-US" l10n="NEW">double-click an axis to edit the scale, type, color, and more</paragraph>
-<paragraph role="paragraph" id="par_id8644672" xml-lang="en-US" l10n="NEW">double-click a data point, or a data series in the legend, to edit the graphical values of the data series</paragraph>
-<paragraph role="paragraph" id="par_id6574907" xml-lang="en-US" l10n="NEW">with a data series selected, double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart)</paragraph>
-<paragraph role="paragraph" id="par_id7528916" xml-lang="en-US" l10n="NEW">double-click any other chart element, or click the element and open the Format menu, to edit the properties</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8420667" xml-lang="en-US" l10n="NEW">Click outside the chart to leave the current edit mode.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id4923856" xml-lang="en-US" l10n="NEW">To print a chart in high quality, you can export the chart to a PDF file and print that file.</paragraph><comment>how to update chart data (drag&amp;drop vs chart data dialog)</comment><embed href="text/shared/guide/chart_title.xhp#chart_title"/>
-<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
-<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
-<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
-<embed href="text/schart/01/three_d_view.xhp#three_d_view"/>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_INSERT_CHART" id="bm_id3149532" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id76601" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Creates a chart in the current document. To use a continuous range of cells as the data source for your chart, click inside the cell range, and then choose this command. Alternatively, select some cells and choose this command to create a chart of the selected cells.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5345011" role="heading" level="2" l10n="NEW">To insert a chart</paragraph>
+      <embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+      <embed href="text/schart/01/choose_chart_type.xhp#choose_chart_type"/>
+      <paragraph xml-lang="en-US" id="hd_id5631580" role="heading" level="2" l10n="NEW">To edit a chart</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7911008" role="paragraph" l10n="NEW">Click a chart to edit the object properties:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9844660" role="paragraph" l10n="NEW">Size and position on the current page.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id8039796" role="paragraph" l10n="NEW">Alignment, text wrap, outer borders, and more.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7986693" role="paragraph" l10n="NEW">Double-click a chart to enter the chart edit mode:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id2350840" role="paragraph" l10n="NEW">Chart data values (for charts with own data).</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3776055" role="paragraph" l10n="NEW">Chart type, axes, titles, walls, grid, and more.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8442335" role="paragraph" l10n="NEW">Double-click a chart element in chart edit mode:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4194769" role="paragraph" l10n="NEW">Double-click an axis to edit the scale, type, color, and more.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id8644672" role="paragraph" l10n="NEW">Double-click a data point to select and edit the data series to which the data point belongs.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6574907" role="paragraph" l10n="NEW">With a data series selected, click, then double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart).</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1019200902360575" role="paragraph" l10n="NEW">Double-click the legend to select and edit the legend. Click, then double-click a symbol in the selected legend to edit the associated data series.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id7528916" role="paragraph" l10n="NEW">Double-click any other chart element, or click the element and open the Format menu, to edit the properties.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8420667" role="paragraph" l10n="NEW">Click outside the chart to leave the current edit mode.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id4923856" role="tip" l10n="NEW">To print a chart in high quality, you can export the chart to a PDF file and print that file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200912061033" role="paragraph" l10n="CHG">In chart edit mode, you see the <link href="text/schart/main0202.xhp">Formatting Bar</link> for charts near the upper border of the document. The Drawing Bar for charts appears near the lower border of the document. The Drawing Bar shows a subset of the icons from the <link href="text/simpress/main0210.xhp">Drawing</link> toolbar of Draw and Impress.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902080452" role="paragraph" l10n="NEW">You can right-click an element of a chart to open the context menu. The context menu offers many commands to format the selected element.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatTitle" id="bm_id0810200903431839" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id081020090354489" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the selected title.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatChartArea" id="bm_id0810200903401642" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903405629" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the chart area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatWall" id="bm_id0810200903420337" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903544867" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the chart wall.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatFloor" id="bm_id0810200903424458" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903544952" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the chart floor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatLegend" id="bm_id0810200903440259" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903544927" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the chart legend.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatAxis" id="bm_id0810200903443886" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903544949" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the selected axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataPoint" id="bm_id081020090345395" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903544984" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the selected data point.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatMajorGrid" id="bm_id0810200903463111" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545096" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the major grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatMinorGrid" id="bm_id081020090347088" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the minor grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataSeries" id="bm_id0810200903475043" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545095" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data series.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatStockLoss" id="bm_id0810200903483389" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545094" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the stock loss indicators.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatStockGain" id="bm_id0810200903491288" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545113" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the stock gain indicators.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataLabels" id="bm_id0810200903510321" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatYErrorBars" id="bm_id0810200903522796" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545159" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the Y error bars.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatMeanValue" id="bm_id0810200903531785" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id081020090354524" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the mean value line.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatTrendline" id="bm_id0810200903541347" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200903545274" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the trendline.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatTrendlineEquation" id="bm_id0810200903583324" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904063285" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the trendline equation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataLabel" id="bm_id0810200903592433" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904063252" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the selected data label.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertTitles" id="bm_id0810200904002651" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904063239" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to insert chart titles.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertRemoveAxes" id="bm_id0810200904070699" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233047" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to insert or delete axes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAxis" id="bm_id0810200904131060" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233058" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to insert an axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAxisTitle" id="bm_id0810200904134569" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233089" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to insert an axis title.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMajorGrid" id="bm_id081020090418240" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233160" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a major grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMinorGrid" id="bm_id0810200904190029" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233175" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a minor grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertDataLabels" id="bm_id0810200904194557" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233111" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquationAndR2" id="bm_id0810200904204069" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904233174" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the trendline equation and the coefficient of determination R².</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertR2Value" id="bm_id0810200904250571" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904265639" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the coefficient of determination R² value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertDataLabel" id="bm_id081020090428246" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362614" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a single data label.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteLegend" id="bm_id0810200904303930" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362666" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the chart legend.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAxis" id="bm_id0810200904311994" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362777" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the selected axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteMajorGrid" id="bm_id0810200904315530" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362785" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the major grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteMinorGrid" id="bm_id0810200904322666" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362748" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the minor grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteDataLabels" id="bm_id0810200904330358" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362778" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes all data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteTrendlineEquation" id="bm_id0810200904341536" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362893" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the trendline equation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteR2Value" id="bm_id0810200904345275" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362896" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the R² value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteDataLabel" id="bm_id0810200904354291" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904362827" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the selected data label.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteMeanValue" id="bm_id0810200904405280" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904431376" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the mean value line.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteYErrorBars" id="bm_id0810200904413070" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id081020090443142" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Deletes the Y error bars.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ResetDataPoint" id="bm_id081020090437598" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904393229" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Resets the selected data point to default format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ResetAllDataPoints" id="bm_id0810200904383722" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0810200904393351" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Resets all data points to default format.</ahelp></paragraph><comment>how to update chart data (drag&amp;drop vs chart data dialog)</comment><embed href="text/shared/guide/chart_title.xhp#chart_title"/>
+      <embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
+      <embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
+      <embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
+      <embed href="text/schart/01/three_d_view.xhp#three_d_view"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/main0202.xhp b/helpcontent2/source/text/schart/main0202.xhp
new file mode 100755
index 0000000000..afbc4bba2b
--- /dev/null
+++ b/helpcontent2/source/text/schart/main0202.xhp
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textschartmain0202xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting Bar</title>
+         <filename>/text/schart/main0202.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="chartformatting">
+         <paragraph xml-lang="en-US" id="hd_id0810200911433792" role="heading" level="1" l10n="NEW"><link href="text/schart/main0202.xhp" name="Formatting Bar">Formatting Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0810200911433835" role="paragraph" l10n="NEW">The Formatting Bar is shown when a chart is set to edit mode. Double-click a chart to enter edit mode. Click outside the chart to leave edit mode.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id0810200911433878" role="paragraph" l10n="NEW">You can edit the formatting of a chart using the controls and icons on the Formatting Bar.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChartElementSelector" id="bm_id0810200902112648" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0810200902300436" role="heading" level="2" l10n="NEW">Select Chart Element</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300479" role="paragraph" l10n="NEW"><ahelp hid=".">Select the element from the chart that you want to format. The element gets selected in the chart preview. Click Format Selection to open the properties dialog for the selected element.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300555" role="heading" level="2" l10n="NEW">Format Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300539" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the properties dialog for the selected element.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300545" role="heading" level="2" l10n="NEW">Chart Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300594" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Chart Type dialog.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300537" role="heading" level="2" l10n="NEW">Chart Data Table</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300699" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Data Table dialog where you can edit the chart data.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300672" role="heading" level="2" l10n="NEW">Horizontal Grid On/Off</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300630" role="paragraph" l10n="CHG"><ahelp hid=".">The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the Y axis.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300738" role="heading" level="2" l10n="NEW">Legend On/Off</paragraph>
+      <paragraph xml-lang="en-US" id="par_id081020090230076" role="paragraph" l10n="NEW"><ahelp hid=".">To show or hide a legend, click Legend On/Off on the Formatting bar.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0810200902300785" role="heading" level="2" l10n="NEW">Scale Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300784" role="paragraph" l10n="NEW"><ahelp hid=".">Rescales the text in the chart when you change the size of the chart.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id081020090230087" role="heading" level="2" l10n="NEW">Automatic Layout</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0810200902300834" role="paragraph" l10n="NEW"><ahelp hid=".">Moves all chart elements to their default positions inside the current chart. This function does not alter the chart type or any other attributes other than the position of elements.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/schart/main0503.xhp b/helpcontent2/source/text/schart/main0503.xhp
index 0994b3d1a9..bb75088942 100755
--- a/helpcontent2/source/text/schart/main0503.xhp
+++ b/helpcontent2/source/text/schart/main0503.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/schart/makefile.mk b/helpcontent2/source/text/schart/makefile.mk
index 2f0fbb43d5..d1f49595a1 100644
--- a/helpcontent2/source/text/schart/makefile.mk
+++ b/helpcontent2/source/text/schart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,9 +45,10 @@ MODULE  = schart
 # this list matches the *.xhp files to process
 XHPFILES = \
    main0000.xhp \
+   main0202.xhp \
    main0503.xhp 
     
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sdraw/00/00000004.xhp b/helpcontent2/source/text/sdraw/00/00000004.xhp
index f51c2d06eb..79df20d16f 100755
--- a/helpcontent2/source/text/sdraw/00/00000004.xhp
+++ b/helpcontent2/source/text/sdraw/00/00000004.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/00/makefile.mk b/helpcontent2/source/text/sdraw/00/makefile.mk
index eec47dcbeb..7f1894b870 100644
--- a/helpcontent2/source/text/sdraw/00/makefile.mk
+++ b/helpcontent2/source/text/sdraw/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sdraw/01/04010000.xhp b/helpcontent2/source/text/sdraw/01/04010000.xhp
index a7cf60b780..7b1be9d48b 100755
--- a/helpcontent2/source/text/sdraw/01/04010000.xhp
+++ b/helpcontent2/source/text/sdraw/01/04010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/01/makefile.mk b/helpcontent2/source/text/sdraw/01/makefile.mk
index 9d679d5b1e..8c138c3914 100644
--- a/helpcontent2/source/text/sdraw/01/makefile.mk
+++ b/helpcontent2/source/text/sdraw/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
index 8e8df32f0c..cc6c43c564 100755
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.9.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,474 +29,448 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsdraw0401020000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Shortcut Keys for Drawings</title>
-<filename>/text/sdraw/04/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="stardrawtastaturbefehle">
+      <topic id="textsdraw0401020000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Shortcut Keys for Drawings</title>
+         <filename>/text/sdraw/04/01020000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="stardrawtastaturbefehle">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156441"><bookmark_value>shortcut keys;in drawings</bookmark_value>
-<bookmark_value>drawings; shortcut keys</bookmark_value>
+         <bookmark_value>drawings; shortcut keys</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="draw_keys"><link href="text/sdraw/04/01020000.xhp" name="Shortcut Keys for Drawings">Shortcut Keys for Drawings</link>
+<paragraph xml-lang="en-US" id="hd_id3156441" role="heading" level="1" l10n="U" oldref="1"><variable id="draw_keys"><link href="text/sdraw/04/01020000.xhp" name="Shortcut Keys for Drawings">Shortcut Keys for Drawings</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153877" xml-lang="en-US" l10n="U" oldref="2">The following is a list of shortcut keys specific to Drawing documents.</paragraph>
-<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="U" oldref="103">You can also use the <link href="text/shared/04/01010000.xhp" name="general shortcut keys for $[officename]">general shortcut keys for $[officename]</link>.</paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-</section>
-<paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="2" l10n="U" oldref="3">Function Keys for Drawings</paragraph>
-<table id="tbl_id9051789.00000001">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3155768" xml-lang="en-US" l10n="U" oldref="4">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153713" xml-lang="en-US" l10n="U" oldref="6">
+         <paragraph xml-lang="en-US" id="par_id3153877" role="paragraph" l10n="U" oldref="2">The following is a list of shortcut keys specific to Drawing documents.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154730" role="paragraph" l10n="U" oldref="103">You can also use the <link href="text/shared/04/01010000.xhp" name="general shortcut keys for $[officename]">general shortcut keys for $[officename]</link>.</paragraph>
+         <embed href="text/shared/00/00000099.xhp#keys"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3149121" role="heading" level="2" l10n="U" oldref="3">Function Keys for Drawings</paragraph>
+      <table id="tbl_id9051789.00000001">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155768" role="tablehead" l10n="U" oldref="4">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153713" role="tablehead" l10n="U" oldref="6">
 <emph>Effect</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150044" xml-lang="en-US" l10n="U" oldref="7">F2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152346" xml-lang="en-US" l10n="U" oldref="8">Add or edit text.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154705" xml-lang="en-US" l10n="U" oldref="9">F3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="10">Opens group to edit individual objects.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155113" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159238" xml-lang="en-US" l10n="U" oldref="12">Close group editor.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150199" xml-lang="en-US" l10n="U" oldref="13">Shift+F3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152994" xml-lang="en-US" l10n="U" oldref="14">Opens the <emph>Duplicate</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154488" xml-lang="en-US" l10n="U" oldref="15">F4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="16">Opens the <emph>Position and Size</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148870" xml-lang="en-US" l10n="U" oldref="21">F5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153917" xml-lang="en-US" l10n="U" oldref="22">Opens the <emph>Navigator</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3157982" xml-lang="en-US" l10n="U" oldref="25">F7</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154649" xml-lang="en-US" l10n="U" oldref="26">Checks spelling.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152869" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154765" xml-lang="en-US" l10n="U" oldref="28">Opens the <emph>Thesaurus</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146962" xml-lang="en-US" l10n="U" oldref="29">F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="30">Edit points on/off.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149317" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="32">Fits to frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150434" xml-lang="en-US" l10n="U" oldref="35">F11</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151389" xml-lang="en-US" l10n="U" oldref="36">Opens Styles and Formatting window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150044" role="tablecontent" l10n="U" oldref="7">F2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152346" role="tablecontent" l10n="U" oldref="8">Add or edit text.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154705" role="tablecontent" l10n="U" oldref="9">F3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147004" role="tablecontent" l10n="U" oldref="10">Opens group to edit individual objects.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155113" role="tablecontent" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159238" role="tablecontent" l10n="U" oldref="12">Close group editor.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150199" role="tablecontent" l10n="U" oldref="13">Shift+F3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152994" role="tablecontent" l10n="U" oldref="14">Opens the <emph>Duplicate</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154488" role="tablecontent" l10n="U" oldref="15">F4</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149406" role="tablecontent" l10n="U" oldref="16">Opens the <emph>Position and Size</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148870" role="tablecontent" l10n="U" oldref="21">F5</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153917" role="tablecontent" l10n="U" oldref="22">Opens the <emph>Navigator</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3157982" role="tablecontent" l10n="U" oldref="25">F7</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154649" role="tablecontent" l10n="U" oldref="26">Checks spelling.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152869" role="tablecontent" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154765" role="tablecontent" l10n="U" oldref="28">Opens the <emph>Thesaurus</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146962" role="tablecontent" l10n="U" oldref="29">F8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154707" role="tablecontent" l10n="U" oldref="30">Edit points on/off.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149317" role="tablecontent" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147250" role="tablecontent" l10n="U" oldref="32">Fits to frame.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150434" role="tablecontent" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151389" role="tablecontent" l10n="U" oldref="36">Opens Styles and Formatting window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150393"><bookmark_value>zooming;shortcut keys</bookmark_value>
-<bookmark_value>drawings; zoom function in</bookmark_value>
+      <bookmark_value>drawings; zoom function in</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150393" xml-lang="en-US" level="2" l10n="U" oldref="41">Shortcut Keys for Drawings</paragraph>
-<table id="tbl_id1650440">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3156401" xml-lang="en-US" l10n="U" oldref="42">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3146323" xml-lang="en-US" l10n="U" oldref="43">
+<paragraph xml-lang="en-US" id="hd_id3150393" role="heading" level="2" l10n="U"
+                 oldref="41">Shortcut Keys for Drawings</paragraph>
+      <table id="tbl_id1650440">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156401" role="tablehead" l10n="U" oldref="42">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146323" role="tablehead" l10n="U" oldref="43">
 <emph>Effect</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149946" xml-lang="en-US" l10n="U" oldref="44">Plus(+) Key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159119" xml-lang="en-US" l10n="U" oldref="45">Zooms in.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150655" xml-lang="en-US" l10n="U" oldref="46">Minus(-) Key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145827" xml-lang="en-US" l10n="U" oldref="47">Zooms out.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149886" xml-lang="en-US" l10n="U" oldref="99">Multiple(×) Key (number pad)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150746" xml-lang="en-US" l10n="U" oldref="102">Zooms to fit entire page in screen.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154841" xml-lang="en-US" l10n="U" oldref="101">Divide (÷) Key (number pad)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153039" xml-lang="en-US" l10n="U" oldref="100">Zooms in on the current selection.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150867" xml-lang="en-US" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+G</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149250" xml-lang="en-US" l10n="U" oldref="53">Groups selected objects.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149955" xml-lang="en-US" l10n="U" oldref="54">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148582" xml-lang="en-US" l10n="U" oldref="55">Ungroups selected group.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146852" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+K</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="57">Combines selected objects.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153567" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+K</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147366" xml-lang="en-US" l10n="CHG" oldref="59">Uncombines selected objects.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153730" xml-lang="en-US" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ +</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155928" xml-lang="en-US" l10n="U" oldref="61">Bring to front.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145245" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ +</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148393" xml-lang="en-US" l10n="U" oldref="63">Bring forward.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150928" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ -</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156062" xml-lang="en-US" l10n="U" oldref="65">Send backward.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145298" xml-lang="en-US" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ -</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="67">Send to back.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149946" role="tablecontent" l10n="U" oldref="44">Plus(+) Key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159119" role="tablecontent" l10n="U" oldref="45">Zooms in.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150655" role="tablecontent" l10n="U" oldref="46">Minus(-) Key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145827" role="tablecontent" l10n="U" oldref="47">Zooms out.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149886" role="tablecontent" l10n="U" oldref="99">Multiple(×) Key (number pad)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150746" role="tablecontent" l10n="U" oldref="102">Zooms to fit entire page in screen.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154841" role="tablecontent" l10n="U" oldref="101">Divide (÷) Key (number pad)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153039" role="tablecontent" l10n="U" oldref="100">Zooms in on the current selection.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150867" role="tablecontent" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+G</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149250" role="tablecontent" l10n="U" oldref="53">Groups selected objects.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149955" role="tablecontent" l10n="U" oldref="54">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148582" role="tablecontent" l10n="U" oldref="55">Ungroups selected group.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146852" role="tablecontent" l10n="U" oldref="56"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+K</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153110" role="tablecontent" l10n="U" oldref="57">Combines selected objects.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153567" role="tablecontent" l10n="U" oldref="58"><switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+K</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147366" role="tablecontent" l10n="CHG" oldref="59">Uncombines selected objects.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153730" role="tablecontent" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ +</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155928" role="tablecontent" l10n="U" oldref="61">Bring to front.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145245" role="tablecontent" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ +</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148393" role="tablecontent" l10n="U" oldref="63">Bring forward.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150928" role="tablecontent" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ -</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156062" role="tablecontent" l10n="U" oldref="65">Send backward.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145298" role="tablecontent" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ -</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149028" role="tablecontent" l10n="U" oldref="67">Send to back.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3147533" xml-lang="en-US" level="2" l10n="U" oldref="68">Shortcut Keys Specific to Drawings</paragraph>
-<table id="tbl_id4134342">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3154865" xml-lang="en-US" l10n="U" oldref="69">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155370" xml-lang="en-US" l10n="U" oldref="70">
+      <paragraph xml-lang="en-US" id="hd_id3147533" role="heading" level="2" l10n="U"
+                 oldref="68">Shortcut Keys Specific to Drawings</paragraph>
+      <table id="tbl_id4134342">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154865" role="tablehead" l10n="U" oldref="69">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155370" role="tablehead" l10n="U" oldref="70">
 <emph>Effect</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AD7" xml-lang="en-US" l10n="NEW">Page Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10ADC" xml-lang="en-US" l10n="NEW">Switch to previous page</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AE2" xml-lang="en-US" l10n="NEW">Page Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">Switch to next page</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AED" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AF2" xml-lang="en-US" l10n="NEW">Switch to next layer</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AF8" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10AFD" xml-lang="en-US" l10n="NEW">Switch to previous layer</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153927" xml-lang="en-US" l10n="U" oldref="71">Arrow Key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155986" xml-lang="en-US" l10n="U" oldref="72">Moves the selected object in the direction of the arrow key.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156259" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147171" xml-lang="en-US" l10n="U" oldref="74">Moves the page view in the direction of the arrow key.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152484" xml-lang="en-US" l10n="U" oldref="79"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in Tools - Options - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149450" xml-lang="en-US" l10n="U" oldref="80">Creates a copy of the dragged object when mouse button is released.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154643" xml-lang="en-US" l10n="CHG" oldref="104"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter with keyboard focus (F6) on a drawing object icon on Tools bar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="105">Inserts a drawing object of default size into the center of the current view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151189" xml-lang="en-US" l10n="U" oldref="106">Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151266" xml-lang="en-US" l10n="U" oldref="107">Opens the context menu for the selected object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156100" xml-lang="en-US" l10n="U" oldref="108">F2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156323" xml-lang="en-US" l10n="U" oldref="109">Enters text mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="110">Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150258" xml-lang="en-US" l10n="U" oldref="111">Enters text mode if a text object is selected.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155851" xml-lang="en-US" l10n="U" oldref="112"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="113">Enters text mode if a text object is selected. If there are no text objects or if you have cycled through all of the text objects on the page, a new page is inserted.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149977" xml-lang="en-US" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="82">Press the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key and drag with the mouse to draw or resize an object from the center of the object outward.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3143232" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> + click on an object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156007" xml-lang="en-US" l10n="U" oldref="84">Selects the object behind the currently selected object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147252" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click an object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145666" xml-lang="en-US" l10n="U" oldref="86">Selects the object in front of the currently selected object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155325" xml-lang="en-US" l10n="U" oldref="87">Shift key while selecting an object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159343" xml-lang="en-US" l10n="U" oldref="88">Adds or removes object to or from the selection.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3083282" xml-lang="en-US" l10n="CHG" oldref="75">Shift+ drag while moving an object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="76">The movement of the selected object is constrained by multiples of 45 degrees.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154933" xml-lang="en-US" l10n="U" oldref="89">Shift+drag while creating or resizing an object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148831" xml-lang="en-US" l10n="CHG" oldref="90">Constrains the size to keep the object's aspect ratio.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154205" xml-lang="en-US" l10n="U" oldref="91">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148804" xml-lang="en-US" l10n="U" oldref="92">Cycles through the objects on the page in the order in which they were created.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145410" xml-lang="en-US" l10n="U" oldref="93">Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149764" xml-lang="en-US" l10n="U" oldref="94">Cycles through the objects on the page in the reverse-order in which they were created.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3158399" xml-lang="en-US" l10n="U" oldref="97">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3109840" xml-lang="en-US" l10n="U" oldref="98">Exits current mode.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-<section id="Esc">
-<paragraph role="heading" id="hd_id3154262" xml-lang="en-US" level="2" l10n="U" oldref="114">Shortcut Keys for 3D Effects (Illumination tab)</paragraph>
-<table id="tbl_id7673268">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10E11" xml-lang="en-US" l10n="NEW">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10E17" xml-lang="en-US" l10n="NEW">
-<emph>Effect</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153578" xml-lang="en-US" l10n="U" oldref="115">Page Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147513" xml-lang="en-US" l10n="U" oldref="116">Changes the light source in the preview window.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148482" xml-lang="en-US" l10n="U" oldref="117">Page Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="118">Changes the light source in the preview window.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148906" xml-lang="en-US" l10n="U" oldref="119">Arrow keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154272" xml-lang="en-US" l10n="U" oldref="120">Moves the current light source in the direction of the arrow.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148923" xml-lang="en-US" l10n="U" oldref="121">Spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3166451" xml-lang="en-US" l10n="U" oldref="122">Enables the current light source and turns it on or off.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-<embed href="text/simpress/04/01020000.xhp#strgenter"/>
-<section id="relatedtopics">
-<embed href="text/sdraw/guide/keyboard.xhp#keyboard"/>
-<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
-</section>
-</body>
-</helpdocument>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AD7" role="tablecontent" l10n="NEW">Page Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10ADC" role="tablecontent" l10n="NEW">Switch to previous page</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AE2" role="tablecontent" l10n="NEW">Page Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AE7" role="tablecontent" l10n="NEW">Switch to next page</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AED" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Switch to previous layer</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AF8" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AF2" role="tablecontent" l10n="NEW">Switch to next layer</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153927" role="tablecontent" l10n="U" oldref="71">Arrow Key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155986" role="tablecontent" l10n="U" oldref="72">Moves the selected object in the direction of the arrow key.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156259" role="tablecontent" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147171" role="tablecontent" l10n="U" oldref="74">Moves the page view in the direction of the arrow key.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152484" role="tablecontent" l10n="U" oldref="79"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149450" role="tablecontent" l10n="U" oldref="80">Creates a copy of the dragged object when mouse button is released.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154643" role="tablecontent" l10n="CHG" oldref="104"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter with keyboard focus (F6) on a drawing object icon on Tools bar</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150756" role="tablecontent" l10n="U" oldref="105">Inserts a drawing object of default size into the center of the current view.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151189" role="tablecontent" l10n="U" oldref="106">Shift+F10</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151266" role="tablecontent" l10n="U" oldref="107">Opens the context menu for the selected object.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156100" role="tablecontent" l10n="U" oldref="108">F2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156323" role="tablecontent" l10n="U" oldref="109">Enters text mode.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147563" role="tablecontent" l10n="U" oldref="110">Enter</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150258" role="tablecontent" l10n="U" oldref="111">Enters text mode if a text object is selected.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155851" role="tablecontent" l10n="U" oldref="112"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154046" role="tablecontent" l10n="U" oldref="113">Enters text mode if a text object is selected. If there are no text objects or if you have cycled through all of the text objects on the page, a new page is inserted.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149977" role="tablecontent" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152812" role="tablecontent" l10n="U" oldref="82">Press the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key and drag with the mouse to draw or resize an object from the center of the object outward.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3143232" role="tablecontent" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> + click on an object</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156007" role="tablecontent" l10n="U" oldref="84">Selects the object behind the currently selected object.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147252" role="tablecontent" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click an object</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145666" role="tablecontent" l10n="U" oldref="86">Selects the object in front of the currently selected object.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155325" role="tablecontent" l10n="U" oldref="87">Shift key while selecting an object</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159343" role="tablecontent" l10n="U" oldref="88">Adds or removes object to or from the selection.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3083282" role="tablecontent" l10n="CHG" oldref="75">Shift+ drag while moving an object</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145620" role="tablecontent" l10n="U" oldref="76">The movement of the selected object is constrained by multiples of 45 degrees.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154933" role="tablecontent" l10n="U" oldref="89">Shift+drag while creating or resizing an object</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148831" role="tablecontent" l10n="CHG" oldref="90">Constrains the size to keep the object's aspect ratio.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154205" role="tablecontent" l10n="U" oldref="91">Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148804" role="tablecontent" l10n="U" oldref="92">Cycles through the objects on the page in the order in which they were created.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145410" role="tablecontent" l10n="U" oldref="93">Shift+Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149764" role="tablecontent" l10n="U" oldref="94">Cycles through the objects on the page in the reverse-order in which they were created.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3158399" role="tablecontent" l10n="U" oldref="97">Esc</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3109840" role="tablecontent" l10n="U" oldref="98">Exits current mode.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/simpress/04/01020000.xhp#strgenter"/>
+      <section id="relatedtopics">
+         <embed href="text/sdraw/guide/keyboard.xhp#keyboard"/>
+         <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sdraw/04/makefile.mk b/helpcontent2/source/text/sdraw/04/makefile.mk
index b8af3f6a4f..45e92b9664 100644
--- a/helpcontent2/source/text/sdraw/04/makefile.mk
+++ b/helpcontent2/source/text/sdraw/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sdraw/guide/align_arrange.xhp b/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
index 2823e4fb3f..94e593aa39 100755
--- a/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
+++ b/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: align_arrange.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/color_define.xhp b/helpcontent2/source/text/sdraw/guide/color_define.xhp
index 68e65ae7ba..88d9a09361 100644
--- a/helpcontent2/source/text/sdraw/guide/color_define.xhp
+++ b/helpcontent2/source/text/sdraw/guide/color_define.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: color_define.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,60 +29,56 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsdrawguidecolor_definexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Custom Colors</title>
-<filename>/text/sdraw/guide/color_define.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T15:37:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsdrawguidecolor_definexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Custom Colors</title>
+         <filename>/text/sdraw/guide/color_define.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149263"><bookmark_value>colors; defining and saving</bookmark_value>
-<bookmark_value>user-defined colors</bookmark_value>
-<bookmark_value>custom colors</bookmark_value>
+      <bookmark_value>user-defined colors</bookmark_value>
+      <bookmark_value>custom colors</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149263" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="color_define"><link href="text/sdraw/guide/color_define.xhp" name="Defining Custom Colors">Defining Custom Colors</link>
+<paragraph xml-lang="en-US" id="hd_id3149263" role="heading" level="1" l10n="U" oldref="7"><variable id="color_define"><link href="text/sdraw/guide/color_define.xhp" name="Defining Custom Colors">Defining Custom Colors</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154511" xml-lang="en-US" l10n="U" oldref="8">If you want, you can mix a custom color and add it to a color table.</paragraph>
-<paragraph role="heading" id="hd_id3155600" xml-lang="en-US" level="2" l10n="U" oldref="9">To define a custom color</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150327" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>Format - Area</emph> and click the <emph>Colors</emph> tab. A table of the predefined colors is displayed.</paragraph>
-<paragraph role="warning" id="par_id3154657" xml-lang="en-US" l10n="U" oldref="13">Changes made to the standard color table are permanent and are saved automatically.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="14">Click a color in the table that is similar to the one you want to mix. The color appears in the upper preview box to the right of the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="15">Select the RGB or CMYK color model in the box below the preview boxes.</paragraph>
-<paragraph role="paragraph" id="par_id4979705" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
-<paragraph role="paragraph" id="par_id3152987" xml-lang="en-US" l10n="U" oldref="16">The RGB color model mixes red, green and blue light to create colors on a computer screen. In the RGB model, the three color components are additive and can have values ranging from 0 (black) to 255 (white). The CMYK color model combines Cyan (C), Magenta (M), Yellow (Y), and blacK (K, also used for "Key") to create colors for printing. The four colors of the CMYK models are subtractive and are defined as percentages. Black corresponds to 100 % and white to 0 %.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="17">Enter a numeric value in the boxes next to the color components. The new color appears in the preview box directly above the color model box.</paragraph>
-<paragraph role="note" id="par_id3152871" xml-lang="en-US" l10n="U" oldref="18">You can also create a color using a color spectrum. Click the <emph>Edit</emph> button to open the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog. Click a color and click OK. Use the Hue, Saturation, and Brightness boxes to adjust your color selection.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153011" xml-lang="en-US" l10n="U" oldref="19">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147244" xml-lang="en-US" l10n="U" oldref="26">If you want to replace the color in the standard color table that your custom color is based on, click <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="20">If you want to add your custom color to the standard color table, enter a name in the <emph>Name</emph> text box and click <emph>Add</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/palette_files.xhp#palette_files"/>
-<embed href="text/sdraw/guide/eyedropper.xhp#eyedropper"/>
-<paragraph role="paragraph" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="23"><link href="text/shared/01/03170000.xhp" name="Color bar">Color bar</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154511" role="paragraph" l10n="U" oldref="8">If you want, you can mix a custom color and add it to a color table.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2" l10n="U" oldref="9">To define a custom color</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150327" role="listitem" l10n="U" oldref="25">Choose <emph>Format - Area</emph> and click the <emph>Colors</emph> tab. A table of the predefined colors is displayed.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154657" role="warning" l10n="U" oldref="13">Changes made to the standard color table are permanent and are saved automatically.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166425" role="paragraph" l10n="U" oldref="14">Click a color in the table that is similar to the one you want to mix. The color appears in the upper preview box to the right of the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152992" role="paragraph" l10n="U" oldref="15">Select the RGB or CMYK color model in the box below the preview boxes.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4979705" role="paragraph" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3152987" role="paragraph" l10n="U" oldref="16">The RGB color model mixes red, green and blue light to create colors on a computer screen. In the RGB model, the three color components are additive and can have values ranging from 0 (black) to 255 (white). The CMYK color model combines Cyan (C), Magenta (M), Yellow (Y), and blacK (K, also used for "Key") to create colors for printing. The four colors of the CMYK models are subtractive and are defined as percentages. Black corresponds to 100 % and white to 0 %.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145386" role="paragraph" l10n="U" oldref="17">Enter a numeric value in the boxes next to the color components. The new color appears in the preview box directly above the color model box.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3152871" role="note" l10n="CHG" oldref="18">You can also create a color using a color spectrum. Click the <emph>Edit</emph> button to open the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog. Click a color. Use the Hue, Saturation, and Brightness boxes to adjust your color selection.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153011" role="paragraph" l10n="U" oldref="19">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147244" role="listitem" l10n="U" oldref="26">If you want to replace the color in the standard color table that your custom color is based on, click <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145116" role="listitem" l10n="U" oldref="20">If you want to add your custom color to the standard color table, enter a name in the <emph>Name</emph> text box and click <emph>Add</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/simpress/guide/palette_files.xhp#palette_files"/>
+         <embed href="text/sdraw/guide/eyedropper.xhp#eyedropper"/>
+         <paragraph xml-lang="en-US" id="par_id3145236" role="paragraph" l10n="U" oldref="23"><link href="text/shared/01/03170000.xhp" name="Color bar">Color bar</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sdraw/guide/combine_etc.xhp b/helpcontent2/source/text/sdraw/guide/combine_etc.xhp
index f300c1e679..10b47dfcd7 100644
--- a/helpcontent2/source/text/sdraw/guide/combine_etc.xhp
+++ b/helpcontent2/source/text/sdraw/guide/combine_etc.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: combine_etc.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/cross_fading.xhp b/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
index fd145b933f..f1f68ac5cd 100644
--- a/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
+++ b/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cross_fading.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
index 2ea0a8f0bc..0180f6ff4c 100644
--- a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
+++ b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: draw_sector.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/duplicate_object.xhp b/helpcontent2/source/text/sdraw/guide/duplicate_object.xhp
index 203cf46ee9..15fc1e016e 100644
--- a/helpcontent2/source/text/sdraw/guide/duplicate_object.xhp
+++ b/helpcontent2/source/text/sdraw/guide/duplicate_object.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: duplicate_object.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
index b5623668c8..89e7d03834 100755
--- a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
+++ b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eyedropper.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/gradient.xhp b/helpcontent2/source/text/sdraw/guide/gradient.xhp
index 61c23e9dbb..2a43ad1eea 100755
--- a/helpcontent2/source/text/sdraw/guide/gradient.xhp
+++ b/helpcontent2/source/text/sdraw/guide/gradient.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gradient.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp b/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
index abcfbb067c..052bc174fe 100755
--- a/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
+++ b/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphic_insert.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/groups.xhp b/helpcontent2/source/text/sdraw/guide/groups.xhp
index 1eec9e1692..4bd352366e 100644
--- a/helpcontent2/source/text/sdraw/guide/groups.xhp
+++ b/helpcontent2/source/text/sdraw/guide/groups.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groups.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/join_objects.xhp b/helpcontent2/source/text/sdraw/guide/join_objects.xhp
index bfe66af4cb..d2587c100c 100755
--- a/helpcontent2/source/text/sdraw/guide/join_objects.xhp
+++ b/helpcontent2/source/text/sdraw/guide/join_objects.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: join_objects.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp b/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
index 2ce9240ecb..c502657f20 100644
--- a/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
+++ b/helpcontent2/source/text/sdraw/guide/join_objects3d.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: join_objects3d.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsdrawguidejoin_objects3dxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Assembling 3D Objects</title>
 <filename>/text/sdraw/guide/join_objects3d.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-09-05T13:27:03">FPE: Deleted screenshot.</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154014"><bookmark_value>3D objects; assembling</bookmark_value>
@@ -51,7 +44,7 @@
 <paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="E" oldref="37" localize="false"/>
 <paragraph role="heading" id="hd_id3156442" xml-lang="en-US" level="1" l10n="U" oldref="29"><variable id="join_objects3d"><link href="text/sdraw/guide/join_objects3d.xhp" name="Assembling 3D Objects">Assembling 3D Objects</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="30">You can combine two or more 3D objects into a single object.</paragraph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="30">3D objects that each form a 3D scene can be combined into a single 3D scene.</paragraph>
 <paragraph role="heading" id="hd_id3150042" xml-lang="en-US" level="3" l10n="U" oldref="41">To combine 3D objects:</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/sdraw/guide/keyboard.xhp b/helpcontent2/source/text/sdraw/guide/keyboard.xhp
index e4c5041831..dc80ba53b3 100644
--- a/helpcontent2/source/text/sdraw/guide/keyboard.xhp
+++ b/helpcontent2/source/text/sdraw/guide/keyboard.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/main.xhp b/helpcontent2/source/text/sdraw/guide/main.xhp
index eea3118353..0de581c741 100755
--- a/helpcontent2/source/text/sdraw/guide/main.xhp
+++ b/helpcontent2/source/text/sdraw/guide/main.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/guide/makefile.mk b/helpcontent2/source/text/sdraw/guide/makefile.mk
index 5ba3e99006..609989572c 100644
--- a/helpcontent2/source/text/sdraw/guide/makefile.mk
+++ b/helpcontent2/source/text/sdraw/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,4 +64,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
index 651669eec8..3ff79f2592 100644
--- a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
+++ b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rotate_object.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="E">
-<image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -69,7 +66,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="E">
-<image id="img_id3154023" src="res/helpimg/rotieren.png" width="5.424cm" height="3.916cm"><alt id="alt_id3154023" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154023" src="res/helpimg/rotieren.png" width="5.424cm" height="3.916cm"><alt id="alt_id3154023" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 </tablerow>
diff --git a/helpcontent2/source/text/sdraw/guide/text_enter.xhp b/helpcontent2/source/text/sdraw/guide/text_enter.xhp
index ea09ca2a39..a11c063357 100644
--- a/helpcontent2/source/text/sdraw/guide/text_enter.xhp
+++ b/helpcontent2/source/text/sdraw/guide/text_enter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_enter.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,133 +29,127 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsdrawguidetext_enterxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Text</title>
-<filename>/text/sdraw/guide/text_enter.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textsdrawguidetext_enterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Text</title>
+         <filename>/text/sdraw/guide/text_enter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153144"><bookmark_value>text frames</bookmark_value>
-<bookmark_value>inserting;text frames</bookmark_value>
-<bookmark_value>copying;text from other documents</bookmark_value>
-<bookmark_value>pasting;text from other documents</bookmark_value>
-<bookmark_value>legends; drawings</bookmark_value>
-</bookmark>
-  <comment>mw changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3153144" role="heading" level="1" l10n="U" oldref="45"><variable id="text_enter"><link href="text/sdraw/guide/text_enter.xhp" name="Adding Text">Adding Text</link> 
+      <bookmark_value>inserting;text frames</bookmark_value>
+      <bookmark_value>copying;text from other documents</bookmark_value>
+      <bookmark_value>pasting;text from other documents</bookmark_value>
+      <bookmark_value>legends; drawings</bookmark_value>
+</bookmark><comment>mw changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153144" role="heading" level="1" l10n="U"
+                 oldref="45"><variable id="text_enter"><link href="text/sdraw/guide/text_enter.xhp" name="Adding Text">Adding Text</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145750" role="paragraph" l10n="CHG" oldref="46">There are several types of text you can add to a drawing or presentation: </paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10824" role="paragraph" l10n="NEW">Text in a text frame</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10828" role="paragraph" l10n="NEW">Text that changes character size to fill the frame size</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1082C" role="paragraph" l10n="NEW">Text that is added to any drawing object by double-clicking the object</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10830" role="paragraph" l10n="NEW">Text that is copied from a Writer document</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10834" role="paragraph" l10n="NEW">Text that is inserted from a text or HTML document</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3150202" role="heading" level="2" l10n="U" oldref="48">Adding a Text Frame</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155266" role="paragraph" l10n="U" oldref="49">Click the <emph>Text</emph> icon 
-<image id="img_id3156450" src="res/commandimagelist/sc_text.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3156450">Icon</alt>
-	</image> and move the mouse pointer to where you want to enter the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149052" role="paragraph" l10n="U" oldref="50">Drag a text frame to the size you want in your document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3151194" role="paragraph" l10n="CHG" oldref="51">Type or paste your text in the text frame.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph" l10n="CHG" oldref="53">Double-click the text to edit it or to format text properties, such as font size or font color. Click the border of the text object to edit the object properties, such as border color or arranging in front or behind other objects.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3150437" role="heading" level="2" l10n="U" oldref="54">Fitting Text to Frames</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3146877" role="paragraph" l10n="CHG" oldref="56">Create a text frame as described in the steps above. The size of the frame determines the size of the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN108A3" role="paragraph" l10n="NEW">With the text object selected, choose <emph>Format - Text</emph>. The <emph>Text</emph> dialog opens.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN108AF" role="paragraph" l10n="NEW">On the <emph>Text</emph> tab page, clear the <emph>Fit height to text</emph> checkbox, then select the <emph>Fit to frame</emph> checkbox. Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3149250" role="note" l10n="U" oldref="57">Resizing the frame also resizes the text.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3155955" role="heading" level="2" l10n="CHG" oldref="58">Text Tied to a Graphic</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10917" role="paragraph" l10n="NEW">You can add text to any graphic after double-clicking the graphic.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id1827448" role="paragraph" l10n="NEW">To determine the position of the text, use the settings in <emph>Format - Text</emph>.<comment>this is the Draw command. In Writer it is Format - Object - Text attributes.</comment></paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147366" role="paragraph" l10n="CHG" oldref="59">For example, click the arrow next to the <emph>Callouts</emph> icon 
-<image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3154508">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3145750" role="paragraph" l10n="CHG" oldref="46">There are several types of text you can add to a drawing or presentation: </paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10824" role="paragraph" l10n="NEW">Text in a text box</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10828" role="paragraph" l10n="NEW">Text that changes character size to fill the frame size</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1082C" role="paragraph" l10n="NEW">Text that is added to any drawing object by double-clicking the object</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10830" role="paragraph" l10n="NEW">Text that is copied from a Writer document</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10834" role="paragraph" l10n="NEW">Text that is inserted from a text document or HTML document</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150202" role="heading" level="2" l10n="U"
+                 oldref="48">Adding a Text Box</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155266" role="paragraph" l10n="U" oldref="49">Click the <emph>Text</emph> icon 
+<image id="img_id3156450" src="res/commandimagelist/sc_text.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156450">Icon</alt>
+	</image> and move the mouse pointer to where you want to enter the text box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149052" role="paragraph" l10n="U" oldref="50">Drag a text box to the size you want in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151194" role="paragraph" l10n="CHG" oldref="51">Type or paste your text into the text box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph" l10n="CHG" oldref="53">Double-click the text to edit it or to format text properties, such as font size or font color. Click the border of the text box to edit the object properties, such as border color or arranging in front or behind other objects.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150437" role="heading" level="2" l10n="U"
+                 oldref="54">Fitting Text to Frames</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146877" role="paragraph" l10n="CHG" oldref="56">Create a text box as described in the steps above.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108A3" role="paragraph" l10n="NEW">With the text object selected, choose <emph>Format - Text</emph>. The <emph>Text</emph> dialog opens.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108AF" role="paragraph" l10n="NEW">On the <emph>Text</emph> tab page, clear the <emph>Fit height to text</emph> checkbox, then select the <emph>Fit to frame</emph> checkbox. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0610200902133994" role="paragraph" l10n="NEW">Now you can resize the text box to change the size and shape of the text characters.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155955" role="heading" level="2" l10n="CHG"
+                 oldref="58">Text Tied to a Graphic</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10917" role="paragraph" l10n="NEW">You can add text to any graphic after double-clicking the graphic.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1827448" role="paragraph" l10n="NEW">To determine the position of the text, use the settings in <emph>Format - Text</emph>.<comment>this is the Draw command. In Writer it is Format - Object - Text attributes.</comment></paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147366" role="paragraph" l10n="CHG" oldref="59">For example, click the arrow next to the <emph>Callouts</emph> icon 
+<image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154508">Icon</alt>
 	</image> to open the Callouts toolbar.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN108FD" role="paragraph" l10n="NEW">Select a callout and move the mouse pointer to where you want the callout to start.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150272" role="paragraph" l10n="CHG" oldref="60">Drag to draw the callout.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW">Enter the text.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN1091A" role="heading" level="2" l10n="NEW">Copying Text</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10921" role="paragraph" l10n="NEW">Select the text in your Writer document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10925" role="paragraph" l10n="NEW">Copy the text to the clipboard (<emph>Edit - Copy</emph>).</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1092D" role="paragraph" l10n="NEW">Click the page or slide where you want to paste the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10931" role="paragraph" l10n="NEW">Paste the text using <emph>Edit - Paste</emph> or <emph>Edit - Paste special</emph>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN1093C" role="paragraph" l10n="NEW">Using <emph>Paste special</emph>, you can choose the text format to be pasted. Depending on formats, you can copy different text attributes.<comment>UFI: added an emph tag, see #60923</comment></paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN1093F" role="heading" level="2" l10n="NEW">Importing Text</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10946" role="paragraph" l10n="NEW">Click the page or slide where you want to import the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1094A" role="paragraph" l10n="NEW">Choose <emph>Insert - File</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10952" role="paragraph" l10n="NEW">Select a text file (*.txt) or an HTML file and click <emph>Insert</emph>. The <emph>Insert Text</emph> dialog opens. Click <emph>OK</emph> to insert the text.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108FD" role="paragraph" l10n="NEW">Select a callout and move the mouse pointer to where you want the callout to start.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150272" role="paragraph" l10n="CHG" oldref="60">Drag to draw the callout.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW">Enter the text.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1091A" role="heading" level="2" l10n="NEW">Copying Text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10921" role="paragraph" l10n="NEW">Select the text in your Writer document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10925" role="paragraph" l10n="NEW">Copy the text to the clipboard (<emph>Edit - Copy</emph>).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1092D" role="paragraph" l10n="NEW">Click the page or slide where you want to paste the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10931" role="paragraph" l10n="NEW">Paste the text using <emph>Edit - Paste</emph> or <emph>Edit - Paste special</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1093C" role="paragraph" l10n="NEW">Using <emph>Paste special</emph>, you can choose the text format to be pasted. Depending on formats, you can copy different text attributes.<comment>UFI: added an emph tag, see #60923</comment></paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1093F" role="heading" level="2" l10n="NEW">Importing Text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10946" role="paragraph" l10n="NEW">Click the page or slide where you want to import the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1094A" role="paragraph" l10n="NEW">Choose <emph>Insert - File</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10952" role="paragraph" l10n="NEW">Select a text file (*.txt) or an HTML file and click <emph>Insert</emph>. The <emph>Insert Text</emph> dialog opens. Click <emph>OK</emph> to insert the text.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
 <switch select="appl">
-   
-<case select="WRITER">
-   <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
-   
+<case select="WRITER"><embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
 </case>
-   
 </switch>
-   
-  </section>
- </body>
-</helpdocument>
+</section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sdraw/main0000.xhp b/helpcontent2/source/text/sdraw/main0000.xhp
index 67352f8c34..198bfaf0df 100755
--- a/helpcontent2/source/text/sdraw/main0000.xhp
+++ b/helpcontent2/source/text/sdraw/main0000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0100.xhp b/helpcontent2/source/text/sdraw/main0100.xhp
index e397148e85..68d5b3ebd3 100755
--- a/helpcontent2/source/text/sdraw/main0100.xhp
+++ b/helpcontent2/source/text/sdraw/main0100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0101.xhp b/helpcontent2/source/text/sdraw/main0101.xhp
index 22f21d0052..f7653cc629 100755
--- a/helpcontent2/source/text/sdraw/main0101.xhp
+++ b/helpcontent2/source/text/sdraw/main0101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0102.xhp b/helpcontent2/source/text/sdraw/main0102.xhp
index d259cf9f0b..6f023f5c9f 100755
--- a/helpcontent2/source/text/sdraw/main0102.xhp
+++ b/helpcontent2/source/text/sdraw/main0102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0103.xhp b/helpcontent2/source/text/sdraw/main0103.xhp
index cd13e52496..89abf0ebc9 100755
--- a/helpcontent2/source/text/sdraw/main0103.xhp
+++ b/helpcontent2/source/text/sdraw/main0103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0103.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0104.xhp b/helpcontent2/source/text/sdraw/main0104.xhp
index 9dc2a7340c..0549ebd689 100755
--- a/helpcontent2/source/text/sdraw/main0104.xhp
+++ b/helpcontent2/source/text/sdraw/main0104.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0104.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,42 +29,47 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsdrawmain0104xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert</title>
-<filename>/text/sdraw/main0104.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einfuegen">
-<paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sdraw/main0104.xhp" name="Insert">Insert</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="2">This menu allows you to insert elements, such as graphics and guides, into Draw documents.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/sdraw/01/04010000.xhp" name="Slide">Slide</link></paragraph>
-<embed href="text/sdraw/01/04010000.xhp#seitetext"/>
-<embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
-<paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/simpress/01/04020000.xhp" name="Layer">Layer</link></paragraph>
-<embed href="text/simpress/01/04020000.xhp#ebenetext"/>
-<paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
-<embed href="text/simpress/01/04030000.xhp#fangtext"/>
-<embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
-<paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
-<embed href="text/shared/01/04100000.xhp#sonder"/>
-<embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
-<paragraph role="heading" id="hd_id3150749" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-<embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
-<paragraph role="heading" id="hd_id3156385" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
-<embed href="text/simpress/01/04080100.xhp#tabelletext"/>
-<embed href="text/shared/01/04990000.xhp#grafik"/>
-<embed href="text/shared/01/moviesound.xhp#moviesound"/>
-<embed href="text/shared/01/04150000.xhp#objekt"/>
-<paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
-<paragraph role="heading" id="hd_id3155111" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
-<embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
-<paragraph role="heading" id="hd_id3157867" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-<embed href="text/simpress/01/04110000.xhp#dateitext"/>
-</body>
-</helpdocument>
+      <topic id="textsdrawmain0104xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Insert</title>
+         <filename>/text/sdraw/main0104.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einfuegen">
+         <paragraph xml-lang="en-US" id="hd_id3148797" role="heading" level="1" l10n="U" oldref="1"><link href="text/sdraw/main0104.xhp" name="Insert">Insert</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="U" oldref="2">This menu allows you to insert elements, such as graphics and guides, into Draw documents.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154320" role="heading" level="2" l10n="U" oldref="3"><link href="text/sdraw/01/04010000.xhp" name="Slide">Slide</link></paragraph>
+      <embed href="text/sdraw/01/04010000.xhp#seitetext"/>
+      <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
+      <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2" l10n="U" oldref="4"><link href="text/simpress/01/04020000.xhp" name="Layer">Layer</link></paragraph>
+      <embed href="text/simpress/01/04020000.xhp#ebenetext"/>
+      <paragraph xml-lang="en-US" id="hd_id3147397" role="heading" level="2" l10n="U" oldref="5"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
+      <embed href="text/simpress/01/04030000.xhp#fangtext"/>
+      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+      <paragraph xml-lang="en-US" id="hd_id0915200910361385" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3154018" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
+      <embed href="text/shared/01/04100000.xhp#sonder"/>
+      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
+      <paragraph xml-lang="en-US" id="hd_id3150749" role="heading" level="2" l10n="U"
+                 oldref="11"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
+      <paragraph xml-lang="en-US" id="hd_id3156385" role="heading" level="2" l10n="CHG"
+                 oldref="7"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
+      <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
+      <embed href="text/shared/01/04990000.xhp#grafik"/>
+      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
+      <embed href="text/shared/01/04150000.xhp#objekt"/>
+      <paragraph xml-lang="en-US" id="hd_id3147003" role="heading" level="2" l10n="U" oldref="8"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200904020595" role="paragraph" l10n="NEW">Inserts a chart.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155111" role="heading" level="2" l10n="U" oldref="9"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+      <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3157867" role="heading" level="2" l10n="U"
+                 oldref="10"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
+      <embed href="text/simpress/01/04110000.xhp#dateitext"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/sdraw/main0105.xhp b/helpcontent2/source/text/sdraw/main0105.xhp
index dabc876fe3..d52b0b318b 100755
--- a/helpcontent2/source/text/sdraw/main0105.xhp
+++ b/helpcontent2/source/text/sdraw/main0105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0105.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0106.xhp b/helpcontent2/source/text/sdraw/main0106.xhp
index 9f2957e146..460400d868 100755
--- a/helpcontent2/source/text/sdraw/main0106.xhp
+++ b/helpcontent2/source/text/sdraw/main0106.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0200.xhp b/helpcontent2/source/text/sdraw/main0200.xhp
index de98f71410..6eeb7c129c 100755
--- a/helpcontent2/source/text/sdraw/main0200.xhp
+++ b/helpcontent2/source/text/sdraw/main0200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0202.xhp b/helpcontent2/source/text/sdraw/main0202.xhp
index 43498e6e2e..e410a85f33 100755
--- a/helpcontent2/source/text/sdraw/main0202.xhp
+++ b/helpcontent2/source/text/sdraw/main0202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0202.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0210.xhp b/helpcontent2/source/text/sdraw/main0210.xhp
index e4176b3116..d33a2c0350 100755
--- a/helpcontent2/source/text/sdraw/main0210.xhp
+++ b/helpcontent2/source/text/sdraw/main0210.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0210.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsdrawmain0210xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Drawing Bar</title>
 <filename>/text/sdraw/main0210.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-08T12:46:35">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="werkzeugleiste">
@@ -61,6 +54,8 @@
 <embed href="text/simpress/02/10080000.xhp#kurve"/>
 <embed href="text/simpress/00/00000004.xhp#sykurve"/>
 <embed href="text/simpress/02/10100000.xhp#verbinder"/>
+<paragraph role="heading" id="par_idN107C8" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/02/10120000.xhp" name="Lines and Arrows">Lines and Arrows</link></paragraph>
+<paragraph role="paragraph" id="par_idN126D7" xml-lang="en-US" l10n="NEW">Opens the Arrows toolbar to insert lines and arrows.</paragraph>
 <embed href="text/simpress/02/10090000.xhp#objekte"/>
 <embed href="text/simpress/02/10090000.xhp#syobjekte"/>
 <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/sdraw/main0213.xhp b/helpcontent2/source/text/sdraw/main0213.xhp
index 8ec4ac40aa..9ef637617c 100755
--- a/helpcontent2/source/text/sdraw/main0213.xhp
+++ b/helpcontent2/source/text/sdraw/main0213.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0213.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/main0503.xhp b/helpcontent2/source/text/sdraw/main0503.xhp
index 7d660bc47e..a152dabb5d 100755
--- a/helpcontent2/source/text/sdraw/main0503.xhp
+++ b/helpcontent2/source/text/sdraw/main0503.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/sdraw/makefile.mk b/helpcontent2/source/text/sdraw/makefile.mk
index ec32369954..79ffbf4da6 100644
--- a/helpcontent2/source/text/sdraw/makefile.mk
+++ b/helpcontent2/source/text/sdraw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,4 +61,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index f0840beb2e..6040de189f 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.17.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,14 +32,14 @@
  
 	
 <meta>
-<topic id="textshared0000000001xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Frequently-Used Buttons</title>
-<filename>/text/shared/00/00000001.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">Frequently-Used Buttons</paragraph>
-<section id="abbrechen">
+      <topic id="textshared0000000001xml" indexer="exclude">
+         <title xml-lang="en-US" id="tit">Frequently-Used Buttons</title>
+         <filename>/text/shared/00/00000001.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3152952" role="heading" level="1" l10n="U" oldref="1">Frequently-Used Buttons</paragraph>
+      <section id="abbrechen">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDCANCEL" id="bm_id4245124" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CANCEL" id="bm_id7074800" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/>
@@ -52,156 +49,169 @@
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/>
-<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="4">Cancel</paragraph>
-<paragraph role="paragraph" id="par_id3155913" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
-</section>
-<section id="finish">
+<paragraph xml-lang="en-US" id="hd_id3147617" role="heading" level="2" l10n="U" oldref="4">Cancel</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155913" role="paragraph" l10n="U" oldref="5"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
+      </section>
+      <section id="finish">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/>
-<paragraph role="heading" id="hd_id2341685" xml-lang="en-US" level="2" l10n="NEW">Finish</paragraph>
-<paragraph role="paragraph" id="par_id6909390" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
-</section>
-<section id="abreissleiste">
-<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="2" l10n="CHG" oldref="39">Toolbars</paragraph>
-<paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="40">By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing <emph>View - Toolbars - (toolbar name)</emph>.</paragraph>
-</section>
-<section id="drehfeld">
-<paragraph role="heading" id="hd_id3152414" xml-lang="en-US" level="2" l10n="CHG" oldref="79">Spin button</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1094088" xml-lang="en-US" l10n="NEW">In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7493209" xml-lang="en-US" l10n="NEW">In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155599" xml-lang="en-US" l10n="CHG" oldref="78">You can type a numerical value into the field next to the spin button, or select the value with the up-arrow or down-arrow symbols on the spin button. On the keyboard you can press the up arrow and down arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value.</paragraph>
-<paragraph role="paragraph" id="par_id3150264" xml-lang="en-US" l10n="CHG" oldref="38">If the field next to the spin button defines numerical values, you can also define a <link href="text/shared/00/00000003.xhp#metrik" name="measurement unit">measurement unit</link>, for example, 1 cm or 5 mm, 12 pt or 2".</paragraph>
-</section>
-<section id="import">
-<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="76">Convert</paragraph>
-<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid=".">If you click forward through the dialog, this button is called <emph>Next</emph>. On the last page the button has the name <emph>Convert</emph>. The conversion is then performed by clicking the button.</ahelp></paragraph>
-</section>
-<section id="kontextmenue">
-<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="2" l10n="U" oldref="42">Context Menu</paragraph>
-<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="44"><variable id="context">To activate the context menu of an object, first click the object with the <switchinline select="sys"><caseinline select="MAC">
-</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again</caseinline><defaultinline> click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].</variable></paragraph>
-</section>
-<section id="loeschen">
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE" id="bm_id3153839" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_REMOVE" id="bm_id3150089" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2341685" role="heading" level="2" l10n="NEW">Finish</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6909390" role="paragraph" l10n="NEW"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
+      </section>
+      <section id="abreissleiste">
+         <paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="2" l10n="CHG"
+                    oldref="39">Toolbars</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149783" role="paragraph" l10n="CHG" oldref="40">By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing <emph>View - Toolbars - (toolbar name)</emph>.</paragraph>
+      </section>
+      <section id="drehfeld">
+         <paragraph xml-lang="en-US" id="hd_id3152414" role="heading" level="2" l10n="CHG"
+                    oldref="79">Spin button</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id1094088" role="paragraph" l10n="NEW">In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id7493209" role="paragraph" l10n="NEW">In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols.</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id3155599" role="paragraph" l10n="CHG" oldref="78">You can type a numerical value into the field next to the spin button, or select the value with the up-arrow or down-arrow symbols on the spin button. On the keyboard you can press the up arrow and down arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150264" role="paragraph" l10n="CHG" oldref="38">If the field next to the spin button defines numerical values, you can also define a <link href="text/shared/00/00000003.xhp#metrik" name="measurement unit">measurement unit</link>, for example, 1 cm or 5 mm, 12 pt or 2".</paragraph>
+      </section>
+      <section id="import">
+         <paragraph xml-lang="en-US" id="hd_id3154232" role="heading" level="2" l10n="U"
+                    oldref="76">Convert</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="U" oldref="77"><ahelp hid=".">If you click forward through the dialog, this button is called <emph>Next</emph>. On the last page the button has the name <emph>Convert</emph>. The conversion is then performed by clicking the button.</ahelp></paragraph>
+      </section>
+      <section id="kontextmenue">
+         <paragraph xml-lang="en-US" id="hd_id3145129" role="heading" level="2" l10n="U"
+                    oldref="42">Context Menu</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" l10n="U" oldref="44"><variable id="context">To activate the context menu of an object, first click the object with the <switchinline select="sys"><caseinline select="MAC">
+</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again
+</caseinline><defaultinline> click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].
+</variable></paragraph>
+      </section>
+      <section id="loeschen">
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE" id="bm_id3153839" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_NAMES:BTN_REMOVE" id="bm_id3150089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE" id="bm_id3143232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE" id="bm_id3214514" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_DELETE" id="bm_id3145749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_DELETE" id="bm_id3150443" localize="false"/>
-<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="24">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid=".">Deletes the selected element or elements after confirmation.</ahelp></paragraph>
-</section>
-<section id="loeschen1">
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_REMOVE" id="bm_id3147296" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_BIB_BASE_PB_DELETE" id="bm_id6168401" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id3154821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id3154810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id3153257" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELABBREV" id="bm_id5413373" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/>
-<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="2" l10n="U" oldref="45">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
-</section>
-<section id="metrik">
-<paragraph role="heading" id="hd_id3148620" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Metrics</paragraph>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="7">You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value.</paragraph>
-</section>
-<section id="schliessen">
-<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="8">Close</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Closes the dialog and saves all changes.</ahelp></paragraph>
-</section>
-<section id="schliessen2">
-<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="57">Close</paragraph>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid=".">Closes the dialog.</ahelp></paragraph>
-</section>
-<section id="uebernehmen">
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_2" id="bm_id3149053" localize="false"/>
-<paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="2" l10n="U" oldref="16">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Applies the modified or selected values without closing the dialog.</ahelp></paragraph>
-</section>
-<section id="eingabesymbol">
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA" id="bm_id3155067" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_FORMULARANGE" id="bm_id3149785" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_ROWCELL" id="bm_id3149019" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_COLCELL" id="bm_id3153712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_FORMULACELL" id="bm_id3153364" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_VARCELL" id="bm_id3153363" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_PRINTAREA" id="bm_id3152596" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATROW" id="bm_id3146975" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATCOL" id="bm_id3154321" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_NAMES:RB_ASSIGN" id="bm_id3159155" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" id="bm_id3153190" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF" id="bm_id3154488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF1" id="bm_id3146981" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF2" id="bm_id3146111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF3" id="bm_id3146114" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF4" id="bm_id3156290" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FILTER:RB_COPY_AREA" id="bm_id3150010" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" id="bm_id3146985" localize="false"/>
-<paragraph role="heading" id="hd_id3153760" xml-lang="en-US" level="2" l10n="U" oldref="47">Shrink / Maximize</paragraph>
-<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid=".">Click the<emph> Shrink </emph>icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the <emph>Maximize</emph> icon. Click it to restore the dialog to its original size.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3155062" xml-lang="en-US" l10n="U" oldref="49">The dialog is automatically minimized when you click into a sheet with the mouse. As soon as you release the mouse button, the dialog is restored and the reference range defined with the mouse is highlighted in the document by a blue frame.</paragraph>
-<table id="tbl_id3148473">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="E">
-<image id="img_id3148685" src="sc/res/refinp1.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148685" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE" id="bm_id3143232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE" id="bm_id3214514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE" id="bm_id3145749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE" id="bm_id3150443" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149180" role="heading" level="2" l10n="U"
+                    oldref="24">Delete</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="25"><ahelp hid=".">Deletes the selected element or elements after confirmation.</ahelp></paragraph>
+      </section>
+      <section id="loeschen1">
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE" id="bm_id3147296" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_DELETE" id="bm_id6168401" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id5413373" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147557" role="heading" level="2" l10n="U"
+                    oldref="45">Delete</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155338" role="paragraph" l10n="U" oldref="46"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
+      </section>
+      <section id="metrik">
+         <paragraph xml-lang="en-US" id="hd_id3148620" role="heading" level="2" l10n="CHG"
+                    oldref="6">Metrics</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="7">You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value.</paragraph>
+      </section>
+      <section id="schliessen">
+         <paragraph xml-lang="en-US" id="hd_id3155535" role="heading" level="2" l10n="U" oldref="8">Close</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Closes the dialog and saves all changes.</ahelp></paragraph>
+      </section>
+      <section id="schliessen2">
+         <paragraph xml-lang="en-US" id="hd_id3147275" role="heading" level="2" l10n="U"
+                    oldref="57">Close</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153031" role="paragraph" l10n="U" oldref="58"><ahelp hid=".">Closes the dialog.</ahelp></paragraph>
+      </section>
+      <section id="uebernehmen">
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMBOLDIALOG:2" id="bm_id3149053" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156113" role="heading" level="2" l10n="U"
+                    oldref="16">Apply</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155341" role="paragraph" l10n="U" oldref="17"><ahelp hid=".">Applies the modified or selected values without closing the dialog.</ahelp></paragraph>
+      </section>
+      <section id="eingabesymbol">
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA" id="bm_id3155067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL" id="bm_id3149019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL" id="bm_id3153712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SOLVER:RB_FORMULACELL" id="bm_id3153364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL" id="bm_id3153363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_AREAS:RB_PRINTAREA" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATROW" id="bm_id3146975" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL" id="bm_id3154321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN" id="bm_id3159155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" id="bm_id3153190" localize="false"/>
+<!-- removed HID SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF -->
+<!-- removed HID HID_SC_FAP_BTN_REF1 -->
+<!-- removed HID HID_SC_FAP_BTN_REF2 -->
+<!-- removed HID HID_SC_FAP_BTN_REF3 -->
+<!-- removed HID HID_SC_FAP_BTN_REF4 -->
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA" id="bm_id3150010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" id="bm_id3146985" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153760" role="heading" level="2" l10n="U"
+                    oldref="47">Shrink / Maximize</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153087" role="paragraph" l10n="U" oldref="48"><ahelp hid=".">Click the<emph> Shrink </emph>icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the <emph>Maximize</emph> icon. Click it to restore the dialog to its original size.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155062" role="paragraph" l10n="U" oldref="49">The dialog is automatically minimized when you click into a sheet with the mouse. As soon as you release the mouse button, the dialog is restored and the reference range defined with the mouse is highlighted in the document by a blue frame.</paragraph>
+         <table id="tbl_id3148473">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3157808" role="paragraph" l10n="E">
+<image id="img_id3148685" src="formula/res/refinp1.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3148685">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="50">Shrink</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="E">
-<image id="img_id3149784" src="sc/res/refinp2.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149784" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153321" role="paragraph" l10n="U" oldref="50">Shrink</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153349" role="paragraph" l10n="E">
+<image id="img_id3149784" src="formula/res/refinp2.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149784">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="51">Maximize</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="51">Maximize</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="vorschau">
+      </section>
+      <section id="vorschau">
 <bookmark xml-lang="en-US" branch="hid/HID_MEASURE_CTL_PREVIEW" id="bm_id3157970" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PREVIEW" id="bm_id3153896" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="2" l10n="U" oldref="34">Preview Field</paragraph>
-<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Displays a preview of the current selection.</ahelp></paragraph>
-</section>
-<section id="weiterautopi">
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="2" l10n="U"
+                    oldref="34">Preview Field</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154046" role="paragraph" l10n="U" oldref="35"><ahelp hid=".">Displays a preview of the current selection.</ahelp></paragraph>
+      </section>
+      <section id="weiterautopi">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDNEXT" id="bm_id8281197" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_NEXT" id="bm_id4154179" localize="false"/>
@@ -209,36 +219,41 @@
 <bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_NEXT" id="bm_id3149095" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/>
+<!-- removed HID HID_DLGREPORT_0_CMDNEXTORREADY -->
 <bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_NEXT" id="bm_id3155135" localize="false"/>
-<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="70">Next</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
-</section>
-<section id="zurueck">
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id3144422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id4539933" localize="false"/>
-<paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="13">Back<comment>in Tools - Options</comment></paragraph>
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK">Resets modified values back to the $[officename] default values.</ahelp></paragraph>
-</section>
-<section id="zurueck2">
+<paragraph xml-lang="en-US" id="hd_id3145609" role="heading" level="2" l10n="U"
+                    oldref="70">Next</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
+      </section>
+      <section id="zurueck">
+<!-- removed HID OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK" id="bm_id4539933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149670" role="heading" level="2" l10n="U"
+                    oldref="13">Back<comment>in Tools - Options</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145068" role="paragraph" l10n="U" oldref="14"><ahelp hid="OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK">Resets modified values back to the $[officename] default values.</ahelp></paragraph>
+      </section>
+      <section id="zurueck2">
 <bookmark xml-lang="en-US" branch="hid/HID_TABDLG_RESET_BTN" id="bm_id3151054" localize="false"/>
-<paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149651" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_TABDLG_RESET_BTN">Resets changes made to the current tab to those applicable when this dialog was opened. A confirmation query does not appear when you close the dialog.</ahelp></paragraph>
-</section>
-<section id="zuruecksetzen">
-<paragraph role="heading" id="hd_id3143278" xml-lang="en-US" level="2" l10n="U" oldref="18">Reset<comment>whats this?</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_TABDLG_RESET_BTN">Resets modified values back to the default values.</ahelp></paragraph>
-<paragraph role="warning" id="par_id3154331" xml-lang="en-US" l10n="U" oldref="20">A confirmation query does not appear. If you confirm the dialog with OK all settings in this dialog are reset.</paragraph>
-</section>
-<section id="standard">
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_STD_FONT_PB_STANDARD" id="bm_id481887" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148755" role="heading" level="2" l10n="U"
+                    oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149651" role="paragraph" l10n="U" oldref="60"><ahelp hid="HID_TABDLG_RESET_BTN">Resets changes made to the current tab to those applicable when this dialog was opened. A confirmation query does not appear when you close the dialog.</ahelp></paragraph>
+      </section>
+      <section id="zuruecksetzen">
+         <paragraph xml-lang="en-US" id="hd_id3143278" role="heading" level="2" l10n="U"
+                    oldref="18">Reset<comment>whats this?</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_TABDLG_RESET_BTN">Resets modified values back to the default values.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154331" role="warning" l10n="U" oldref="20">A confirmation query does not appear. If you confirm the dialog with OK all settings in this dialog are reset.</paragraph>
+      </section>
+      <section id="standard">
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_STD_FONT:PB_STANDARD" id="bm_id481887" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_TABDLG_STANDARD_BTN" id="bm_id3157322" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_COPY_BTN_SET_DEFAULT" id="bm_id3083280" localize="false"/>
-<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
-<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_TABDLG_STANDARD_BTN">Resets the values visible in the dialog back to the default installation values.</ahelp></paragraph>
-<paragraph role="warning" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="12">A confirmation does not appear before the defaults are reloaded.</paragraph>
-</section>
-<section id="zurueckautopi">
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_COPY:BTN_SET_DEFAULT" id="bm_id3083280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145173" role="heading" level="2" l10n="U"
+                    oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154153" role="paragraph" l10n="U" oldref="11"><ahelp hid="HID_TABDLG_STANDARD_BTN">Resets the values visible in the dialog back to the default installation values.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154299" role="warning" l10n="U" oldref="12">A confirmation does not appear before the defaults are reloaded.</paragraph>
+      </section>
+      <section id="zurueckautopi">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPREV" id="bm_id1064180" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BACK" id="bm_id3681447" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_PREVIOUS" id="bm_id5176244" localize="false"/>
@@ -247,24 +262,26 @@
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_PREVIOUS" id="bm_id3156155" localize="false"/>
-<paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="2" l10n="U" oldref="72">Back</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="HID_TABDLG_STANDARD_BTN">View the selections in the dialog made in the previous step. The current settings remain unchanged.</ahelp> This button can only be activated from page two on.</paragraph>
-</section>
-<section id="zusaetze">
-<paragraph role="heading" id="hd_id3147352" xml-lang="en-US" level="2" l10n="U" oldref="52">More</paragraph>
-<paragraph role="paragraph" id="par_id3155314" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_TABDLG_STANDARD_BTN">Click the<emph> More</emph> button to expand the dialog to show further options. Click again to restore the dialog.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3161659" xml-lang="en-US" l10n="U" oldref="41"><variable id="siehe">See also the following functions: 
+<paragraph xml-lang="en-US" id="hd_id3147502" role="heading" level="2" l10n="U"
+                    oldref="72">Back</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="U" oldref="73"><ahelp hid="HID_TABDLG_STANDARD_BTN">View the selections in the dialog made in the previous step. The current settings remain unchanged.</ahelp> This button can only be activated from page two on.</paragraph>
+      </section>
+      <section id="zusaetze">
+         <paragraph xml-lang="en-US" id="hd_id3147352" role="heading" level="2" l10n="U"
+                    oldref="52">More</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_TABDLG_STANDARD_BTN">Click the<emph> More</emph> button to expand the dialog to show further options. Click again to restore the dialog.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3161659" role="paragraph" l10n="U" oldref="41"><variable id="siehe">See also the following functions: 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>. 
+      <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3163714" xml-lang="en-US" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value. 
+      <paragraph xml-lang="en-US" id="par_id3163714" role="paragraph" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154145" xml-lang="en-US" l10n="U" oldref="54"><variable id="kontext">(This command is only accessible through the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link>). 
+      <paragraph xml-lang="en-US" id="par_id3154145" role="paragraph" l10n="U" oldref="54"><variable id="kontext">(This command is only accessible through the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link>). 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="61"><variable id="wiederholen">By double-clicking a tool, you can use it for multiple tasks. If you call the tool with a single-click, it reverts back to the last selection after completing the task. 
+      <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="U" oldref="61"><variable id="wiederholen">By double-clicking a tool, you can use it for multiple tasks. If you call the tool with a single-click, it reverts back to the last selection after completing the task. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id9345377" xml-lang="en-US" l10n="NEW"><variable id="ShiftF1">Press Shift+F1 and point to a control to learn more about that control. 
+      <paragraph xml-lang="en-US" id="par_id9345377" role="paragraph" l10n="NEW"><variable id="ShiftF1">Press Shift+F1 and point to a control to learn more about that control. 
 </variable></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index ccea435549..25ddb8c548 100755
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000002.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -115,7 +112,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159125"><bookmark_value>Java; definition</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3159125" xml-lang="en-US" level="2" l10n="U" oldref="92">Java</paragraph>
-<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
+<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
 </section>
 <section id="plugin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>plug-ins; definition</bookmark_value>
diff --git a/helpcontent2/source/text/shared/00/00000003.xhp b/helpcontent2/source/text/shared/00/00000003.xhp
index e56ee4b954..752f6846e9 100755
--- a/helpcontent2/source/text/shared/00/00000003.xhp
+++ b/helpcontent2/source/text/shared/00/00000003.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000003.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="1" l10n="U" oldref="1">Conversion of measurement units</paragraph>
 <paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="CHG">In some dialogs, you can enter measurement values into input boxes. If you just enter a numerical value, the default measurement unit is used.</paragraph>
-<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
+<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
 <paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="NEW">In input boxes for length units you can also add the unit abbreviation according to the following list:</paragraph>
 <table id="tbl_id402233">
 <tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp
index 36343e60f4..80fbf4adeb 100644
--- a/helpcontent2/source/text/shared/00/00000004.xhp
+++ b/helpcontent2/source/text/shared/00/00000004.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  ************************************************************************-->
 
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0000000004xml" indexer="exclude" status="PUBLISH">
@@ -45,12 +42,17 @@
 </history>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command... 
+<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command...
 </variable></paragraph>
 <section id="related">
 <paragraph role="related" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="47"><variable id="related"><emph>Related Topics</emph>
 </variable></paragraph>
 </section>
+
+<section id="agentoff">
+<paragraph role="tip" id="par_id56935339" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
+</section>
+
 <section id="sytextfarbe">
 <table id="tbl_id3156421">
 <tablerow>
@@ -371,7 +373,7 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous comment</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
@@ -386,7 +388,7 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next comment</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index d56be6eafa..31a5808247 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000005.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -95,7 +92,7 @@
     </listitem>
    </list>
    <paragraph xml-lang="en-US" id="par_id3148677" role="paragraph" l10n="U" oldref="170">Currently, $[officename] supports Hindi, Thai, Hebrew, and Arabic as CTL languages.</paragraph>
-   <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+   <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
    
   </section>
   <section id="kontextmenue">
@@ -126,9 +123,9 @@
 <bookmark_value>docking; definition</bookmark_value>
 </bookmark>
    <paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="2" l10n="U" oldref="6">Docking</paragraph>
-   <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows. 
+   <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
 </variable></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. 
+   <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.
 </variable></paragraph>
    
   </section>
diff --git a/helpcontent2/source/text/shared/00/00000007.xhp b/helpcontent2/source/text/shared/00/00000007.xhp
index a21f7b1d7f..ca61787efd 100755
--- a/helpcontent2/source/text/shared/00/00000007.xhp
+++ b/helpcontent2/source/text/shared/00/00000007.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000007.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
 <section id="asia">
 <paragraph role="heading" id="par_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="11">Asian Language Support</paragraph>
 <section id="asiahinweis">
-<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
 </section>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000010.xhp b/helpcontent2/source/text/shared/00/00000010.xhp
index 502fb5c742..696ea7eb0d 100644
--- a/helpcontent2/source/text/shared/00/00000010.xhp
+++ b/helpcontent2/source/text/shared/00/00000010.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000010.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000011.xhp b/helpcontent2/source/text/shared/00/00000011.xhp
index 0c5e343782..89aad6e2ba 100644
--- a/helpcontent2/source/text/shared/00/00000011.xhp
+++ b/helpcontent2/source/text/shared/00/00000011.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000011.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index aed86801f8..789e8a457c 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000020.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,7 +59,7 @@
 <paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically. 
 </caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
 <paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties">Tools - Options - Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
 <paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
 <paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
 <paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components". 
@@ -87,10 +84,10 @@
 <paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Importing and Exporting in HTML Format </paragraph>
 <paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="12">When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.<comment>still true? this para is very old.</comment></paragraph>
 <paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
-<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Notes are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Notes are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
+<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
 <paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph>Tools - Options - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
-<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
+<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
 <paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="130">The "font" property corresponds to Netscape Navigator; that is, before the font size you can specify optional values for "font-style" (italic, none), "font-variant" (normal, small-caps) and "font-weight" (normal, bold).</paragraph>
 <list type="unordered">
 <listitem>
@@ -107,7 +104,7 @@
 <paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins, 
 </caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
 <paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph>Tools - Options - %PRODUCTNAME Writer - General</emph> or <emph>Tools - Options - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
+<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
 <table id="tbl_id3154346">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -176,9 +173,9 @@
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
+<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
 <paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="223">Importing and Exporting Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
+<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
 <paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="225">A left paragraph indent in numbering is indicated as "margin-left" CSS1 property. First-line indents are ignored in numbering and not exported.</paragraph>
 <paragraph role="heading" id="hd_id3148556" xml-lang="en-US" level="3" l10n="U" oldref="235">Importing and Exporting Spreadsheet Files</paragraph>
 <paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="236">$[officename] imports and exports references to deleted sections such as, for example, a referenced column. The whole formula can be viewed during the export process and the deleted reference contains an indication (#REF!) to the reference. A #REF! will be correspondingly created for the reference during the import.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..78fe467f88 100755..100644
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
-	
+
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000021.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.23.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,216 +29,227 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">XML File Formats</title>
-<filename>/text/shared/00/00000021.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">XML File Formats</title>
+         <filename>/text/shared/00/00000021.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>exporting; XML files</bookmark_value>
-<bookmark_value>XML file formats</bookmark_value>
-<bookmark_value>extensions; file formats</bookmark_value>
-<bookmark_value>suffixes in file formats</bookmark_value>
-<bookmark_value>document types in $[officename]</bookmark_value>
-<bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
-<bookmark_value>defaults;file formats in $[officename]</bookmark_value>
-<bookmark_value>file formats;OpenDocument/XML</bookmark_value>
-<bookmark_value>OpenDocument file formats</bookmark_value>
-<bookmark_value>ODF file formats</bookmark_value>
-</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment>
+      <bookmark_value>XML file formats</bookmark_value>
+      <bookmark_value>extensions; file formats</bookmark_value>
+      <bookmark_value>suffixes in file formats</bookmark_value>
+      <bookmark_value>document types in $[officename]</bookmark_value>
+      <bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
+      <bookmark_value>defaults;file formats in $[officename]</bookmark_value>
+      <bookmark_value>file formats;OpenDocument/XML</bookmark_value>
+      <bookmark_value>OpenDocument file formats</bookmark_value>
+      <bookmark_value>ODF file formats</bookmark_value>
+</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment><comment>mw changed "defaults;..."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_DID_SAVE_PACKED_XML" id="bm_id3159242" localize="false"/>
-<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
+<paragraph xml-lang="en-US" id="hd_id3154408" role="heading" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148919" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10725" xml-lang="en-US" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="2" l10n="CHG" oldref="4">OpenDocument file format names</paragraph>
-<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
+      <paragraph xml-lang="en-US" id="par_id3148919" role="paragraph" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10725" role="note" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="2" l10n="CHG"
+                 oldref="4">OpenDocument file format names</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154926" role="paragraph" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph>
 <table id="tbl_id3109850">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="6">Document format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="7">File extension</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10762" xml-lang="en-US" l10n="CHG">ODF Text </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10767" xml-lang="en-US" l10n="NEW">*.odt</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1076D" xml-lang="en-US" l10n="CHG">ODF Text Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10772" xml-lang="en-US" l10n="NEW">*.ott</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10778" xml-lang="en-US" l10n="NEW">ODF Master Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1077D" xml-lang="en-US" l10n="NEW">*.odm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10783" xml-lang="en-US" l10n="NEW">HTML Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10788" xml-lang="en-US" l10n="NEW">*.html</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1078E" xml-lang="en-US" l10n="NEW">HTML Document Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10793" xml-lang="en-US" l10n="NEW">*.oth</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10799" xml-lang="en-US" l10n="CHG">ODF Spreadsheet</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1079E" xml-lang="en-US" l10n="NEW">*.ods</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A4" xml-lang="en-US" l10n="CHG">ODF Spreadsheet Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A9" xml-lang="en-US" l10n="NEW">*.ots</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107AF" xml-lang="en-US" l10n="CHG">ODF Drawing</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107B4" xml-lang="en-US" l10n="NEW">*.odg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BA" xml-lang="en-US" l10n="CHG">ODF Drawing Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BF" xml-lang="en-US" l10n="NEW">*.otg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107C5" xml-lang="en-US" l10n="CHG">ODF Presentation</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107CA" xml-lang="en-US" l10n="NEW">*.odp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D0" xml-lang="en-US" l10n="CHG">ODF Presentation Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D5" xml-lang="en-US" l10n="NEW">*.otp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107DB" xml-lang="en-US" l10n="CHG">ODF Formula</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107E0" xml-lang="en-US" l10n="NEW">*.odf</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="CHG">ODF Database</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10860" xml-lang="en-US" l10n="NEW">*.odb</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2089907" xml-lang="en-US" l10n="NEW">*.oxt</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-<paragraph role="note" id="par_idN1088F" xml-lang="en-US" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
-<paragraph role="paragraph" id="par_id4818872" xml-lang="en-US" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
-<paragraph role="heading" id="par_idN107E3" xml-lang="en-US" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
-<paragraph role="paragraph" id="par_id0514200811525257" xml-lang="en-US" l10n="NEW">The OpenDocument format evolves over time.<comment>UFI: convert text to table as soon as Help Authoring Environment allows new tables</comment></paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id0514200811565671" xml-lang="en-US" l10n="NEW">ODF version</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530375" xml-lang="en-US" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565662" xml-lang="en-US" l10n="NEW">ODF 1.0 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530487" xml-lang="en-US" l10n="NEW">2005-05-01</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530455" xml-lang="en-US" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565787" xml-lang="en-US" l10n="NEW">ODF 1.1 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530479" xml-lang="en-US" l10n="NEW">2007-02-02</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530467" xml-lang="en-US" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565762" xml-lang="en-US" l10n="NEW">ODF 1.2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530440" xml-lang="en-US" l10n="NEW">to be announced</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
-</tablecell>
-</tablerow>
-</table>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157898" role="tablehead" l10n="CHG" oldref="6">Document format</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149549" role="tablehead" l10n="U" oldref="7">File extension</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10762" role="tablecontent" l10n="CHG">ODF Text </paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10767" role="tablecontent" l10n="NEW">*.odt</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1076D" role="tablecontent" l10n="CHG">ODF Text Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10772" role="tablecontent" l10n="NEW">*.ott</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10778" role="tablecontent" l10n="NEW">ODF Master Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent" l10n="NEW">*.odm</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent" l10n="NEW">HTML Document</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10788" role="tablecontent" l10n="NEW">*.html</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="NEW">HTML Document Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10793" role="tablecontent" l10n="NEW">*.oth</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10799" role="tablecontent" l10n="CHG">ODF Spreadsheet</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1079E" role="tablecontent" l10n="NEW">*.ods</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107A4" role="tablecontent" l10n="CHG">ODF Spreadsheet Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107A9" role="tablecontent" l10n="NEW">*.ots</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107AF" role="tablecontent" l10n="CHG">ODF Drawing</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107B4" role="tablecontent" l10n="NEW">*.odg</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107BA" role="tablecontent" l10n="CHG">ODF Drawing Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107BF" role="tablecontent" l10n="NEW">*.otg</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107C5" role="tablecontent" l10n="CHG">ODF Presentation</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107CA" role="tablecontent" l10n="NEW">*.odp</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107D0" role="tablecontent" l10n="CHG">ODF Presentation Template</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107D5" role="tablecontent" l10n="NEW">*.otp</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107DB" role="tablecontent" l10n="CHG">ODF Formula</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107E0" role="tablecontent" l10n="NEW">*.odf</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="CHG">ODF Database</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10860" role="tablecontent" l10n="NEW">*.odb</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9756157" role="tablecontent" l10n="NEW">%PRODUCTNAME Extension</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2089907" role="tablecontent" l10n="NEW">*.oxt</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1088F" role="note" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4818872" role="paragraph" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107E3" role="heading" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0514200811525257" role="paragraph" l10n="NEW">The OpenDocument format evolves over time.</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0514200811565671" role="tablehead" l10n="NEW">ODF version</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530375" role="tablehead" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of the software</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0514200811565662" role="tablecontent" l10n="NEW">ODF 1.0 </paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530487" role="tablecontent" l10n="NEW">2005-05-01</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530455" role="tablecontent" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0514200811565787" role="tablecontent" l10n="NEW">ODF 1.1 </paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530479" role="tablecontent" l10n="NEW">2007-02-02</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530467" role="tablecontent" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">to be announced</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Oracle Open Office</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent" l10n="NEW">ODF 1.2 (Extended)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
 <paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph> to find alternative file formats for each $[officename] document type.</paragraph>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
 <paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000099.xhp b/helpcontent2/source/text/shared/00/00000099.xhp
index d2b2be4611..5c2a9ef18f 100755
--- a/helpcontent2/source/text/shared/00/00000099.xhp
+++ b/helpcontent2/source/text/shared/00/00000099.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000099.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_HELP_PI" id="bm_id562099" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id3153681" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>Tools - Options - $[officename] - General - Help Agent</emph>.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>$[officename] - General - Help Agent</emph> in the Options dialog box.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_HELPTIPS" id="bm_id2449436" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id3148491" localize="false"/>
 <paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:HelpTip">Enables the display of icon names at the mouse pointer and other Help contents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000202.xhp b/helpcontent2/source/text/shared/00/00000202.xhp
index 8d3f81d67d..1014fe03e3 100755
--- a/helpcontent2/source/text/shared/00/00000202.xhp
+++ b/helpcontent2/source/text/shared/00/00000202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,20 +40,20 @@
 <body>
   
   
-  <bookmark branch="hid/SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
+  <bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149741" xml-lang="en-US" oldref="2"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" visibility="visible">Defines the settings for the import/export of files in JPEG format.</ahelp></paragraph>
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#jpegspeichern"/>
 </section>
   <paragraph role="heading" level="2" id="hd_id3154689" l10n="U" xml-lang="en-US" oldref="3">Quality</paragraph>
   <paragraph role="paragraph" id="par_id3149877" l10n="U" xml-lang="en-US" oldref="4">Specifies the desired graphic quality.</paragraph>
-  <bookmark branch="hid/SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
+  <bookmark branch="hid/svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3152952" xml-lang="en-US" oldref="6"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" visibility="visible">Sets the quality for the import/export. The value 1 denotes minimum quality and minimal file size, 100 denotes maximum quality and file size.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3150431" l10n="U" xml-lang="en-US" oldref="7">Color resolution</paragraph>
   <paragraph role="paragraph" id="par_id3155599" l10n="U" xml-lang="en-US" oldref="8">Specifies the desired color resolution.</paragraph>
-  <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
+  <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3146938" xml-lang="en-US" oldref="10"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" visibility="visible">Specifies whether to export or import a graphic object in a grayscale.</ahelp></paragraph>
-  <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
+  <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149525" xml-lang="en-US" oldref="12"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" visibility="visible">Specifies whether to retain the original colors of the JPEG file when importing or exporting.</ahelp></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153539" xml-lang="en-US" oldref="13">For more details about filters, see <link href="text/shared/00/00000020.xhp" name="Information about Import/Export Filters">Information about Import/Export Filters</link></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/00/00000203.xhp b/helpcontent2/source/text/shared/00/00000203.xhp
index 336ade28b7..bfe46acab4 100755
--- a/helpcontent2/source/text/shared/00/00000203.xhp
+++ b/helpcontent2/source/text/shared/00/00000203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000203.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,22 +40,22 @@
 <body>
   
   
-  <bookmark branch="hid/GOODIES:MODALDIALOG:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/GOODIES:MODALDIALOG:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
+  <bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3160463" xml-lang="en-US" oldref="9"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" visibility="visible">Defines the settings for SVM/WMF/PICT/MET export options.</ahelp></paragraph>
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#svmspeichern"/>
 </section>
   <paragraph role="heading" level="2" id="hd_id3143206" l10n="U" xml-lang="en-US" oldref="2">Mode</paragraph>
   <paragraph role="paragraph" id="par_id3154400" l10n="U" xml-lang="en-US" oldref="10">Specifies the mode for file export.</paragraph>
-  <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
+  <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145356" xml-lang="en-US" oldref="11"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" visibility="visible">Retains the original size.</ahelp></paragraph>
-  <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
+  <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3148983" xml-lang="en-US" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" visibility="visible">Specifies whether to modify size.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3156183" l10n="U" xml-lang="en-US" oldref="5">Size</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3149525" l10n="U" oldref="13">Defines the width and height. This is only active if the <emph>Size</emph> option has been selected.</paragraph>
-  <bookmark branch="hid/SVTOOLS:METRICFIELD:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
+  <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154561" xml-lang="en-US" oldref="14"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" visibility="visible">Specifies the width.</ahelp></paragraph>
-  <bookmark branch="hid/SVTOOLS:METRICFIELD:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
+  <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147226" xml-lang="en-US" oldref="15"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" visibility="visible">Specifies the height.</ahelp></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="U" oldref="8">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for  more information about filters.</paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/00/00000204.xhp b/helpcontent2/source/text/shared/00/00000204.xhp
index 95e57ac824..440936eee1 100644
--- a/helpcontent2/source/text/shared/00/00000204.xhp
+++ b/helpcontent2/source/text/shared/00/00000204.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000204.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,14 +42,14 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
 <paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">BMP Options</paragraph>
 <paragraph role="paragraph" id="par_id3149662" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX">Defines the import/export settings for files in BMP format.</ahelp></paragraph>
 <embed href="text/shared/00/00000401.xhp#bmpexport"/>
 <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="2" l10n="U" oldref="2">Color Resolution</paragraph>
 <paragraph role="paragraph" id="par_id3151253" xml-lang="en-US" l10n="U" oldref="11">Specifies the color resolution of the BMP file to be exported.</paragraph>
 <paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="22">The <emph>Color Resolution</emph> command also appears on the context menu of a BMP graphic that has been loaded in <item type="productname">%PRODUCTNAME</item> Draw.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS" id="bm_id3153070" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS" id="bm_id3153070" localize="false"/>
 <paragraph role="heading" id="hd_id3149200" xml-lang="en-US" level="3" l10n="U" oldref="18">Color Resolution</paragraph>
 <paragraph role="paragraph" id="par_id3150402" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">In the <emph>Color Resolution</emph> list you will find the following color resolution variants:</ahelp></paragraph>
 <paragraph role="heading" id="par_id3150379" xml-lang="en-US" level="4" l10n="U" oldref="37">Original</paragraph>
@@ -85,25 +82,25 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id3154823" localize="false"/>
 <paragraph role="heading" id="par_id3155338" xml-lang="en-US" level="4" l10n="U" oldref="35">24-Bit True Colors</paragraph>
 <paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:ConvertToTrueColor">Allows the object to be converted to a palette of approximately 16 million colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE" id="bm_id3145072" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE" id="bm_id3145072" localize="false"/>
 <paragraph role="heading" id="par_id3145313" xml-lang="en-US" level="4" l10n="U" oldref="20">RLE Encoding</paragraph>
 <paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE">Applies RLE (Run Length Encoding) to the BMP graphics</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
 <paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="12">Determines the type of export mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
 <paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="4">Original</paragraph>
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX">Retains the original mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_RES_PIX" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX" id="bm_id3153700" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX" id="bm_id3153698" localize="false"/>
 <paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="U" oldref="5">Resolution</paragraph>
 <paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX">Allows you to define the resolution for an image. Select the desired DPI from the <emph>Resolution</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
 <paragraph role="heading" id="hd_id3152910" xml-lang="en-US" level="3" l10n="U" oldref="6">Size</paragraph>
 <paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX">Allows you modify the image size by a given measurement.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
 <paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
 <paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX">Specifies the image width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
 <paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="8">Height</paragraph>
 <paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX">Specifies the image height.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="9">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000205.xhp b/helpcontent2/source/text/shared/00/00000205.xhp
index 2f0861c06f..b7bac24c75 100755
--- a/helpcontent2/source/text/shared/00/00000205.xhp
+++ b/helpcontent2/source/text/shared/00/00000205.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000205.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,18 +45,18 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145759"><bookmark_value>transparency; saving</bookmark_value>
 <bookmark_value>GIF format</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/VCL:MODALDIALOG:DLG_EXPORT_GIF" id="bm_id3147519" localize="false"/>
+<!-- removed HID VCL:MODALDIALOG:DLG_EXPORT_GIF -->
 <paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">GIF Options</paragraph>
 <paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="VCL:MODALDIALOG:DLG_EXPORT_GIF">In the<emph> GIF Options </emph>dialog, you can select the settings for the export of files in GIF format.</ahelp></paragraph>
 <embed href="text/shared/00/00000401.xhp#gifexport"/>
 <paragraph role="heading" id="hd_id3149877" xml-lang="en-US" level="2" l10n="U" oldref="2">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id3153679" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_CheckBox_DLG_EXPORT_GIF_CBX_INTERLACED" id="bm_id9410382" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED -->
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id9410382" localize="false"/>
 <paragraph role="heading" id="hd_id3153272" xml-lang="en-US" level="3" l10n="U" oldref="3">Interlaced</paragraph>
 <paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED">Specifies whether to use interlaced mode for saving the GIF image.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="2" l10n="U" oldref="8">Drawing objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id3148731" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_CheckBox_DLG_EXPORT_GIF_CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT -->
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
 <paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="3" l10n="U" oldref="10">Save transparency</paragraph>
 <paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147102" xml-lang="en-US" l10n="U" oldref="4">For more information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000206.xhp b/helpcontent2/source/text/shared/00/00000206.xhp
index e2df677712..3b6ad27df0 100755
--- a/helpcontent2/source/text/shared/00/00000206.xhp
+++ b/helpcontent2/source/text/shared/00/00000206.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000206.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="1" l10n="U" oldref="1">Dif Import/Export/ Lotus import/ dBASE import</paragraph>
 <paragraph role="paragraph" id="par_id3150620" xml-lang="en-US" l10n="U" oldref="4">Defines the options for import/export. These dialogs will be automatically shown if the corresponding file type is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_IMPORTOPT:LB_FONT" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
 <paragraph role="paragraph" id="par_id3152790" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:LB_FONT">Select the character set from the options used for import/export.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="3">For further information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000207.xhp b/helpcontent2/source/text/shared/00/00000207.xhp
index dd2c198338..3b770282ee 100755..100644
--- a/helpcontent2/source/text/shared/00/00000207.xhp
+++ b/helpcontent2/source/text/shared/00/00000207.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000207.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,14 +44,15 @@
 <paragraph role="paragraph" id="par_id3150379" xml-lang="en-US" l10n="U" oldref="7">The <emph>Export of text files</emph> dialog allows you to define the export options for text files. The dialog will be displayed if you save spreadsheet data as file type "Text CSV", and if the <emph>Edit filter settings</emph> check box is marked in the <emph>Save As</emph> dialog.</paragraph>
 <paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="2">Field options</paragraph>
 <paragraph role="paragraph" id="par_id3152427" xml-lang="en-US" l10n="U" oldref="8">Defines the field separator, text separator and character set that is used for the text export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_IMPORTOPT:DDLB_FONT" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
 <paragraph role="paragraph" id="par_id3154689" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:DDLB_FONT">Specifies the character set for text export.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_FIELDSEP" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_FIELDSEP">Choose or enter the field delimiter, which separates data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
 <paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP">Choose or enter the text delimiter, which encloses every data field.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_IMPORTOPT_CB_SAVESHOWN" id="bm_id7735831" localize="false"/><paragraph role="heading" id="hd_id7145298" xml-lang="en-US" level="3" l10n="NEW">Save cell content as shown</paragraph>
-<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of %PRODUCTNAME.</ahelp></paragraph><comment>i76507, see http://specs.openoffice.org/calc/filters/csv/save-to-csv.odt</comment><paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
+<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</ahelp></paragraph>
+<paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH" id="bm_id3143281" localize="false"/><paragraph role="heading" id="hd_id3149793" xml-lang="en-US" level="3" l10n="U" oldref="12">Fixed column width</paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH">Exports all data fields with a fixed width.</ahelp></paragraph>
 <list type="unordered">
diff --git a/helpcontent2/source/text/shared/00/00000208.xhp b/helpcontent2/source/text/shared/00/00000208.xhp
index 6107cac36b..f4171df4ec 100644
--- a/helpcontent2/source/text/shared/00/00000208.xhp
+++ b/helpcontent2/source/text/shared/00/00000208.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000208.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_ASCII" id="bm_id3148919" localize="false"/><paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="1" l10n="U" oldref="1">Text Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_ASCII" id="bm_id3148919" localize="false"/><paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="1" l10n="U" oldref="1">Text Import</paragraph>
 <paragraph role="paragraph" id="par_id3149987" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC:MODALDIALOG:RID_SCDLG_ASCII">Sets the import options for delimited data.</ahelp></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#textimport"/>
@@ -54,34 +51,34 @@
 </case>
 </switch>
 <paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="45">Import</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
 <paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET">Specifies the character set to be used in the imported file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
 <paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW">Specifies the row where you want to start the import.</ahelp> The rows are visible in the preview window at the bottom of the dialog.</paragraph>
 <paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Separator Options</paragraph>
 <paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="4">Specifies whether your data uses separators or fixed widths as delimiters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED" id="bm_id3153894" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="7">Fixed width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_ASCII:RB_FIXED" id="bm_id3153894" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="7">Fixed width</paragraph>
 <paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED">Separates fixed-width data (equal number of characters) into columns.</ahelp> Click on the ruler in the preview window to set the width.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED" id="bm_id3147043" localize="false"/><paragraph role="heading" id="hd_id3156560" xml-lang="en-US" level="3" l10n="U" oldref="5">Separated by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_ASCII:RB_SEPARATED" id="bm_id3147043" localize="false"/><paragraph role="heading" id="hd_id3156560" xml-lang="en-US" level="3" l10n="U" oldref="5">Separated by</paragraph>
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED">Select the separator used in your data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_TAB" id="bm_id3153345" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="3" l10n="U" oldref="49">Tab</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_TAB" id="bm_id3153345" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="3" l10n="U" oldref="49">Tab</paragraph>
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_TAB">Separates data delimited by tabs into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SEMICOLON" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="51">Semicolon</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_SEMICOLON" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="51">Semicolon</paragraph>
 <paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SEMICOLON">Separates data delimited by semicolons into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_COMMA" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="53">Comma</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_COMMA" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="53">Comma</paragraph>
 <paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_COMMA">Separates data delimited by commas into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SPACE" id="bm_id3109848" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="55">Space</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_SPACE" id="bm_id3109848" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="55">Space</paragraph>
 <paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SPACE">Separates data delimited by spaces into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_OTHER" id="bm_id3149098" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_ASCII:ED_OTHER" id="bm_id3149801" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="57">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_OTHER" id="bm_id3149098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_ASCII:ED_OTHER" id="bm_id3149801" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="57">Other</paragraph>
 <paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="SC:EDIT:RID_SCDLG_ASCII:ED_OTHER">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE" id="bm_id3146807" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="59">Merge delimiters</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_ASONCE" id="bm_id3146807" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="59">Merge delimiters</paragraph>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE">Combines consecutive delimiters and removes blank data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
 <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP">Select a character to delimit text data. You can can also enter a character in the text box.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
 <paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
 <table id="tbl_id3155179">
 <tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000210.xhp b/helpcontent2/source/text/shared/00/00000210.xhp
index 9eca3c1edb..b462f3341d 100644
--- a/helpcontent2/source/text/shared/00/00000210.xhp
+++ b/helpcontent2/source/text/shared/00/00000210.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000210.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,15 +40,15 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SD:MODALDIALOG:DLG_PRINT_WARNINGS" id="bm_id3158421" localize="false"/><paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Warning Print Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ModalDialog:DLG_PRINT_WARNINGS" id="bm_id3158421" localize="false"/><paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Warning Print Options</paragraph>
 <paragraph role="paragraph" id="par_id3152352" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SD:MODALDIALOG:DLG_PRINT_WARNINGS">The<emph> Warning Print Options </emph>dialog appears when the page setup does not match the defined print range.</ahelp> This is the case, for example, if you draw a rectangle that is larger than the current page format.</paragraph>
 <paragraph role="heading" id="hd_id3150620" xml-lang="en-US" level="2" l10n="U" oldref="3">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_SCALE" id="bm_id3148765" localize="false"/><paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit page to print range</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_SCALE" id="bm_id3148765" localize="false"/><paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit page to print range</paragraph>
 <embed href="text/shared/optionen/01070400.xhp#fittopage"/>
 <paragraph role="note" id="par_id3158405" xml-lang="en-US" l10n="U" oldref="7">If you select the <emph>Fit page to print range </emph>option, the <emph>Warning Print Options</emph> dialog will not appear in subsequent print runs of this document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_POSTER" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Print on multiple pages<comment>i78245</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_POSTER" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Print on multiple pages<comment>i78245</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_POSTER">Specifies whether to distribute the printout on multiple pages.</ahelp> The print range will be printed on multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_CUT" id="bm_id3160302" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="10">Trim</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_CUT" id="bm_id3160302" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="10">Trim</paragraph>
 <paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_CUT">Specifies that anything extending beyond the maximum print range will be cut off and not included in the printing.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000212.xhp b/helpcontent2/source/text/shared/00/00000212.xhp
index 18d418d595..4c5fc36826 100755
--- a/helpcontent2/source/text/shared/00/00000212.xhp
+++ b/helpcontent2/source/text/shared/00/00000212.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000212.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,12 +48,12 @@
   <embed href="text/shared/00/00000401.xhp#pngspeichern"/>
 </section>
 <paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="2" l10n="U" oldref="7">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id3156053" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_NumericField_DLG_EXPORT_EPNG_NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
+<!-- removed HID VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
 <paragraph role="heading" id="hd_id3150672" xml-lang="en-US" level="3" l10n="U" oldref="3">Compression 0..9</paragraph>
 <paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION">Specifies the compression setting from 0 (no compression) to 9 (maximum compression). The calculation time increases with the compression value, while the resulting file is smaller in bytes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id3143206" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_CheckBox_DLG_EXPORT_EPNG_CBX_INTERLACED" id="bm_id5851924" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED -->
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id5851924" localize="false"/>
 <paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="3" l10n="U" oldref="5">Interlaced</paragraph>
 <paragraph role="paragraph" id="par_id3154840" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000213.xhp b/helpcontent2/source/text/shared/00/00000213.xhp
index e589165b64..4eef472d89 100755
--- a/helpcontent2/source/text/shared/00/00000213.xhp
+++ b/helpcontent2/source/text/shared/00/00000213.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000213.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,34 +50,34 @@
 </section>
 <paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="3">Preview</paragraph>
 <paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Specifies options for embedded preview for the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
 <paragraph role="heading" id="hd_id3145348" xml-lang="en-US" level="3" l10n="U" oldref="5">Image preview (TIFF)</paragraph>
 <paragraph role="paragraph" id="par_id3155271" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
 <paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="3" l10n="U" oldref="29">Interchange (EPSI)</paragraph>
 <paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file.</ahelp> This format only contains printable characters from the 7-bit ASCII code.</paragraph>
 <paragraph role="heading" id="hd_id3159224" xml-lang="en-US" level="2" l10n="U" oldref="9">Version</paragraph>
 <paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="10">Determines the PostScript level for exporting the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
 <paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="3" l10n="U" oldref="11">Level 1</paragraph>
 <paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1">Compression is not available at this level. Select the<emph> Level 1 </emph>option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
 <paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="3" l10n="U" oldref="13">Level 2</paragraph>
 <paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2">Select the<emph> Level 2 </emph>option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147261" xml-lang="en-US" level="2" l10n="U" oldref="15">Color format</paragraph>
 <paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="16">The <emph>Color format</emph> option gives you the choice between exporting in color or in grayscale.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="3" l10n="U" oldref="17">Color</paragraph>
 <paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR">Exports the file in color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
 <paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="19">Grayscale</paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE">Exports the file in grayscale tones.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="21">Compression</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="22">Specifies whether the data is exported with compression.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="23">LZW encoding</paragraph>
 <paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm invented by Abraham Lempel, Jacob Ziv, and Terry Welch. If you choose to activate this, select the<emph> LZW encoding </emph>option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
 <paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="25">None</paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE">Specifies that you do not wish to use compression.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000214.xhp b/helpcontent2/source/text/shared/00/00000214.xhp
index f9261891cd..570cde3d5f 100755
--- a/helpcontent2/source/text/shared/00/00000214.xhp
+++ b/helpcontent2/source/text/shared/00/00000214.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000214.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,14 +48,14 @@
   <embed href="text/shared/00/00000401.xhp#pbmppmpgm"/>
 </section>
 <paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="3">File format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPBM_RB_RAW" id="bm_id9971617" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPPM_RB_RAW" id="bm_id9391460" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPGM_RB_RAW" id="bm_id702536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW" id="bm_id9971617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW" id="bm_id9391460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW" id="bm_id702536" localize="false"/>
 <paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="3" l10n="U" oldref="5">Binary</paragraph>
 <paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Exports the file in binary format. The resulting file is smaller than a (ASCII) text file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPBM_RB_ASCII" id="bm_id3917661" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPPM_RB_ASCII" id="bm_id1909543" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPGM_RB_ASCII" id="bm_id5302591" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII" id="bm_id3917661" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII" id="bm_id1909543" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII" id="bm_id5302591" localize="false"/>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
 <paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid=".">Exports the file in the ASCII text format. This file type is larger than a binary.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000215.xhp b/helpcontent2/source/text/shared/00/00000215.xhp
index f9b3036d24..073dbcffb9 100755
--- a/helpcontent2/source/text/shared/00/00000215.xhp
+++ b/helpcontent2/source/text/shared/00/00000215.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000215.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,24 +49,24 @@
 </section>
 <paragraph role="heading" id="hd_id3159217" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for importing or exporting your file. When exporting, only the character set and paragraph break can be defined.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_CHARSET" id="bm_id3159242" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET" id="bm_id3159242" localize="false"/>
 <paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
 <paragraph role="paragraph" id="par_id3143206" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_CHARSET">Specifies the character set of the file for export or import.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_FONT" id="bm_id3150008" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_FONT" id="bm_id3150008" localize="false"/>
 <paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="3" l10n="U" oldref="7">Default fonts</paragraph>
 <paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_FONT">By setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_LANGUAGE" id="bm_id3153124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE" id="bm_id3153124" localize="false"/>
 <paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="9">Language</paragraph>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_LANGUAGE">Specifies the language of the text, if this has not already been defined. This setting is only available when importing.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="3" l10n="U" oldref="11">Paragraph break</paragraph>
 <paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="12">Defines the type of paragraph break for a text line.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CRLF" id="bm_id3149640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF" id="bm_id3149640" localize="false"/>
 <paragraph role="heading" id="hd_id3150935" xml-lang="en-US" level="3" l10n="U" oldref="13">CR &amp; LF</paragraph>
 <paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CRLF">Produces a "Carriage Return" and a "Linefeed". This option is the default.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CR" id="bm_id3150178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_CR" id="bm_id3150178" localize="false"/>
 <paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="15">CR</paragraph>
 <paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CR">Produces a "Carriage Return" as the paragraph break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_LF" id="bm_id3147374" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_LF" id="bm_id3147374" localize="false"/>
 <paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="17">LF</paragraph>
 <paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_LF">Produces a "Linefeed" as the paragraph break.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 560fec4726..54f65d415c 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000401.xhp,v $
- * $Revision: 1.14.4.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0000000401xml" indexer="exclude">
 <title id="tit" xml-lang="en-US">File Menu</title>
@@ -54,7 +51,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150127" xml-lang="en-US" l10n="E">
-<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -73,7 +70,7 @@
 </section>
 <paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="U" oldref="160"><variable id="etiketten">Choose <emph>File - New - Labels</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="161"><variable id="etikettenein">Choose <emph>File - New - Labels - Labels</emph> tab 
+<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="161"><variable id="etikettenein">Choose <emph>File - New - Labels - Labels</emph> tab
 </variable></paragraph>
 <section id="formateti">
 <paragraph role="paragraph" id="par_id3154522" xml-lang="en-US" l10n="U" oldref="162">Choose <emph>File - New - Labels - Format</emph> tab</paragraph>
@@ -85,13 +82,13 @@
 </section>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="166"><variable id="visikart">Choose <emph>File - New - Business Cards</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="167"><variable id="visikartform">Choose <emph>File - New - Business Cards - Medium</emph> tab 
+<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="167"><variable id="visikartform">Choose <emph>File - New - Business Cards - Medium</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152824" xml-lang="en-US" l10n="U" oldref="168"><variable id="viskartinhalt">Choose <emph>File - New - Business Cards - Business cards</emph> tab 
+<paragraph role="paragraph" id="par_id3152824" xml-lang="en-US" l10n="U" oldref="168"><variable id="viskartinhalt">Choose <emph>File - New - Business Cards - Business cards</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="169"><variable id="viskartpriv">Choose <emph>File - New - Business Cards - Private</emph> tab 
+<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="169"><variable id="viskartpriv">Choose <emph>File - New - Business Cards - Private</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="170"><variable id="viskartgesch">Choose <emph>File - New - Business Cards - Business</emph> tab 
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="170"><variable id="viskartgesch">Choose <emph>File - New - Business Cards - Business</emph> tab
 </variable></paragraph>
 <section id="oeffnen">
 <paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Open</emph>
@@ -103,7 +100,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="E">
-<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -173,23 +170,23 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145592" xml-lang="en-US" l10n="U" oldref="107"><variable id="dtapsf">Choose <emph>File - Wizards - Presentation - Page 5</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C46" xml-lang="en-US" l10n="CHG"><variable id="autopilotformular">Click <emph>Use Wizard to Create Form</emph> in a database file window. 
+<paragraph role="paragraph" id="par_idN10C46" xml-lang="en-US" l10n="CHG"><variable id="autopilotformular">Click <emph>Use Wizard to Create Form</emph> in a database file window.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C5F" xml-lang="en-US" l10n="CHG"><variable id="autopilotreport">Click <emph>Use Wizard to Create Report</emph> in a database file window. 
+<paragraph role="paragraph" id="par_idN10C5F" xml-lang="en-US" l10n="CHG"><variable id="autopilotreport">Click <emph>Use Wizard to Create Report</emph> in a database file window.
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10C24" xml-lang="en-US" l10n="NEW"><variable id="webwizard">Choose <emph>File - Wizards - Web Page</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154064" xml-lang="en-US" l10n="U" oldref="143"><variable id="gruppen">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame. 
+<paragraph role="paragraph" id="par_id3154064" xml-lang="en-US" l10n="U" oldref="143"><variable id="gruppen">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="144"><variable id="gruppen1">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 1 
+<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="144"><variable id="gruppen1">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 1
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="148"><variable id="gruppen2">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 2 
+<paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="148"><variable id="gruppen2">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 2
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="145"><variable id="gruppen3">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 3 
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="145"><variable id="gruppen3">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 3
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="146"><variable id="gruppen4">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 4, there must be a database connection. 
+<paragraph role="paragraph" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="146"><variable id="gruppen4">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 4, there must be a database connection.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159347" xml-lang="en-US" l10n="U" oldref="147"><variable id="gruppen5">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - last page of Wizards 
+<paragraph role="paragraph" id="par_id3159347" xml-lang="en-US" l10n="U" oldref="147"><variable id="gruppen5">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - last page of Wizards
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="150"><variable id="autopilotmsimport">Choose <emph>File - Wizards - Document Converter</emph>
 </variable></paragraph>
@@ -224,7 +221,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156712" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -240,7 +237,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10F11" xml-lang="en-US" l10n="NEW">
-<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -250,33 +247,33 @@
 </table>
 
 </section>
-<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="78"><variable id="gifspeichern">Choose <emph>File - Save As</emph>, if GIF selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="78"><variable id="gifspeichern">Choose <emph>File - Save As</emph>, if GIF selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically 
+<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard 
+<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154021" xml-lang="en-US" l10n="U" oldref="138"><variable id="htmlspeichern2">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 2 of the wizard 
+<paragraph role="paragraph" id="par_id3154021" xml-lang="en-US" l10n="U" oldref="138"><variable id="htmlspeichern2">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 2 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="159"><variable id="htmlspeichern3">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 3 of the wizard 
+<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="159"><variable id="htmlspeichern3">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 3 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="140"><variable id="htmlspeichern4">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 4 of the wizard 
+<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="140"><variable id="htmlspeichern4">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 4 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150235" xml-lang="en-US" l10n="U" oldref="141"><variable id="htmlspeichern5">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 5 of the wizard 
+<paragraph role="paragraph" id="par_id3150235" xml-lang="en-US" l10n="U" oldref="141"><variable id="htmlspeichern5">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 5 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard 
+<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically 
+<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens 
+<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3154901" xml-lang="en-US" l10n="U" oldref="58"><variable id="saveall">Choose <emph>File - Save All</emph>
 </variable></paragraph>
@@ -288,7 +285,7 @@
 </section>
 <paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="61"><variable id="info1">Choose <emph>File - Properties</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150381" xml-lang="en-US" l10n="U" oldref="62"><variable id="info2">Choose <emph>File - Properties - General</emph> tab 
+<paragraph role="paragraph" id="par_id3150381" xml-lang="en-US" l10n="U" oldref="62"><variable id="info2">Choose <emph>File - Properties - General</emph> tab
 </variable></paragraph>
 <section id="digitalsig">
 <paragraph role="paragraph" id="par_idN11163" xml-lang="en-US" l10n="NEW">Choose <emph>File - Digital Signatures</emph>
@@ -298,15 +295,17 @@
 <paragraph role="paragraph" id="par_idN11156" xml-lang="en-US" l10n="NEW">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button </paragraph>
 <paragraph role="paragraph" id="par_idN1117E" xml-lang="en-US" l10n="NEW">Double-click the Signature field on the Status Bar.</paragraph>
 </section>
-<paragraph role="paragraph" id="par_idN11173" xml-lang="en-US" l10n="NEW"><variable id="digitalsigsel">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button, then click <emph>Add</emph> button 
+<paragraph role="paragraph" id="par_idN11173" xml-lang="en-US" l10n="NEW"><variable id="digitalsigsel">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button, then click <emph>Add</emph> button
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="63"><variable id="info3">Choose <emph>File - Properties - Description</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="63"><variable id="info3">Choose <emph>File - Properties - Description</emph> tab 
+<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="info4">Choose <emph>File - Properties - Custom Properties</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="info4">Choose <emph>File - Properties - Custom Properties</emph> tab 
+<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="65"><variable id="info5">Choose <emph>File - Properties - Statistics</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="65"><variable id="info5">Choose <emph>File - Properties - Statistics</emph> tab 
+<paragraph role="paragraph" id="par_id315370199" xml-lang="en-US" l10n="NEW"><variable id="infosec">Choose <emph>File - Properties - Security</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="66"><variable id="info6">Choose <emph>File - Properties - Internet</emph> tab 
+<paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="66"><variable id="info6">Choose <emph>File - Properties - Internet</emph> tab
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3154275" xml-lang="en-US" l10n="U" oldref="67"><variable id="dokuvorlage">Choose <emph>File - Templates</emph>
 </variable></paragraph>
@@ -335,7 +334,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11366" xml-lang="en-US" l10n="NEW">
-<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -362,7 +361,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN113AB" xml-lang="en-US" l10n="NEW">
-<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -383,7 +382,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="E">
-<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -410,7 +409,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="E">
-<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -428,7 +427,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153068" xml-lang="en-US" l10n="E">
-<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -451,9 +450,9 @@
 <paragraph role="paragraph" id="par_id3145827" xml-lang="en-US" l10n="CHG" oldref="76">Choose <emph>File - Open</emph> - select under "File type": "Text CSV" </paragraph>
 <paragraph role="paragraph" id="par_id6071352" xml-lang="en-US" l10n="NEW">Choose <emph>Data - Text to Columns</emph> (Calc)</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3148608" xml-lang="en-US" l10n="U" oldref="81"><variable id="epsexport">Choose <emph>File - Export</emph>, if EPS is selected as file type, this dialog opens automatically 
+<paragraph role="paragraph" id="par_id3148608" xml-lang="en-US" l10n="U" oldref="81"><variable id="epsexport">Choose <emph>File - Export</emph>, if EPS is selected as file type, this dialog opens automatically
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150107" xml-lang="en-US" l10n="U" oldref="87"><variable id="pbmppmpgm">Choose <emph>File - Export</emph>, if PBM, PPM or PGM is selected as file type, the dialog opens automatically 
+<paragraph role="paragraph" id="par_id3150107" xml-lang="en-US" l10n="U" oldref="87"><variable id="pbmppmpgm">Choose <emph>File - Export</emph>, if PBM, PPM or PGM is selected as file type, the dialog opens automatically
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145305" xml-lang="en-US" l10n="U" oldref="96"><variable id="versionen"><variable id="autopilotberichtfeldauswahl">Choose <emph>File - Versions</emph>
 </variable>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index a21661bec0..fd9831ea0a 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000402.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -72,7 +69,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="E">
-<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -95,7 +92,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -116,7 +113,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="E">
-<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -137,7 +134,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -159,7 +156,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="E">
-<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -206,7 +203,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150020" xml-lang="en-US" l10n="E">
-<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -234,7 +231,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159183" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp b/helpcontent2/source/text/shared/00/00000403.xhp
index 497c8b5bda..8fada8b835 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000403.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp
index f1a98a00e6..58da4f2d66 100644
--- a/helpcontent2/source/text/shared/00/00000404.xhp
+++ b/helpcontent2/source/text/shared/00/00000404.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000404.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Menu</paragraph>
-<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Note</emph> (in Writer or Calc)
+<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> (in Writer or Calc)
 </variable></paragraph>
 <section id="scannen">
 <paragraph role="paragraph" id="par_id3155619" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>Insert - Picture - Scan</emph>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index cd019d9589..d16dda5565 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.18.4.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0000000406xml" indexer="exclude">
 <title id="tit" xml-lang="en-US">Tools Menu</title>
@@ -49,18 +46,18 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153551" xml-lang="en-US" l10n="U" oldref="127">Gallery</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153551" role="paragraph" l10n="U" oldref="127">Gallery</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab 
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab
 </variable></paragraph>
 <section id="rechtschreibung">
 <paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spelling and Grammar</emph>
@@ -72,133 +69,122 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3157809" role="paragraph" l10n="U" oldref="4">Spelling and Grammar</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled) 
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156326" role="paragraph" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10705" xml-lang="en-US" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled) 
+      <paragraph xml-lang="en-US" id="par_idN10705" role="paragraph" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Conversion</emph> (Asian language support must be enabled)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1071E" xml-lang="en-US" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button 
+      <paragraph xml-lang="en-US" id="par_idN1071E" role="paragraph" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Conversion</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spelling and Grammar</emph>
+      <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spelling and Grammar</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spelling and Grammar</emph>, then click <emph>Options</emph>
+      <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spelling and Grammar</emph>, then click <emph>Options</emph>
 </variable></paragraph>
-<section id="thesaurus">
-<paragraph role="paragraph" id="par_id3151338" xml-lang="en-US" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
+      <section id="thesaurus">
+         <paragraph xml-lang="en-US" id="par_id3151338" role="paragraph" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3149884" xml-lang="en-US" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command 
+         <paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
-</section>
-<section id="etpip">
-<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Tools - Eyedropper</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
+      </section>
+      <section id="etpip">
+         <paragraph xml-lang="en-US" id="par_id3153320" role="paragraph" l10n="U" oldref="10">Choose <emph>Tools - Eyedropper</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option 
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system) 
+      <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
 </variable></paragraph>
-<section id="recordmacro">
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
+      <section id="recordmacro">
+         <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
 </paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button 
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10843" xml-lang="en-US" l10n="CHG"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>
+      <paragraph xml-lang="en-US" id="par_idN10843" role="paragraph" l10n="CHG"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id9988402" xml-lang="en-US" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button 
+      <paragraph xml-lang="en-US" id="par_id9988402" role="paragraph" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151106" xml-lang="en-US" l10n="U" oldref="161"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>
+      <paragraph xml-lang="en-US" id="par_id3151106" role="paragraph" l10n="U" oldref="161"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="CHG" oldref="162"><variable id="xmlfilteredit">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>New</emph> or <emph>Edit</emph>
+      <paragraph xml-lang="en-US" id="par_id3153778" role="paragraph" l10n="CHG" oldref="162"><variable id="xmlfilteredit">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>New</emph> or <emph>Edit</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148979" xml-lang="en-US" l10n="CHG" oldref="163"><variable id="xmlfiltertest">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>Test XSLTs</emph>
+      <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="CHG" oldref="163"><variable id="xmlfiltertest">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>Test XSLTs</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools - Customize</emph>
+      <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools - Customize</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN108E9" xml-lang="en-US" l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>New</emph>
+      <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph" l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>New</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10919" xml-lang="en-US" l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>Menu - Move</emph>
+      <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph" l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>Menu - Move</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened) 
+      <paragraph xml-lang="en-US" id="par_id3145171" role="paragraph" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
+      <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect Options</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph>
-<emph>- Options</emph>tab 
+      <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect Options</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options - Smart Tags</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Replace</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3155368" role="paragraph" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect Options - Replace</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Exceptions</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3155860" role="paragraph" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect Options - Exceptions</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153094" xml-lang="en-US" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Custom Quotes</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3153094" role="paragraph" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect Options - Localized Options</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph> - Word Completion</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3153945" role="paragraph" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect Options - Word Completion</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+      <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+      <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="93"><variable id="etotm">Choose <emph>Tools - Options - %PRODUCTNAME Draw - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General</emph>
 </variable></paragraph>
-<section id="verzeichnis">
-<paragraph role="paragraph" id="par_id3145112" xml-lang="en-US" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
-<paragraph role="paragraph" id="par_id3153953" xml-lang="en-US" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph>Tools - Options - $[officename] - Paths</emph>
-</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="23"><variable id="optionen">Choose <emph>Tools - Options</emph>
+      <section id="verzeichnis">
+         <paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156006" xml-lang="en-US" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph>Tools - Options - $[officename]</emph>
+      <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph>Tools - Options - $[officename] - User Data</emph>
+      <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="136"><variable id="allg">Choose <emph>Tools - Options - $[officename] - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="147"><variable id="arbeit">Choose <emph>Tools - Options - $[officename] - Memory</emph>
+      <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="61"><variable id="ansicht">Choose <emph>Tools - Options - $[officename] - View</emph>
+      <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="137"><variable id="drucken">Choose <emph>Tools - Options - $[officename] - Print</emph>
+      <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>
 </variable></paragraph>
 <section id="pfade">
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Edit - AutoText - Path</emph>
 </paragraph>
 </section>
 <section id="color">
-<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Tools - Options - $[officename] - Colors</emph>
+<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Format - Area - Colors</emph> tab</paragraph>
 </section>
 <section id="color2">
-<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Tools - Options - $[officename] - Colors - Edit</emph>
+<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors - Edit</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3145729" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Format - Area - Colors</emph> tab<emph> - Edit</emph> button</paragraph>
 <paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="67">Choose <emph>Format - 3D Effects</emph> icon on the <emph>Illumination</emph> tab</paragraph>
@@ -207,141 +193,139 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151037" xml-lang="en-US" l10n="U" oldref="68">Select color on the <emph>Color</emph> tab page</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="72"><variable id="schriers">Choose <emph>Tools - Options - $[officename] - Fonts</emph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151037" role="paragraph" l10n="U" oldref="68">Select color on the <emph>Color</emph> tab page</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Fonts</emph>
+</variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Security</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="43"><variable id="scripting">Choose <emph>Tools - Options - $[officename] - Security</emph>
+      <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C3D" xml-lang="en-US" l10n="NEW"><variable id="java">Choose <emph>Tools - Options - $[officename] - Java</emph>
+      <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id5485702" xml-lang="en-US" l10n="NEW"><variable id="online_update">Choose <emph>Tools - Options - $[officename] - Online Update </emph>
+      <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146989" xml-lang="en-US" l10n="U" oldref="152"><variable id="accessibility">Choose <emph>Tools - Options - $[officename] - Accessibility</emph>
+      <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3144746" xml-lang="en-US" l10n="U" oldref="153"><variable id="appearance">Choose <emph>Tools - Options - $[officename] - Appearance</emph>
+      <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="U" oldref="32"><variable id="landen">Choose <emph>Tools - Options - Load/Save</emph>
+      <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147223" xml-lang="en-US" l10n="U" oldref="27"><variable id="rsave">Choose <emph>Tools - Options - Load/Save - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="119"><variable id="etsofi">Choose <emph>Tools - Options - Load/Save</emph> - <emph>VBA Properties</emph>
+      <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>VBA Properties</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph>Tools - Options - Load/Save</emph> - <emph>Microsoft Office</emph>
+      <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>Microsoft Office</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145667" xml-lang="en-US" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML </emph>
-<emph>Compatibility</emph>
+      <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>HTML Compatibility</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph>Tools - Options - Language Settings</emph>
+      <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="131"><variable id="sprachen">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+      <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155446" xml-lang="en-US" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph>Tools - Options - Language Settings - Languages - Complex Text Layout</emph>
+      <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages - Complex Text Layout</emph>
 </variable></paragraph>
-<section id="linguistik">
-<paragraph role="paragraph" id="par_id3150745" xml-lang="en-US" l10n="U" oldref="45">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+      <section id="linguistik">
+         <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
 </paragraph>
-</section>
-<section id="linguistikmodule">
-<paragraph role="paragraph" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="134">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
-</section>
-<section id="writingaids">
-<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US" l10n="U" oldref="157">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
+      </section>
+      <section id="linguistikmodule">
+         <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
+      </section>
+      <section id="writingaids">
+         <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
 </paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="135"><variable id="suchja">Choose <emph>Tools - Options - Language Settings - Searching in Japanese</emph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Searching in Japanese</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="133"><variable id="asialayout">Choose <emph>Tools - Options - Language Settings - Asian Layout</emph>
+      <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Asian Layout</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147359" xml-lang="en-US" l10n="U" oldref="138"><variable id="internet">Choose <emph>Tools - Options - Internet</emph>
+      <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="33"><variable id="internet1">Choose <emph>Tools - Options - Internet - Proxy</emph>
+      <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159339" xml-lang="en-US" l10n="U" oldref="36"><variable id="internet4">Choose <emph>Tools - Options - Internet - Search</emph>
+      <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Search</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149280" xml-lang="en-US" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph>
+      <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10E4F" xml-lang="en-US" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Compatibility</emph>
+      <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Compatibility</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148929" xml-lang="en-US" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10F2F" xml-lang="en-US" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
+      <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149825" xml-lang="en-US" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>
+      <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
+      <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
+      <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153534" xml-lang="en-US" l10n="U" oldref="47"><variable id="raster">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
+      <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
 </variable></paragraph>
-<section id="grundschriften">
-<paragraph role="paragraph" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="97">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
+      <section id="grundschriften">
+         <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3159313" xml-lang="en-US" l10n="U" oldref="151">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3155607" xml-lang="en-US" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph>Tools - Options - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
+         <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3988769" xml-lang="en-US" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print 
+      <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
+      <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
+      <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Changes</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159333" xml-lang="en-US" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
+      <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149448" xml-lang="en-US" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
+      <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - Background</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149336" xml-lang="en-US" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+      <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152966" xml-lang="en-US" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+      <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>
+      <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152494" xml-lang="en-US" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>
+      <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button 
+      <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - </emph>
-<emph>Options - %PRODUCTNAME Calc - Changes</emph>
+      <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Changes</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools </emph>
-<emph>- Options - %PRODUCTNAME Impress</emph>
+      <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148418" xml-lang="en-US" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
+      <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150380" xml-lang="en-US" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+      <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
+      <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148873" xml-lang="en-US" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
+      <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph>Tools - Options - %PRODUCTNAME Draw</emph>
+      <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149573" xml-lang="en-US" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math</emph>
+      <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145613" xml-lang="en-US" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math - Settings</emph>
+      <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math - Settings</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph>Tools - Options - Charts</emph>
+      <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph>Tools - Options - Charts - Default Colors</emph>
+      <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150862" xml-lang="en-US" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph>Tools - Options - %PRODUCTNAME Base</emph>
+      <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147368" xml-lang="en-US" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>
+      <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Connections</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1120D" xml-lang="en-US" l10n="NEW"><variable id="registered">Choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>
+      <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>
 </variable></paragraph>
-</body>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000407.xhp b/helpcontent2/source/text/shared/00/00000407.xhp
index df8e8ca3aa..f2ac95df43 100755
--- a/helpcontent2/source/text/shared/00/00000407.xhp
+++ b/helpcontent2/source/text/shared/00/00000407.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000407.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000408.xhp b/helpcontent2/source/text/shared/00/00000408.xhp
index 8a4b21bf28..161eec726b 100755
--- a/helpcontent2/source/text/shared/00/00000408.xhp
+++ b/helpcontent2/source/text/shared/00/00000408.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000408.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000409.xhp b/helpcontent2/source/text/shared/00/00000409.xhp
index 60b2758d34..d334819870 100644
--- a/helpcontent2/source/text/shared/00/00000409.xhp
+++ b/helpcontent2/source/text/shared/00/00000409.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000409.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp
index 32c4ea11c9..6f828ec3fc 100644
--- a/helpcontent2/source/text/shared/00/00000450.xhp
+++ b/helpcontent2/source/text/shared/00/00000450.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000450.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type 
 </variable><comment>see #i56356</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index 36585d1c46..ec099022ec 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,300 +32,302 @@
  
 	
 <meta>
-<topic id="textshared0000040500xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Format Menu</title>
-<filename>/text/shared/00/00040500.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<paragraph role="paragraph" id="par_id3145356" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Default Formatting</emph>
+      <topic id="textshared0000040500xml" indexer="exclude">
+         <title xml-lang="en-US" id="tit">Format Menu</title>
+         <filename>/text/shared/00/00040500.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3150347" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145356" role="paragraph" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Default Formatting</emph>
 </variable></paragraph>
-<section id="zeichen">
-<paragraph role="paragraph" id="par_id3153244" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Character</emph>
+      <section id="zeichen">
+         <paragraph xml-lang="en-US" id="par_id3153244" role="paragraph" l10n="U" oldref="9">Choose <emph>Format - Character</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3152352" xml-lang="en-US" l10n="CHG" oldref="10">On <emph>Text Formatting</emph> Bar (with cursor in object), click</paragraph>
-<section id="syzeich">
-<table id="tbl_id3150008">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148998" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3152352" role="paragraph" l10n="CHG" oldref="10">On <emph>Text Formatting</emph> Bar (with cursor in object), click</paragraph>
+         <section id="syzeich">
+            <table id="tbl_id3150008">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3148998" role="paragraph" l10n="E">
+<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154894">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="11">Character</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149999" role="paragraph" l10n="U" oldref="11">Character</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="schrift">
-<paragraph role="paragraph" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Format - Character - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="16">Open context menu of a row header in a database table - choose <emph>Table Format - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Format - Title - Character</emph> tab (Chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Legend - Character</emph> tab (Chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3153717" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Axis - Character</emph> tab (Chart documents)</paragraph>
+         </section>
+      </section>
+      <section id="schrift">
+         <paragraph xml-lang="en-US" id="par_id3153935" role="paragraph" l10n="U" oldref="12">Choose <emph>Format - Character - Font</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157958" role="paragraph" l10n="CHG" oldref="14">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155338" role="paragraph" l10n="U" oldref="16">Open context menu of a row header in a database table - choose <emph>Table Format - Font</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150355" role="paragraph" l10n="U" oldref="18">Choose <emph>Format - Title - Character</emph> tab (Chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149812" role="paragraph" l10n="U" oldref="19">Choose <emph>Format - Legend - Character</emph> tab (Chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153717" role="paragraph" l10n="U" oldref="20">Choose <emph>Format - Axis - Character</emph> tab (Chart documents)</paragraph>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3156306" xml-lang="en-US" l10n="U" oldref="199">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156306" role="paragraph" l10n="U" oldref="199">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
 </case>
 </switch>
 </section>
-<section id="schrifteffekt">
-<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Format - Character - Font Effects</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font Effects</emph> tab</paragraph>
+      <section id="schrifteffekt">
+         <paragraph xml-lang="en-US" id="par_id3155829" role="paragraph" l10n="U" oldref="21">Choose <emph>Format - Character - Font Effects</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font Effects</emph> tab</paragraph>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159176" role="paragraph" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
 </case>
 </switch>
 </section>
-<section id="position">
-<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="181">Choose <emph>Format - Character - Position</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="183">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Alignment</emph> tab</paragraph>
+      <section id="position">
+         <paragraph xml-lang="en-US" id="par_id3153541" role="paragraph" l10n="U" oldref="181">Choose <emph>Format - Character - Position</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159256" role="paragraph" l10n="CHG" oldref="183">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Alignment</emph> tab</paragraph>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
 </case>
 </switch>
 </section>
-<section id="asilayout">
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="186">Choose <emph>Format - Character - Asian Layout</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="CHG" oldref="188">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Layout</emph> tab</paragraph>
-</section>
-<section id="asitypo">
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="190">Choose <emph>Format - Paragraph - Asian Typography</emph> tab (not in HTML)</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="191"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cell - Asian Typography</emph> tab 
+      <section id="asilayout">
+         <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="186">Choose <emph>Format - Character - Asian Layout</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="CHG" oldref="188">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Layout</emph> tab</paragraph>
+      </section>
+      <section id="asitypo">
+         <paragraph xml-lang="en-US" id="par_id3153524" role="paragraph" l10n="U" oldref="190">Choose <emph>Format - Paragraph - Asian Typography</emph> tab (not in HTML)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="191"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cell - Asian Typography</emph> tab 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148742" xml-lang="en-US" l10n="CHG" oldref="193">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Typography</emph> tab</paragraph>
-</section>
-<section id="hyperl">
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Format - Character - Hyperlink</emph> tab</paragraph>
-</section>
-<section id="absatz">
-<paragraph role="paragraph" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Format - Paragraph</emph>
+         <paragraph xml-lang="en-US" id="par_id3148742" role="paragraph" l10n="CHG" oldref="193">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Typography</emph> tab</paragraph>
+      </section>
+      <section id="hyperl">
+         <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="26">Choose <emph>Format - Character - Hyperlink</emph> tab</paragraph>
+      </section>
+      <section id="absatz">
+         <paragraph xml-lang="en-US" id="par_id3149169" role="paragraph" l10n="U" oldref="29">Choose <emph>Format - Paragraph</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3151381" xml-lang="en-US" l10n="CHG" oldref="30">On <emph>Text Formatting</emph> bar (with cursor in object), click</paragraph>
-<section id="syabsatz">
-<table id="tbl_id3150652">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155995" xml-lang="en-US" l10n="E">
-<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150495" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3151381" role="paragraph" l10n="CHG" oldref="30">On <emph>Text Formatting</emph> bar (with cursor in object), click</paragraph>
+         <section id="syabsatz">
+            <table id="tbl_id3150652">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3155995" role="paragraph" l10n="E">
+<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150495">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="CHG" oldref="31">Paragraph</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147299" role="paragraph" l10n="CHG" oldref="31">Paragraph</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="absatzausrichtung">
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Paragraph - Alignment</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147352" xml-lang="en-US" l10n="CHG" oldref="179">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Alignment</emph> tab</paragraph>
-</section>
-<section id="einzug">
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="32">Choose <emph>Format - Paragraph - Indents &amp; Spacing</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152463" xml-lang="en-US" l10n="CHG" oldref="34">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Indents &amp; Spacing</emph> tab</paragraph>
-</section>
-<section id="tabulator">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="39">Choose <emph>Format - Paragraph - Tabs</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154833" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Tabs</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="U" oldref="43">Double-click the ruler</paragraph>
-</section>
-<section id="umrandung">
-<paragraph role="paragraph" id="par_idN109E2" xml-lang="en-US" l10n="NEW">(all options only in Writer or Calc)</paragraph>
-<paragraph role="paragraph" id="par_id3156105" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="45">Choose <emph>Format - Picture - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="53">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="CHG" oldref="55">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Borders</emph> tab 
+         </section>
+      </section>
+      <section id="absatzausrichtung">
+         <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="4">Choose <emph>Format - Paragraph - Alignment</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="179">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Alignment</emph> tab</paragraph>
+      </section>
+      <section id="einzug">
+         <paragraph xml-lang="en-US" id="par_id3154640" role="paragraph" l10n="U" oldref="32">Choose <emph>Format - Paragraph - Indents &amp; Spacing</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152463" role="paragraph" l10n="CHG" oldref="34">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Indents &amp; Spacing</emph> tab</paragraph>
+      </section>
+      <section id="tabulator">
+         <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="39">Choose <emph>Format - Paragraph - Tabs</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154833" role="paragraph" l10n="CHG" oldref="41">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Tabs</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159155" role="paragraph" l10n="U" oldref="43">Double-click the ruler</paragraph>
+      </section>
+      <section id="umrandung">
+         <paragraph xml-lang="en-US" id="par_idN109E2" role="paragraph" l10n="NEW">(all options only in Writer or Calc)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156105" role="paragraph" l10n="CHG" oldref="44">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154149" role="paragraph" l10n="CHG" oldref="45">Choose <emph>Format - Picture - Borders</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3163822" role="paragraph" l10n="U" oldref="48">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150048" role="paragraph" l10n="U" oldref="51">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149911" role="paragraph" l10n="CHG" oldref="53">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150094" role="paragraph" l10n="U" oldref="54">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154501" role="paragraph" l10n="CHG" oldref="55">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148455" role="paragraph" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Borders</emph> tab 
 </caseinline></switchinline></paragraph>
-</section>
-<section id="umrandungab">
-<paragraph role="paragraph" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="177"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Paragraph</emph> - <emph>Border</emph> tab -<emph> Spacing to contents</emph>
+      </section>
+      <section id="umrandungab">
+         <paragraph xml-lang="en-US" id="par_id3155915" role="paragraph" l10n="U" oldref="177"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Paragraph</emph> - <emph>Border</emph> tab -<emph> Spacing to contents</emph>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159130" xml-lang="en-US" l10n="U" oldref="178"><switchinline select="appl"><caseinline select="CALC">Menu<emph> Format - Page - Border - Spacing to contents</emph>
+         <paragraph xml-lang="en-US" id="par_id3159130" role="paragraph" l10n="U" oldref="178"><switchinline select="appl"><caseinline select="CALC">Menu<emph> Format - Page - Border - Spacing to contents</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="hintergrund">
-<paragraph role="paragraph" id="par_id3155853" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Character - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="59">Choose <emph>Format - Picture - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Page - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3159110" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3153532" xml-lang="en-US" l10n="CHG" oldref="67">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3144747" xml-lang="en-US" l10n="U" oldref="174">Choose <emph>Insert/Edit - Section - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3146900" xml-lang="en-US" l10n="U" oldref="71"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Background</emph> tab 
+      </section>
+      <section id="hintergrund">
+         <paragraph xml-lang="en-US" id="par_id3155853" role="paragraph" l10n="U" oldref="57">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147330" role="paragraph" l10n="U" oldref="58">Choose <emph>Format - Character - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149486" role="paragraph" l10n="CHG" oldref="59">Choose <emph>Format - Picture - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151321" role="paragraph" l10n="U" oldref="65">Choose <emph>Format - Page - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154510" role="paragraph" l10n="U" oldref="68">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159110" role="paragraph" l10n="U" oldref="69">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="CHG" oldref="67">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144747" role="paragraph" l10n="U" oldref="174">Choose <emph>Insert/Edit - Section - Background</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146900" role="paragraph" l10n="U" oldref="71"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Background</emph> tab 
 </caseinline></switchinline></paragraph>
-</section>
-<section id="seiteverwalten">
-<paragraph role="paragraph" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Format - Page - Organizer</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="CHG" oldref="74">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Organizer</emph> tab</paragraph>
-</section>
-<section id="seite">
-<paragraph role="paragraph" id="par_id3153357" xml-lang="en-US" l10n="U" oldref="75">Choose <emph>Format - Page - Page</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="CHG" oldref="77">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Page</emph> tab</paragraph>
-</section>
-<section id="kopfzeile">
-<paragraph role="paragraph" id="par_id3155515" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>Format - Page - Header</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="80">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Header</emph> tab</paragraph>
-</section>
-<section id="fusszeile">
-<paragraph role="paragraph" id="par_id3145618" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>Format - Page - Footer</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155175" xml-lang="en-US" l10n="CHG" oldref="83">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Footer</emph> tab</paragraph>
-</section>
-<section id="gestalter">
-<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
+      </section>
+      <section id="seiteverwalten">
+         <paragraph xml-lang="en-US" id="par_id3146791" role="paragraph" l10n="U" oldref="72">Choose <emph>Format - Page - Organizer</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154482" role="paragraph" l10n="CHG" oldref="74">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Organizer</emph> tab</paragraph>
+      </section>
+      <section id="seite">
+         <paragraph xml-lang="en-US" id="par_id3153357" role="paragraph" l10n="U" oldref="75">Choose <emph>Format - Page - Page</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154362" role="paragraph" l10n="CHG" oldref="77">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Page</emph> tab</paragraph>
+      </section>
+      <section id="kopfzeile">
+         <paragraph xml-lang="en-US" id="par_id3155515" role="paragraph" l10n="U" oldref="78">Choose <emph>Format - Page - Header</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148405" role="paragraph" l10n="CHG" oldref="80">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Header</emph> tab</paragraph>
+      </section>
+      <section id="fusszeile">
+         <paragraph xml-lang="en-US" id="par_id3145618" role="paragraph" l10n="U" oldref="81">Choose <emph>Format - Page - Footer</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155175" role="paragraph" l10n="CHG" oldref="83">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Footer</emph> tab</paragraph>
+      </section>
+      <section id="gestalter">
+         <paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3166447" xml-lang="en-US" l10n="U" oldref="95">F11 key</paragraph>
-<paragraph role="paragraph" id="par_id3147321" xml-lang="en-US" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
-<table id="tbl_id3163807">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148533" xml-lang="en-US" l10n="E">
-<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149568" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147321" role="paragraph" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
+         <table id="tbl_id3163807">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148533" role="paragraph" l10n="E">
+<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149568">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153534" xml-lang="en-US" l10n="CHG" oldref="86">Styles and Formatting</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="CHG" oldref="86">Styles and Formatting</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="3d">
-<paragraph role="paragraph" id="par_id3159313" xml-lang="en-US" l10n="CHG" oldref="88"><switchinline select="appl"><caseinline select="CHART">
+      </section>
+      <section id="3d">
+         <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="CHG" oldref="88"><switchinline select="appl"><caseinline select="CHART">
 </caseinline><caseinline select="CALC">
 </caseinline><caseinline select="WRITER">
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline>On the <emph>Drawing</emph> bar, click</defaultinline></switchinline></paragraph>
-<section id="sy3d">
-<table id="tbl_id3150297">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3109845" xml-lang="en-US" l10n="E">
-<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159236" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sy3d">
+            <table id="tbl_id3150297">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3109845" role="paragraph" l10n="E">
+<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3159236">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152498" xml-lang="en-US" l10n="CHG" oldref="3">
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3152498" role="paragraph" l10n="CHG" oldref="3">
 <emph>3D Effects</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="90"><variable id="3dgeometrie">Choose <emph>Format - 3D Effects - Geometry</emph> tab 
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145256" role="paragraph" l10n="CHG" oldref="90"><variable id="3dgeometrie">Open the context menu of the 3D object, choose <emph>3D Effects - Geometry</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154203" xml-lang="en-US" l10n="U" oldref="91"><variable id="3ddarstellung">Choose <emph>Format - 3D Effects - Shading</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3154203" role="paragraph" l10n="CHG" oldref="91"><variable id="3ddarstellung">Open the context menu of the 3D object, choose <emph>3D Effects - Shading</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151284" xml-lang="en-US" l10n="U" oldref="92"><variable id="3dbeleuchtung">Choose <emph>Format - 3D Effects - Illumination</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3151284" role="paragraph" l10n="CHG" oldref="92"><variable id="3dbeleuchtung">Open the context menu of the 3D object, choose <emph>3D Effects - Illumination</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152475" xml-lang="en-US" l10n="U" oldref="93"><variable id="3dtexturen">Choose <emph>Format - 3D Effects - Textures</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3152475" role="paragraph" l10n="CHG" oldref="93"><variable id="3dtexturen">Open the context menu of the 3D object, choose <emph>3D Effects - Textures</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154572" xml-lang="en-US" l10n="U" oldref="94"><variable id="3dmaterial">Choose <emph>Format - 3D Effects - Material</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3154572" role="paragraph" l10n="CHG" oldref="94"><variable id="3dmaterial">Open the context menu of the 3D object, choose <emph>3D Effects - Material</emph> tab 
 </variable></paragraph>
-<section id="numauf">
-<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="CHG" oldref="155">Choose <emph>Format - Bullets and Numbering </emph>
+      <section id="numauf">
+         <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="155">Choose <emph>Format - Bullets and Numbering </emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="CHG" oldref="156">On <emph>Formatting</emph> toolbar, click</paragraph>
-<section id="synumauf">
-<table id="tbl_id3152774">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149445" xml-lang="en-US" l10n="E">
-<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3148771" role="paragraph" l10n="CHG" oldref="156">On <emph>Formatting</emph> toolbar, click</paragraph>
+         <section id="synumauf">
+            <table id="tbl_id3152774">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149445" role="paragraph" l10n="E">
+<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149964">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="163">Bullets On/Off</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3157970" role="paragraph" l10n="U" oldref="163">Bullets On/Off</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="numoptionen">
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="CHG" oldref="157">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Options</emph> tab page</paragraph>
-<paragraph role="paragraph" id="par_id3150785" xml-lang="en-US" l10n="U" oldref="164"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+         </section>
+      </section>
+      <section id="numoptionen">
+         <paragraph xml-lang="en-US" id="par_id3149735" role="paragraph" l10n="CHG" oldref="157">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Options</emph> tab page</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150785" role="paragraph" l10n="U" oldref="164"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148420" xml-lang="en-US" l10n="CHG" oldref="165"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+         <paragraph xml-lang="en-US" id="par_id3148420" role="paragraph" l10n="CHG" oldref="165"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="numbullets">
-<paragraph role="paragraph" id="par_id3148888" xml-lang="en-US" l10n="CHG" oldref="158">Choose <emph>Format - Bullets and Numbering - Bullets</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149917" xml-lang="en-US" l10n="U" oldref="166"><switchinline select="appl"><caseinline select="IMPRESS">Open Styles and Formatting - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+      </section>
+      <section id="numbullets">
+         <paragraph xml-lang="en-US" id="par_id3148888" role="paragraph" l10n="CHG" oldref="158">Choose <emph>Format - Bullets and Numbering - Bullets</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149917" role="paragraph" l10n="U" oldref="166"><switchinline select="appl"><caseinline select="IMPRESS">Open Styles and Formatting - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154930" xml-lang="en-US" l10n="CHG" oldref="167"><switchinline select="appl"><caseinline select="WRITER">Open Styles and Formatting - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+         <paragraph xml-lang="en-US" id="par_id3154930" role="paragraph" l10n="CHG" oldref="167"><switchinline select="appl"><caseinline select="WRITER">Open Styles and Formatting - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="numnumerierungsart">
-<paragraph role="paragraph" id="par_id3150862" xml-lang="en-US" l10n="CHG" oldref="159">Choose <emph>Format - Bullets and Numbering - Numbering</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="U" oldref="168"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+      </section>
+      <section id="numnumerierungsart">
+         <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="159">Choose <emph>Format - Bullets and Numbering - Numbering</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155378" role="paragraph" l10n="U" oldref="168"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156011" xml-lang="en-US" l10n="CHG" oldref="169"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+         <paragraph xml-lang="en-US" id="par_id3156011" role="paragraph" l10n="CHG" oldref="169"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="numnumerierung">
-<paragraph role="paragraph" id="par_id3155848" xml-lang="en-US" l10n="CHG" oldref="160">Choose <emph>Format - Bullets and Numbering - Outline</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148733" xml-lang="en-US" l10n="CHG" oldref="170"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id0611200904324832" role="paragraph" l10n="NEW"><variable id="graphics">Choose <emph>Format - Bullets and Numbering - Graphics</emph> tab
+</variable></paragraph>
+      <section id="numnumerierung">
+         <paragraph xml-lang="en-US" id="par_id3155848" role="paragraph" l10n="CHG" oldref="160">Choose <emph>Format - Bullets and Numbering - Outline</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148733" role="paragraph" l10n="CHG" oldref="170"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="numposition">
-<paragraph role="paragraph" id="par_id3156658" xml-lang="en-US" l10n="CHG" oldref="162">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Position</emph> tab page</paragraph>
-<paragraph role="paragraph" id="par_id3156170" xml-lang="en-US" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Tools - Outline Numbering - Position</emph> tab 
+      </section>
+      <section id="numposition">
+         <paragraph xml-lang="en-US" id="par_id3156658" role="paragraph" l10n="CHG" oldref="162">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Position</emph> tab page</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156170" role="paragraph" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Tools - Outline Numbering - Position</emph> tab 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153812" xml-lang="en-US" l10n="CHG" oldref="173"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting - Numbering Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>
+         <paragraph xml-lang="en-US" id="par_id3153812" role="paragraph" l10n="CHG" oldref="173"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting - Numbering Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>
 </caseinline></switchinline></paragraph>
-</section>
-<section id="grafikzuschn">
-<paragraph role="paragraph" id="par_id3151332" xml-lang="en-US" l10n="CHG" oldref="194"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Picture </emph>- <emph>Crop</emph> tab 
+      </section>
+      <section id="grafikzuschn">
+         <paragraph xml-lang="en-US" id="par_id3151332" role="paragraph" l10n="CHG" oldref="194"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Picture </emph>- <emph>Crop</emph> tab 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153317" xml-lang="en-US" l10n="CHG" oldref="198"><switchinline select="appl"><caseinline select="WRITER">
+         <paragraph xml-lang="en-US" id="par_id3153317" role="paragraph" l10n="CHG" oldref="198"><switchinline select="appl"><caseinline select="WRITER">
 </caseinline><defaultinline>Icon on the <emph>Picture</emph> toolbar:</defaultinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER">
 </case>
 <default>
 <table id="tbl_id3154374">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149953" xml-lang="en-US" l10n="E">
-<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155092" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="E">
+<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155092">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153695" xml-lang="en-US" l10n="U" oldref="209">Crop</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153695" role="paragraph" l10n="U" oldref="209">Crop</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
 </default>
 </switch>
 </section>
-<section id="grossklein">
-<paragraph role="paragraph" id="par_id3151254" xml-lang="en-US" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
+      <section id="grossklein">
+         <paragraph xml-lang="en-US" id="par_id3151254" role="paragraph" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3159624" xml-lang="en-US" l10n="U" oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
+         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
 </paragraph>
-</section>
-<section id="ruby">
-<paragraph role="paragraph" id="par_id3153579" xml-lang="en-US" l10n="CHG" oldref="197">Menu <emph>Format - Asian phonetic guide</emph>
+      </section>
+      <section id="ruby">
+         <paragraph xml-lang="en-US" id="par_id3153579" role="paragraph" l10n="CHG" oldref="197">Menu <emph>Format - Asian phonetic guide</emph>
 </paragraph>
-</section>
-</body>
-</helpdocument>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 1ab3dfc39d..6e26a5989c 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00040501.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index 7e0eff3118..9851cd999b 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,522 +32,502 @@
  
 	
 <meta>
-<topic id="textshared0000040502xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Format Menu</title>
-<filename>/text/shared/00/00040502.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<section id="linie1">
-<paragraph role="paragraph" id="par_id3146857" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Format - Line</emph> (Impress and Draw)<comment>i64150</comment></paragraph>
-<paragraph role="paragraph" id="par_id366527" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Object - Line </emph>(Calc)</paragraph>
-<paragraph role="paragraph" id="par_id3835261" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Graphic - Line </emph>(Writer)</paragraph>
-<paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="CHG" oldref="3">On <emph>Line and Filling</emph> Bar, click</paragraph>
-<section id="sylinie">
-<table id="tbl_id3145160">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148889" xml-lang="en-US" l10n="E">
-<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150669" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      <topic id="textshared0000040502xml" indexer="exclude">
+         <title xml-lang="en-US" id="tit">Format Menu</title>
+         <filename>/text/shared/00/00040502.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3149741" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
+      <section id="linie1">
+         <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph" l10n="CHG" oldref="2">Choose <emph>Format - Line</emph> (Impress and Draw)<comment>i64150</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id366527" role="paragraph" l10n="CHG">Choose <emph>Format - Object - Line </emph>(Writer)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3835261" role="paragraph" l10n="CHG">Choose <emph>Format - Graphic - Line </emph>(Calc)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148668" role="paragraph" l10n="CHG" oldref="3">On <emph>Line and Filling</emph> Bar, click</paragraph>
+         <section id="sylinie">
+            <table id="tbl_id3145160">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3148889" role="paragraph" l10n="E">
+<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150669">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="4">Line</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3159147" role="paragraph" l10n="U" oldref="4">Line</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="linie2">
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+         </section>
+      </section>
+      <section id="linie2">
+         <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Line</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Line</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Format - Title - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Legend - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Format - Axis - Line</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Format - Grid - Line</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Format - Chart Wall - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Format - Chart Floor - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Format - Chart Area - Borders</emph> tab (charts)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3151293" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+</caseinline></switchinline><emph>Line - Line</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Line</emph> tab (presentation documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156023" role="paragraph" l10n="U" oldref="8">Choose <emph>Format - Title - Borders</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153061" role="paragraph" l10n="U" oldref="9">Choose <emph>Format - Legend - Borders</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="10">Choose <emph>Format - Axis - Line</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="U" oldref="11">Choose <emph>Format - Grid - Line</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="12">Choose <emph>Format - Chart Wall - Borders</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="13">Choose <emph>Format - Chart Floor - Borders</emph> tab (charts)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="U" oldref="14">Choose <emph>Format - Chart Area - Borders</emph> tab (charts)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3151293" role="paragraph" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Line Styles</emph> tab 
+</caseinline></switchinline><emph>Line - Line Styles</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149317" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <paragraph xml-lang="en-US" id="par_id3149317" role="paragraph" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Arrow Styles</emph> tab 
+</caseinline></switchinline><emph>Line - Arrow Styles</emph> tab 
 </variable></paragraph>
-<section id="flaeche1">
-<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <section id="flaeche1">
+         <paragraph xml-lang="en-US" id="par_id3156082" role="paragraph" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="CHG" oldref="18">On <emph>Line and Filling</emph> Bar, click</paragraph>
-<section id="syflaeche">
-<table id="tbl_id3145174">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="E">
-<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150868" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+</caseinline></switchinline><emph>Area</emph>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="18">On <emph>Line and Filling</emph> Bar, click</paragraph>
+         <section id="syflaeche">
+            <table id="tbl_id3145174">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3156424" role="paragraph" l10n="E">
+<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150868">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="19">Area</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150393" role="paragraph" l10n="U" oldref="19">Area</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="flaeche2">
-<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+         </section>
+      </section>
+      <section id="flaeche2">
+         <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Area</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145607" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3152922" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Format - Title - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3157894" xml-lang="en-US" l10n="U" oldref="24">Choose <emph>Format - Legend - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3144444" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156543" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150685" xml-lang="en-US" l10n="U" oldref="27">Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="120">Choose <emph>Format - Page - Background</emph> tab (in $[officename] Impress and $[officename] Draw)</paragraph>
-</section>
-<section id="farben">
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+</caseinline></switchinline><emph>Area - Area</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145607" role="paragraph" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152922" role="paragraph" l10n="U" oldref="23">Choose <emph>Format - Title - Area</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157894" role="paragraph" l10n="U" oldref="24">Choose <emph>Format - Legend - Area</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144444" role="paragraph" l10n="U" oldref="25">Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156543" role="paragraph" l10n="U" oldref="26">Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150685" role="paragraph" l10n="U" oldref="27">Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="120">Choose <emph>Format - Page - Background</emph> tab (in $[officename] Impress and $[officename] Draw)</paragraph>
+      </section>
+      <section id="farben">
+         <paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Colors</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Tools - Options - $[officename] - Colors</emph> tab</paragraph>
-</section>
-<section id="trans">
-<paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Area - Transparency</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3151117" xml-lang="en-US" l10n="U" oldref="143">Choose <emph>Format - Chart Wall - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="144">Choose <emph>Format - Chart Area - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="145">Choose <emph>Format - Chart Floor - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="146">Choose <emph>Format - Title - All Titles - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="147">Choose <emph>Format - Title - Main Title - Transparency </emph>tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3148556" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Format - Title - Subtitle - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="149">Choose <emph>Format - Title - Title (X Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="150">Choose <emph>Format - Title - Title (Y Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="151">Choose <emph>Format - Title - Title (Z Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="152">Choose <emph>Format - Object Properties - Data Point - Transparency</emph> - tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="153">Choose <emph>Format - Object Properties - Data Series - Transparency</emph> tab (chart documents)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+</caseinline></switchinline><emph>Area - Colors</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph> tab</paragraph>
+      </section>
+      <section id="trans">
+         <paragraph xml-lang="en-US" id="par_id3154985" role="paragraph" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="142">Choose <emph>Format - Area - Transparency</emph> tab (presentation documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151117" role="paragraph" l10n="U" oldref="143">Choose <emph>Format - Chart Wall - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147326" role="paragraph" l10n="U" oldref="144">Choose <emph>Format - Chart Area - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154920" role="paragraph" l10n="U" oldref="145">Choose <emph>Format - Chart Floor - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145591" role="paragraph" l10n="U" oldref="146">Choose <emph>Format - Title - All Titles - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145750" role="paragraph" l10n="U" oldref="147">Choose <emph>Format - Title - Main Title - Transparency </emph>tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148556" role="paragraph" l10n="U" oldref="148">Choose <emph>Format - Title - Subtitle - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="U" oldref="149">Choose <emph>Format - Title - Title (X Axis) - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150487" role="paragraph" l10n="U" oldref="150">Choose <emph>Format - Title - Title (Y Axis) - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="U" oldref="151">Choose <emph>Format - Title - Title (Z Axis) - Transparency</emph> tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151113" role="paragraph" l10n="U" oldref="152">Choose <emph>Format - Object Properties - Data Point - Transparency</emph> - tab (chart documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149266" role="paragraph" l10n="U" oldref="153">Choose <emph>Format - Object Properties - Data Series - Transparency</emph> tab (chart documents)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Shadow</emph> tab 
+</caseinline></switchinline><emph>Area - Shadow</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <paragraph xml-lang="en-US" id="par_id3147441" role="paragraph" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Gradients</emph> tab 
+</caseinline></switchinline><emph>Area - Gradients</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Hatching</emph> tab 
+</caseinline></switchinline><emph>Area - Hatching</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Bitmaps</emph> tab 
+</caseinline></switchinline><emph>Area - Bitmaps</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+      <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152810" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+      <paragraph xml-lang="en-US" id="par_id3152810" role="paragraph" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
-<emph>- Text</emph> tab 
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline><emph>- Text</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151060" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+      <paragraph xml-lang="en-US" id="par_id3151060" role="paragraph" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
-<emph>- Text Animation</emph> tab 
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline><emph>- Text Animation</emph> tab 
 </variable></paragraph>
-<section id="position1">
-<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <section id="position1">
+         <paragraph xml-lang="en-US" id="par_id3149911" role="paragraph" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="89"><switchinline select="appl"><caseinline select="DRAW">F4 key 
+</caseinline></switchinline><emph>Position and Size</emph>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156286" role="paragraph" l10n="U" oldref="89"><switchinline select="appl"><caseinline select="DRAW">F4 key 
 </caseinline><caseinline select="IMPRESS">F4 key 
 </caseinline></switchinline></paragraph>
-</section>
-<section id="syposition">
-<table id="Table1">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153052" xml-lang="en-US" l10n="E">
-<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150965" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      </section>
+      <section id="syposition">
+         <table id="Table1">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153052" role="paragraph" l10n="E">
+<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150965">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149938" xml-lang="en-US" l10n="U" oldref="39">Position and Size<comment>UFI: in Form Design toolbar</comment></paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149938" role="paragraph" l10n="U" oldref="39">Position and Size<comment>UFI: in Form Design toolbar</comment></paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="adngpb">
-<paragraph role="paragraph" id="par_id3148833" xml-lang="en-US" l10n="CHG" oldref="170">Open the context menu for the object - choose <emph>Name</emph>
+      </section>
+      <section id="adngpb">
+         <paragraph xml-lang="en-US" id="par_id3148833" role="paragraph" l10n="CHG" oldref="170">Open the context menu for the object - choose <emph>Name</emph>
 </paragraph>
-</section>
-<section id="descript">
-<paragraph role="paragraph" id="par_id411999" xml-lang="en-US" l10n="NEW">Open the context menu for the object - choose <emph>Description</emph>
+      </section>
+      <section id="descript">
+         <paragraph xml-lang="en-US" id="par_id411999" role="paragraph" l10n="NEW">Open the context menu for the object - choose <emph>Description</emph>
 </paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3153099" xml-lang="en-US" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153099" role="paragraph" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Position and Size</emph> tab 
+</caseinline></switchinline><emph>Position and Size - Position and Size</emph> tab 
 </variable></paragraph>
-<section id="drehung">
-<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <section id="drehung">
+         <paragraph xml-lang="en-US" id="par_id3152973" role="paragraph" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Rotation</emph> tab</paragraph>
-<table id="tbl_id3147496">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148495" xml-lang="en-US" l10n="E">
-<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146898" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+</caseinline></switchinline><emph>Position and Size - Rotation</emph> tab</paragraph>
+         <table id="tbl_id3147496">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148495" role="paragraph" l10n="E">
+<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3146898">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146790" xml-lang="en-US" l10n="U" oldref="44">Rotate</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146790" role="paragraph" l10n="U" oldref="44">Rotate</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145666" role="paragraph" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Slant &amp; Corner Radius</emph> tab 
+</caseinline></switchinline><emph>Position and Size - Slant &amp; Corner Radius</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146081" xml-lang="en-US" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+      <paragraph xml-lang="en-US" id="par_id3146081" role="paragraph" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
 </caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts) 
+</caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts) 
 </variable></paragraph>
-<section id="punkte">
-<paragraph role="paragraph" id="par_id3083283" xml-lang="en-US" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
+      <section id="punkte">
+         <paragraph xml-lang="en-US" id="par_id3083283" role="paragraph" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3145642" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="DRAW">Open context menu - choose <emph>Edit Points</emph>
+         <paragraph xml-lang="en-US" id="par_id3145642" role="paragraph" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="DRAW">Open context menu - choose <emph>Edit Points</emph>
 </caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">Open context menu - choose <emph>Edit Points</emph>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149019" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="appl"><caseinline select="DRAW">F8 key 
+         <paragraph xml-lang="en-US" id="par_id3149019" role="paragraph" l10n="U" oldref="90"><switchinline select="appl"><caseinline select="DRAW">F8 key 
 </caseinline><caseinline select="IMPRESS">F8 key 
 </caseinline></switchinline></paragraph>
-<section id="sypunktebearbeiten">
-<table id="tbl_id3145618">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150044" xml-lang="en-US" l10n="E">
-<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147100" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sypunktebearbeiten">
+            <table id="tbl_id3145618">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150044" role="paragraph" l10n="E">
+<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147100">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="49">Edit Points</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153966" role="paragraph" l10n="U" oldref="49">Edit Points</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="schrift2">
-<paragraph role="paragraph" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Character</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3145229" xml-lang="en-US" l10n="U" oldref="121">Open context menu - choose <emph>Character</emph>
+         </section>
+      </section>
+      <section id="schrift2">
+         <paragraph xml-lang="en-US" id="par_id3151248" role="paragraph" l10n="U" oldref="50">Choose <emph>Format - Character</emph> (drawing functions)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145229" role="paragraph" l10n="U" oldref="121">Open context menu - choose <emph>Character</emph>
 </paragraph>
-</section>
-<section id="groesse">
-<paragraph role="paragraph" id="par_id3151342" xml-lang="en-US" l10n="U" oldref="122">Open context menu - choose <emph>Size</emph>
+      </section>
+      <section id="groesse">
+         <paragraph xml-lang="en-US" id="par_id3151342" role="paragraph" l10n="U" oldref="122">Open context menu - choose <emph>Size</emph>
 </paragraph>
-</section>
-<section id="stil">
-<paragraph role="paragraph" id="par_id3149255" xml-lang="en-US" l10n="U" oldref="123">Open context menu - choose <emph>Style</emph>
+      </section>
+      <section id="stil">
+         <paragraph xml-lang="en-US" id="par_id3149255" role="paragraph" l10n="U" oldref="123">Open context menu - choose <emph>Style</emph>
 </paragraph>
-</section>
-<section id="stilfett">
-<paragraph role="paragraph" id="par_id3155177" xml-lang="en-US" l10n="U" oldref="124">Open context menu - choose <emph>Style - Bold</emph>
+      </section>
+      <section id="stilfett">
+         <paragraph xml-lang="en-US" id="par_id3155177" role="paragraph" l10n="U" oldref="124">Open context menu - choose <emph>Style - Bold</emph>
 </paragraph>
-<section id="syfett">
-<table id="tbl_id3147252">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145766" xml-lang="en-US" l10n="E">
-<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3156558" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="syfett">
+            <table id="tbl_id3147252">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145766" role="paragraph" l10n="E">
+<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3156558">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="55">Bold</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147001" role="paragraph" l10n="U" oldref="55">Bold</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="stilkursiv">
-<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="125">Open context menu - choose <emph>Style - Italic</emph>
+         </section>
+      </section>
+      <section id="stilkursiv">
+         <paragraph xml-lang="en-US" id="par_id3151276" role="paragraph" l10n="U" oldref="125">Open context menu - choose <emph>Style - Italic</emph>
 </paragraph>
-<section id="sykursiv">
-<table id="tbl_id3144416">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159091" xml-lang="en-US" l10n="E">
-<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3155578" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sykursiv">
+            <table id="tbl_id3144416">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3159091" role="paragraph" l10n="E">
+<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3155578">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150234" xml-lang="en-US" l10n="U" oldref="58">Italic</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150234" role="paragraph" l10n="U" oldref="58">Italic</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="stilunter">
-<paragraph role="paragraph" id="par_id3154589" xml-lang="en-US" l10n="U" oldref="126">open context menu - choose <emph>Style - Underline</emph>
-</paragraph>
-<section id="syunterstreichen">
-<table id="tbl_id3148875">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145223" xml-lang="en-US" l10n="E">
-<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3151068" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         </section>
+      </section>
+      <section id="stilunter">
+         <paragraph xml-lang="en-US" id="par_id3154589" role="paragraph" l10n="U" oldref="126">Open context menu - choose <emph>Style - Underline</emph>
+         </paragraph>
+         <section id="syunterstreichen">
+            <table id="tbl_id3148875">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145223" role="paragraph" l10n="E">
+<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3151068">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154715" xml-lang="en-US" l10n="U" oldref="88">Underline</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3154715" role="paragraph" l10n="U" oldref="88">Underline</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="stildurch">
-<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="127">Open context menu - choose <emph>Style - Strikethrough</emph>
+         </section>
+      </section>
+      <section id="stildurch">
+         <paragraph xml-lang="en-US" id="par_id3145131" role="paragraph" l10n="U" oldref="127">Open context menu - choose <emph>Style - Strikethrough</emph>
 </paragraph>
-</section>
-<section id="stilschatten">
-<paragraph role="paragraph" id="par_id3158214" xml-lang="en-US" l10n="U" oldref="128">Open context menu - choose <emph>Style - Shadow</emph>
+      </section>
+      <section id="stilschatten">
+         <paragraph xml-lang="en-US" id="par_id3158214" role="paragraph" l10n="U" oldref="128">Open context menu - choose <emph>Style - Shadow</emph>
 </paragraph>
-</section>
-<section id="stilkontur">
-<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="129">Open context menu - choose <emph>Style - Contour</emph>
+      </section>
+      <section id="stilkontur">
+         <paragraph xml-lang="en-US" id="par_id3150207" role="paragraph" l10n="U" oldref="129">Open context menu - choose <emph>Style - Contour</emph>
 </paragraph>
-</section>
-<section id="stilhoch">
-<paragraph role="paragraph" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="130">Open context menu - choose <emph>Style - Superscript</emph>
+      </section>
+      <section id="stilhoch">
+         <paragraph xml-lang="en-US" id="par_id3154383" role="paragraph" l10n="U" oldref="130">Open context menu - choose <emph>Style - Superscript</emph>
 </paragraph>
-</section>
-<section id="stiltief">
-<paragraph role="paragraph" id="par_id3152767" xml-lang="en-US" l10n="U" oldref="131">Open context menu - choose <emph>Style - Subscript</emph>
+      </section>
+      <section id="stiltief">
+         <paragraph xml-lang="en-US" id="par_id3152767" role="paragraph" l10n="U" oldref="131">Open context menu - choose <emph>Style - Subscript</emph>
 </paragraph>
-</section>
-<section id="zeilenabstand">
-<paragraph role="paragraph" id="par_id3155377" xml-lang="en-US" l10n="U" oldref="132">Open context menu - choose <emph>Line Spacing</emph>
+      </section>
+      <section id="zeilenabstand">
+         <paragraph xml-lang="en-US" id="par_id3155377" role="paragraph" l10n="U" oldref="132">Open context menu - choose <emph>Line Spacing</emph>
 </paragraph>
-</section>
-<section id="zeilenabstandein">
-<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="U" oldref="133">Open context menu - choose <emph>Line Spacing - Single</emph>
+      </section>
+      <section id="zeilenabstandein">
+         <paragraph xml-lang="en-US" id="par_id3154475" role="paragraph" l10n="U" oldref="133">Open context menu - choose <emph>Line Spacing - Single</emph>
 </paragraph>
-</section>
-<section id="zeilenabstandeinsfuenf">
-<paragraph role="paragraph" id="par_id3150478" xml-lang="en-US" l10n="U" oldref="134">Open context menu - choose <emph>Line Spacing - 1.5 Lines</emph>
+      </section>
+      <section id="zeilenabstandeinsfuenf">
+         <paragraph xml-lang="en-US" id="par_id3150478" role="paragraph" l10n="U" oldref="134">Open context menu - choose <emph>Line Spacing - 1.5 Lines</emph>
 </paragraph>
-</section>
-<section id="zeilenabstandzwei">
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="135">Open context menu - choose <emph>Line Spacing - Double</emph>
+      </section>
+      <section id="zeilenabstandzwei">
+         <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="135">Open context menu - choose <emph>Line Spacing - Double</emph>
 </paragraph>
-</section>
-<section id="linkstext">
-<paragraph role="paragraph" id="par_id3146978" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Format - Alignment - Left</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="U" oldref="136">Open context menu - choose <emph>Alignment - Left</emph>
+      </section>
+      <section id="linkstext">
+         <paragraph xml-lang="en-US" id="par_id3146978" role="paragraph" l10n="U" oldref="69">Choose <emph>Format - Alignment - Left</emph> (drawing functions)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153009" role="paragraph" l10n="U" oldref="136">Open context menu - choose <emph>Alignment - Left</emph>
 </paragraph>
-<section id="sylinksbuendig">
-<table id="tbl_id3152453">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="E">
-<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155370" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sylinksbuendig">
+            <table id="tbl_id3152453">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="E">
+<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155370">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="71">Align Left</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151336" role="paragraph" l10n="U" oldref="71">Align Left</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="rechtstext">
-<paragraph role="paragraph" id="par_id3155823" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Format - Alignment - Right</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="U" oldref="137">Open context menu - choose <emph>Alignment - Right</emph>
+         </section>
+      </section>
+      <section id="rechtstext">
+         <paragraph xml-lang="en-US" id="par_id3155823" role="paragraph" l10n="U" oldref="72">Choose <emph>Format - Alignment - Right</emph> (drawing functions)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155762" role="paragraph" l10n="U" oldref="137">Open context menu - choose <emph>Alignment - Right</emph>
 </paragraph>
-<section id="syrechtsbuendig">
-<table id="tbl_id3149949">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="E">
-<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154421" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="syrechtsbuendig">
+            <table id="tbl_id3149949">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149408" role="paragraph" l10n="E">
+<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154421">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153607" xml-lang="en-US" l10n="U" oldref="74">Align Right</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153607" role="paragraph" l10n="U" oldref="74">Align Right</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="zentrierttext">
-<paragraph role="paragraph" id="par_id3149189" xml-lang="en-US" l10n="U" oldref="75">Choose <emph>Format - Alignment - Centered</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3154624" xml-lang="en-US" l10n="U" oldref="138">Open context menu - choose <emph>Alignment - Center</emph>
+         </section>
+      </section>
+      <section id="zentrierttext">
+         <paragraph xml-lang="en-US" id="par_id3149189" role="paragraph" l10n="U" oldref="75">Choose <emph>Format - Alignment - Centered</emph> (drawing functions)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154624" role="paragraph" l10n="U" oldref="138">Open context menu - choose <emph>Alignment - Center</emph>
 </paragraph>
-<section id="syzentriert">
-<table id="tbl_id3151270">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="E">
-<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149757" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="syzentriert">
+            <table id="tbl_id3151270">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153815" role="paragraph" l10n="E">
+<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149757">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153076" xml-lang="en-US" l10n="U" oldref="77"><switchinline select="appl"><caseinline select="CALC">Align Center Horizontally 
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153076" role="paragraph" l10n="U" oldref="77"><switchinline select="appl"><caseinline select="CALC">Align Center Horizontally 
 </caseinline><defaultinline>Centered</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="blocktext">
-<paragraph role="paragraph" id="par_id3146151" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>Format - Alignment - Justified</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3168612" xml-lang="en-US" l10n="U" oldref="139">Open context menu - choose <emph>Alignment - Justified</emph>
+         </section>
+      </section>
+      <section id="blocktext">
+         <paragraph xml-lang="en-US" id="par_id3146151" role="paragraph" l10n="U" oldref="78">Choose <emph>Format - Alignment - Justified</emph> (drawing functions)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3168612" role="paragraph" l10n="U" oldref="139">Open context menu - choose <emph>Alignment - Justified</emph>
 </paragraph>
-<section id="syblocksatz">
-<table id="tbl_id3154828">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156189" xml-lang="en-US" l10n="E">
-<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145308" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="syblocksatz">
+            <table id="tbl_id3154828">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3156189" role="paragraph" l10n="E">
+<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145308">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153131" xml-lang="en-US" l10n="U" oldref="80">Justified</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153131" role="paragraph" l10n="U" oldref="80">Justified</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3150527" xml-lang="en-US" l10n="CHG" oldref="81"><variable id="font">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar 
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150527" role="paragraph" l10n="CHG" oldref="81"><variable id="font">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar 
 </variable></paragraph>
-<section id="gruppe">
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="103">Choose <emph>Format - Group</emph>
+      <section id="gruppe">
+         <paragraph xml-lang="en-US" id="par_id3144503" role="paragraph" l10n="U" oldref="103">Choose <emph>Format - Group</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="140">Open context menu - choose <emph>Group</emph>
+         <paragraph xml-lang="en-US" id="par_id3154854" role="paragraph" l10n="U" oldref="140">Open context menu - choose <emph>Group</emph>
 </paragraph>
-</section>
-<section id="gruppie">
-<paragraph role="paragraph" id="par_id3157985" xml-lang="en-US" l10n="U" oldref="83">Choose <emph>Format - Group - Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U" oldref="104">Choose <emph>Modify - Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149508" xml-lang="en-US" l10n="U" oldref="84">Open context menu - choose <emph>Group - Group</emph> (form objects)</paragraph>
-<section id="sygruppieren">
-<table id="tbl_id3143218">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146858" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      </section>
+      <section id="gruppie">
+         <paragraph xml-lang="en-US" id="par_id3157985" role="paragraph" l10n="U" oldref="83">Choose <emph>Format - Group - Group</emph> (text documents, spreadsheets)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157980" role="paragraph" l10n="U" oldref="104">Choose <emph>Modify - Group</emph> (drawing documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149508" role="paragraph" l10n="U" oldref="84">Open context menu - choose <emph>Group - Group</emph> (form objects)</paragraph>
+         <section id="sygruppieren">
+            <table id="tbl_id3143218">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3146858" role="paragraph" l10n="E">
+<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154344">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149593" xml-lang="en-US" l10n="U" oldref="113">Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149593" role="paragraph" l10n="U" oldref="113">Group</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="gruppieauf">
-<paragraph role="paragraph" id="par_id3153023" xml-lang="en-US" l10n="U" oldref="85">Choose <emph>Format - Group - Ungroup</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3163378" xml-lang="en-US" l10n="U" oldref="105">Choose <emph>Modify - Ungroup</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="86">Open context menu - choose <emph>Ungroup</emph>
+         </section>
+      </section>
+      <section id="gruppieauf">
+         <paragraph xml-lang="en-US" id="par_id3153023" role="paragraph" l10n="U" oldref="85">Choose <emph>Format - Group - Ungroup</emph> (text documents, spreadsheets)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3163378" role="paragraph" l10n="U" oldref="105">Choose <emph>Modify - Ungroup</emph> (drawing documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156038" role="paragraph" l10n="U" oldref="86">Open context menu - choose <emph>Ungroup</emph>
 </paragraph>
-<section id="sygrupaufh">
-<table id="tbl_id3149971">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="E">
-<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150831" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sygrupaufh">
+            <table id="tbl_id3149971">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151300" role="paragraph" l10n="E">
+<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150831">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="115">Ungroup</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3146894" role="paragraph" l10n="U" oldref="115">Ungroup</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="adngvl">
-<paragraph role="paragraph" id="par_id3153109" xml-lang="en-US" l10n="U" oldref="106">Choose <emph>Format - Group - Exit Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3145678" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Modify - Exit Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3152367" xml-lang="en-US" l10n="U" oldref="108">Open context menu - choose <emph>Exit Group</emph>
+         </section>
+      </section>
+      <section id="adngvl">
+         <paragraph xml-lang="en-US" id="par_id3153109" role="paragraph" l10n="U" oldref="106">Choose <emph>Format - Group - Exit Group</emph> (text documents, spreadsheets)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145678" role="paragraph" l10n="U" oldref="107">Choose <emph>Modify - Exit Group</emph> (drawing documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152367" role="paragraph" l10n="U" oldref="108">Open context menu - choose <emph>Exit Group</emph>
 </paragraph>
-<section id="sygrupverl">
-<table id="tbl_id3152538">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3158402" xml-lang="en-US" l10n="E">
-<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149422" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sygrupverl">
+            <table id="tbl_id3152538">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3158402" role="paragraph" l10n="E">
+<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149422">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155347" xml-lang="en-US" l10n="U" oldref="117">Exit Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3155347" role="paragraph" l10n="U" oldref="117">Exit Group</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="adngte">
-<paragraph role="paragraph" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="109">Choose <emph>Format - Group - Enter Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3145354" xml-lang="en-US" l10n="U" oldref="110">Choose <emph>Modify - Enter Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149946" xml-lang="en-US" l10n="U" oldref="111">Open context menu - choose <emph>Enter Group</emph>
+         </section>
+      </section>
+      <section id="adngte">
+         <paragraph xml-lang="en-US" id="par_id3149129" role="paragraph" l10n="U" oldref="109">Choose <emph>Format - Group - Enter Group</emph> (text documents, spreadsheets)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145354" role="paragraph" l10n="U" oldref="110">Choose <emph>Modify - Enter Group</emph> (drawing documents)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149946" role="paragraph" l10n="U" oldref="111">Open context menu - choose <emph>Enter Group</emph>
 </paragraph>
-<section id="sygrupbetr">
-<table id="tbl_id3149546">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152388" xml-lang="en-US" l10n="E">
-<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149900" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="sygrupbetr">
+            <table id="tbl_id3149546">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3152388" role="paragraph" l10n="E">
+<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149900">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152547" xml-lang="en-US" l10n="U" oldref="119">Enter Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3152547" role="paragraph" l10n="U" oldref="119">Enter Group</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-</body>
-</helpdocument>
+         </section>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00040503.xhp b/helpcontent2/source/text/shared/00/00040503.xhp
index 2e7a3bb859..93a0bff4c8 100644
--- a/helpcontent2/source/text/shared/00/00040503.xhp
+++ b/helpcontent2/source/text/shared/00/00040503.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00040503.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01000000.xhp b/helpcontent2/source/text/shared/00/01000000.xhp
index 8c7eddb5a9..1f5ebcc1a8 100644
--- a/helpcontent2/source/text/shared/00/01000000.xhp
+++ b/helpcontent2/source/text/shared/00/01000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01010000.xhp b/helpcontent2/source/text/shared/00/01010000.xhp
index 7e43d0ef62..0dcc4be24d 100755
--- a/helpcontent2/source/text/shared/00/01010000.xhp
+++ b/helpcontent2/source/text/shared/00/01010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_GALLERY_MN_PREVIEW" id="bm_id3156560" localize="false"/>
 <paragraph role="paragraph" id="par_id3158428" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_GALLERY_MN_PREVIEW">The<emph> Preview </emph>command displays the selected graphic.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_GALLERY_TITLE" id="bm_id3152926" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE" id="bm_id3152551" localize="false"/>
+<!-- removed HID SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE -->
 <paragraph role="paragraph" id="par_id3154522" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE">Assigns a title to a selected Gallery object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_GALLERY_MN_DELETE" id="bm_id3155892" localize="false"/>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_GALLERY_MN_DELETE">Deletes the selected graphic after confirmation.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/01020000.xhp b/helpcontent2/source/text/shared/00/01020000.xhp
index cbd99b716a..5b5f162ac6 100755
--- a/helpcontent2/source/text/shared/00/01020000.xhp
+++ b/helpcontent2/source/text/shared/00/01020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01050000.xhp b/helpcontent2/source/text/shared/00/01050000.xhp
index 6e5869911f..d1b38a1422 100644
--- a/helpcontent2/source/text/shared/00/01050000.xhp
+++ b/helpcontent2/source/text/shared/00/01050000.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,26 +27,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0001050000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">General</title>
 <filename>/text/shared/00/01050000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T12:28:20">UFI: test what must remain, delete the rest
-YJ: checked</lastedited>
-</history>
 </meta>
 <body>
 <section id="allgemein">
-<bookmark xml-lang="en-US" branch="hid/SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL" id="bm_id3151370" localize="false"/>
+<!-- removed HID SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL -->
 <paragraph role="heading" id="hd_id3158397" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/00/01050000.xhp" name="General">General</link><comment>UFI: this is a tab page of the Gallery. Deleted everything else</comment></paragraph>
-<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL">The<emph> General </emph>tab page lists the general properties of the current theme.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The<emph> General </emph>tab page lists the general properties of the current theme.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PROPERTIES_GENERAL" id="bm_id3152895" localize="false"/>
 <paragraph role="heading" id="hd_id3150264" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3154094" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME">Displays the name of the theme.</ahelp> If no name has been assigned, you can type a new name in the text box.</paragraph>
 <paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">Type</paragraph>
diff --git a/helpcontent2/source/text/shared/00/icon_alt.xhp b/helpcontent2/source/text/shared/00/icon_alt.xhp
index da878a72ff..0d425e9a02 100644
--- a/helpcontent2/source/text/shared/00/icon_alt.xhp
+++ b/helpcontent2/source/text/shared/00/icon_alt.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: icon_alt.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index a9c8e493ad..098d531d6e 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -93,4 +89,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/01/01010000.xhp b/helpcontent2/source/text/shared/01/01010000.xhp
index ac8adfc30d..9ba92afe8c 100644
--- a/helpcontent2/source/text/shared/01/01010000.xhp
+++ b/helpcontent2/source/text/shared/01/01010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010001.xhp b/helpcontent2/source/text/shared/01/01010001.xhp
index 739fd843fc..c55928fe8e 100755
--- a/helpcontent2/source/text/shared/01/01010001.xhp
+++ b/helpcontent2/source/text/shared/01/01010001.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010001.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index ea9b5c99c3..dfaa60e9ec 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -143,15 +140,15 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_MANAGE" id="bm_id3153188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE" id="bm_id3153188" localize="false"/>
 <paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="U" oldref="111">Organize</paragraph>
 <paragraph role="paragraph" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_MANAGE">Adds, removes, or rearranges templates or sample documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT" id="bm_id3145364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT" id="bm_id3145364" localize="false"/>
 <paragraph role="heading" id="hd_id3149483" xml-lang="en-US" level="2" l10n="U" oldref="113">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected template for editing.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="115">Open</paragraph>
 <paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected document or creates a document based on the selected template.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>, and then enter the path.</paragraph>
+<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths"><emph>$[officename] - Paths</emph></link>, and then enter the path.</paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/aaa_start.xhp#aaa_start"/>
 <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100000.xhp" name="File properties">File properties</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010200.xhp b/helpcontent2/source/text/shared/01/01010200.xhp
index bb8e2c622b..0e45204130 100644
--- a/helpcontent2/source/text/shared/01/01010200.xhp
+++ b/helpcontent2/source/text/shared/01/01010200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
 <embed href="text/shared/01/01010203.xhp#drucker"/>
 <bookmark xml-lang="en-US" branch="hid/HID_LABEL_INSERT" id="bm_id3166460" localize="false"/>
 <paragraph role="heading" id="hd_id3145383" xml-lang="en-US" level="2" l10n="U" oldref="7">New Document</paragraph>
-<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_LABEL_INSERT">Creates a new document entitled "Label1" for editing.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_LABEL_INSERT">Creates a new document for editing.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#zurueck"/>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="C"><link href="text/shared/guide/labels.xhp" name="Creating labels">Creating labels</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010201.xhp b/helpcontent2/source/text/shared/01/01010201.xhp
index 301ab4365a..e8e99c44c7 100644
--- a/helpcontent2/source/text/shared/01/01010201.xhp
+++ b/helpcontent2/source/text/shared/01/01010201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010201.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,40 +49,36 @@
 </section>
 <paragraph role="heading" id="hd_id3158397" xml-lang="en-US" level="2" l10n="U" oldref="3">Inscription</paragraph>
 <paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="4">Enter or insert the text that you want to appear on the label(s).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MULTILINEEDIT_TP_LAB_LAB_EDT_WRITING" id="bm_id3155271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING" id="bm_id3155271" localize="false"/>
 <paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="3" l10n="U" oldref="5">Label text</paragraph>
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_MULTILINEEDIT_TP_LAB_LAB_EDT_WRITING">Enter the text that you want to appear on the label. You can also insert a database field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR" id="bm_id3154682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LAB_LAB:BOX_ADDR" id="bm_id3154682" localize="false"/>
 <paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="7">Address</paragraph>
 <paragraph role="paragraph" id="par_id3153089" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR">Creates a label with your return address. Text that is currently in the <emph>Label text</emph> box is overwritten.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - %PRODUCTNAME"><emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DATABASE" id="bm_id3153748" localize="false"/>
+<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME">%PRODUCTNAME</link></emph>, and then click on the <emph>User Data</emph> tab.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_DATABASE" id="bm_id3153748" localize="false"/>
 <paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="10">Database</paragraph>
 <paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_DATABASE">Select the database that you want to use as the data source for your label. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_TABLE" id="bm_id3157863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_TABLE" id="bm_id3157863" localize="false"/>
 <paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="12">Table</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_TABLE">Select the database table containing the field(s) that you want to use in your label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DBFIELD" id="bm_id3151265" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_LAB_LAB_BTN_INSERT" id="bm_id3153577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_DBFIELD" id="bm_id3151265" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_LAB_LAB:BTN_INSERT" id="bm_id3153577" localize="false"/>
 <paragraph role="heading" id="hd_id3155391" xml-lang="en-US" level="3" l10n="U" oldref="14">Database field</paragraph>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW_IMAGEBUTTON_TP_LAB_LAB_BTN_INSERT">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the <emph>Label text</emph> box.</ahelp>.</paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="16">The name of the database field is bounded by brackets in the <emph>Label text</emph> box. If you want, you can separate database fields with spaces. Press Enter to insert a database field on a new line.</paragraph>
 <paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="17">Format</paragraph>
 <paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="18">You can select a pre-defined size format for your label or a size format that you specify on the <emph>Format </emph>tab..</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_LAB_LAB_BTN_CONT" id="bm_id3147618" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_LAB_LAB:BTN_CONT" id="bm_id3147618" localize="false"/>
 <paragraph role="heading" id="hd_id3154143" xml-lang="en-US" level="3" l10n="U" oldref="19">Continuous</paragraph>
 <paragraph role="paragraph" id="par_id3151339" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_RADIOBUTTON_TP_LAB_LAB_BTN_CONT">Prints labels on continuous paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_LAB_LAB_BTN_SHEET" id="bm_id3155419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_LAB_LAB:BTN_SHEET" id="bm_id3155419" localize="false"/>
 <paragraph role="heading" id="hd_id3150131" xml-lang="en-US" level="3" l10n="U" oldref="21">Sheet</paragraph>
 <paragraph role="paragraph" id="par_id3159167" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_RADIOBUTTON_TP_LAB_LAB_BTN_SHEET">Prints labels on individual sheets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_BOX_MAKE" id="bm_id3150669" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:BOX_MAKE" id="bm_id3150669" localize="false"/>
 <paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="23">Brand</paragraph>
 <paragraph role="paragraph" id="par_id3150466" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_BOX_MAKE">Select the brand of paper that you want to use.</ahelp> Each brand has its own size formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_BOX_TYPE" id="bm_id3145416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:BOX_TYPE" id="bm_id3145416" localize="false"/>
 <paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="3" l10n="U" oldref="25">Type</paragraph>
 <paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_BOX_TYPE">Select the size format that you want to use. The available formats depend on the brand on what you selected in the <emph>Brand</emph> list. If you want to use a custom label format, select <emph>[User]</emph>, and then click the <link href="text/shared/01/01010202.xhp" name="Format"><emph>Format</emph></link> tab to define the format.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153828" xml-lang="en-US" level="3" l10n="U" oldref="27">Info</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010202.xhp b/helpcontent2/source/text/shared/01/01010202.xhp
index 8accb3bded..8f2a68782a 100755
--- a/helpcontent2/source/text/shared/01/01010202.xhp
+++ b/helpcontent2/source/text/shared/01/01010202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010202.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,38 +48,38 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#formateti"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_HDIST" id="bm_id3149180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HDIST" id="bm_id3149180" localize="false"/>
 <paragraph role="heading" id="hd_id3159194" xml-lang="en-US" level="2" l10n="U" oldref="3">Horizontal pitch</paragraph>
 <paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HDIST">Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_VDIST" id="bm_id3145669" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_VDIST" id="bm_id3145669" localize="false"/>
 <paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="5">Vertical pitch</paragraph>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_VDIST">Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_WIDTH" id="bm_id3156411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_WIDTH" id="bm_id3156411" localize="false"/>
 <paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="7">Width</paragraph>
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_WIDTH">Displays the width for the label or the business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_HEIGHT" id="bm_id3150507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HEIGHT" id="bm_id3150507" localize="false"/>
 <paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="2" l10n="U" oldref="9">Height</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HEIGHT">Displays the height for the label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_LEFT" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_LEFT" id="bm_id3143267" localize="false"/>
 <paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="2" l10n="U" oldref="11">Left margin</paragraph>
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_LEFT">Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_UPPER" id="bm_id3163802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_UPPER" id="bm_id3163802" localize="false"/>
 <paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Upper margin</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_UPPER">Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LAB_FMT:FLD_COLUMNS" id="bm_id3155830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_COLUMNS" id="bm_id3155830" localize="false"/>
 <paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="15">Columns</paragraph>
 <paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_COLUMNS">Enter the number of labels or business cards that you want to span the width of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWS" id="bm_id3153146" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_ROWS" id="bm_id3153146" localize="false"/>
 <paragraph role="heading" id="hd_id3154143" xml-lang="en-US" level="2" l10n="U" oldref="17">Rows</paragraph>
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWS">Enter the number of labels or business cards that you want to span the height of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVE" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_LAB_FMT:PB_SAVE" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
 <paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVE">Saves the current label or business card format.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146773" xml-lang="en-US" level="2" l10n="U" oldref="21">Save Label Format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_DLG_SAVE_LABEL_CB_MAKE" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE" id="bm_id3158430" localize="false"/>
 <paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="23">Brand</paragraph>
 <paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_COMBOBOX_DLG_SAVE_LABEL_CB_MAKE">Enter or select the desired brand.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_DLG_SAVE_LABEL_ED_TYPE" id="bm_id3144438" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SAVE_LABEL:ED_TYPE" id="bm_id3144438" localize="false"/>
 <paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="3" l10n="U" oldref="25">Type</paragraph>
 <paragraph role="paragraph" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_EDIT_DLG_SAVE_LABEL_ED_TYPE">Enter or select a label type.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/01010203.xhp b/helpcontent2/source/text/shared/01/01010203.xhp
index baecc54b28..7772060a88 100755
--- a/helpcontent2/source/text/shared/01/01010203.xhp
+++ b/helpcontent2/source/text/shared/01/01010203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010203.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,22 +47,22 @@
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#druckereti"/>
 </section>
-  <bookmark branch="hid/SW:RADIOBUTTON:TP_LAB_PRT:BTN_PAGE" xml-lang="en-US" id="bm_id3159233"/><paragraph role="heading" level="2" id="hd_id3150713" l10n="U" xml-lang="en-US" oldref="3">Entire Page</paragraph>
+  <bookmark branch="hid/sw:RadioButton:TP_LAB_PRT:BTN_PAGE" xml-lang="en-US" id="bm_id3159233"/><paragraph role="heading" level="2" id="hd_id3150713" l10n="U" xml-lang="en-US" oldref="3">Entire Page</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155355" xml-lang="en-US" oldref="4"><ahelp hid="SW:RADIOBUTTON:TP_LAB_PRT:BTN_PAGE" visibility="visible">Creates a full page of  labels or business cards.</ahelp></paragraph>
-  <bookmark branch="hid/SW:RADIOBUTTON:TP_LAB_PRT:BTN_SINGLE" xml-lang="en-US" id="bm_id3147089"/><paragraph role="heading" level="2" id="hd_id3146958" l10n="U" xml-lang="en-US" oldref="5">Single Label</paragraph>
+  <bookmark branch="hid/sw:RadioButton:TP_LAB_PRT:BTN_SINGLE" xml-lang="en-US" id="bm_id3147089"/><paragraph role="heading" level="2" id="hd_id3146958" l10n="U" xml-lang="en-US" oldref="5">Single Label</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155535" xml-lang="en-US" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_LAB_PRT:BTN_SINGLE" visibility="visible">Prints a single label or  business card on a page.</ahelp></paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:TP_LAB_PRT:FLD_COL" xml-lang="en-US" id="bm_id3155338"/><paragraph role="heading" level="2" id="hd_id3148621" l10n="U" xml-lang="en-US" oldref="7">Column</paragraph>
+  <bookmark branch="hid/sw:NumericField:TP_LAB_PRT:FLD_COL" xml-lang="en-US" id="bm_id3155338"/><paragraph role="heading" level="2" id="hd_id3148621" l10n="U" xml-lang="en-US" oldref="7">Column</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145345" xml-lang="en-US" oldref="8"><ahelp hid="SW:NUMERICFIELD:TP_LAB_PRT:FLD_COL" visibility="visible">Enter the number of labels or business cards that you want to have in a row on your page.</ahelp></paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:TP_LAB_PRT:FLD_ROW" xml-lang="en-US" id="bm_id3150443"/><paragraph role="heading" level="2" id="hd_id3149398" l10n="U" xml-lang="en-US" oldref="9">Row</paragraph>
+  <bookmark branch="hid/sw:NumericField:TP_LAB_PRT:FLD_ROW" xml-lang="en-US" id="bm_id3150443"/><paragraph role="heading" level="2" id="hd_id3149398" l10n="U" xml-lang="en-US" oldref="9">Row</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3166410" xml-lang="en-US" oldref="10"><ahelp hid="SW:NUMERICFIELD:TP_LAB_PRT:FLD_ROW" visibility="visible">Enter the number of rows of labels or business cards that you want to have on your page.</ahelp></paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON" xml-lang="en-US" id="bm_id3159166"/><paragraph role="heading" level="2" id="hd_id3149237" l10n="U" xml-lang="en-US" oldref="15">Synchronize contents</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON" xml-lang="en-US" id="bm_id3159166"/><paragraph role="heading" level="2" id="hd_id3149237" l10n="U" xml-lang="en-US" oldref="15">Synchronize contents</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155342" xml-lang="en-US" oldref="16"><ahelp visibility="visible" hid="SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON">Allows you to edit a single label or business card and updates the contents of the remaining labels or business cards on the page when you click the <emph>Synchronize Labels </emph>button.</ahelp></paragraph>
-  <bookmark branch="hid/SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC" xml-lang="en-US" id="bm_id3145119"/><paragraph role="heading" level="2" id="hd_id3149164" l10n="U" xml-lang="en-US" oldref="18">Synchronize Labels</paragraph>
+  <bookmark branch="hid/sw:PushButton:DLG_SYNC_BTN:BTN_SYNC" xml-lang="en-US" id="bm_id3145119"/><paragraph role="heading" level="2" id="hd_id3149164" l10n="U" xml-lang="en-US" oldref="18">Synchronize Labels</paragraph>
   <paragraph xml-lang="en-US" oldref="17" l10n="U" role="paragraph" id="par_id3148474">The <emph>Synchronize labels </emph>button only appears in your document if you selected the <emph>Synchronize contents </emph>on the<emph> Options tab </emph>when you created the labels or business cards.</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149762" xml-lang="en-US" oldref="19"><ahelp hid="SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC" visibility="visible">Copies the contents of the top left label or business card to the remaining labels or business cards on the page.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3150504" l10n="U" xml-lang="en-US" oldref="11">Printer</paragraph>
   <paragraph role="paragraph" id="par_id3148990" l10n="U" xml-lang="en-US" oldref="12">Displays the name of the currently selected printer.</paragraph>
-  <bookmark branch="hid/SW:PUSHBUTTON:TP_LAB_PRT:BTN_PRTSETUP" xml-lang="en-US" id="bm_id3155180"/><paragraph role="heading" level="2" id="hd_id3153127" l10n="U" xml-lang="en-US" oldref="13">Setup</paragraph>
+  <bookmark branch="hid/sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP" xml-lang="en-US" id="bm_id3155180"/><paragraph role="heading" level="2" id="hd_id3153127" l10n="U" xml-lang="en-US" oldref="13">Setup</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3144438" xml-lang="en-US" oldref="14"><ahelp visibility="visible" hid="SW:PUSHBUTTON:TP_LAB_PRT:BTN_PRTSETUP">Opens the <link href="text/shared/01/01140000.xhp" name="Printer Setup">Printer Setup</link> dialog.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01010300.xhp b/helpcontent2/source/text/shared/01/01010300.xhp
index 49aa01ad91..ac1ae61003 100644
--- a/helpcontent2/source/text/shared/01/01010300.xhp
+++ b/helpcontent2/source/text/shared/01/01010300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010301.xhp b/helpcontent2/source/text/shared/01/01010301.xhp
index 7920cfefb8..403d2b070c 100755
--- a/helpcontent2/source/text/shared/01/01010301.xhp
+++ b/helpcontent2/source/text/shared/01/01010301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010302.xhp b/helpcontent2/source/text/shared/01/01010302.xhp
index 6266a53540..39fc520987 100755
--- a/helpcontent2/source/text/shared/01/01010302.xhp
+++ b/helpcontent2/source/text/shared/01/01010302.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010302.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
   <bookmark branch="hid/HID_BUSINESS_CARD_CONTENT" xml-lang="en-US" id="bm_id3153070"/><paragraph role="heading" level="2" id="hd_id3146873" l10n="U" xml-lang="en-US" oldref="3">Content</paragraph>
   <paragraph role="paragraph" id="par_id3147527" l10n="U" xml-lang="en-US" oldref="4">Select a design layout for your business card.</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3158442" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="HID_BUSINESS_CARD_CONTENT">Select a business card category in <emph>AutoText - Section</emph> box, and then click a layout in the <emph>Content </emph>list.</ahelp></paragraph>
-  <bookmark branch="hid/SW_LISTBOX_TP_VISITING_CARDS_LB_AUTO_TEXT_GROUP" xml-lang="en-US" id="bm_id3150603"/><paragraph role="heading" level="3" id="hd_id3148668" l10n="U" xml-lang="en-US" oldref="6">AutoText - Section</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP" xml-lang="en-US" id="bm_id3150603"/><paragraph role="heading" level="3" id="hd_id3148668" l10n="U" xml-lang="en-US" oldref="6">AutoText - Section</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154894" xml-lang="en-US" oldref="7"><ahelp visibility="visible" hid="SW_LISTBOX_TP_VISITING_CARDS_LB_AUTO_TEXT_GROUP">Select a business card category, and then click a layout in the <emph>Content </emph>list.</ahelp></paragraph>
   <embed href="text/shared/00/00000001.xhp#vorschau"/>
  </body>
diff --git a/helpcontent2/source/text/shared/01/01010303.xhp b/helpcontent2/source/text/shared/01/01010303.xhp
index 683a0af779..65ea8b50b7 100755
--- a/helpcontent2/source/text/shared/01/01010303.xhp
+++ b/helpcontent2/source/text/shared/01/01010303.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010303.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,26 +47,26 @@
   <embed href="text/shared/00/00000401.xhp#viskartpriv"/>
 </section>
 <paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="3">Private data</paragraph>
-<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datena"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2">Enter the first name of the person, whom you want to use as a second contact.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_NAME_2" id="bm_id3155941" localize="false"/><paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="3" l10n="U" oldref="17">Last name 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_NAME_2" id="bm_id3155941" localize="false"/><paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="3" l10n="U" oldref="17">Last name 2</paragraph>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_NAME_2">Enter the last name of the person, whom you want to use as a second contact.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT_2" id="bm_id3153663" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="19">Initials 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2" id="bm_id3153663" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="19">Initials 2</paragraph>
 <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT_2">Enter the initials of the person, whom you want to use as a second contact.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#strplzort"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_STATE" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3153543" xml-lang="en-US" level="3" l10n="U" oldref="5">Country</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_STATE" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3153543" xml-lang="en-US" level="3" l10n="U" oldref="5">Country</paragraph>
 <paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_STATE">Enter the name of the country in which you live.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datenb"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_PROFESSION" id="bm_id3155504" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="7">Profession</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION" id="bm_id3155504" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="7">Profession</paragraph>
 <paragraph role="paragraph" id="par_id3156192" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_PROFESSION">Enter the title of your profession.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_PHONE" id="bm_id3148491" localize="false"/><paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="3" l10n="U" oldref="9">Phone</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_PHONE" id="bm_id3148491" localize="false"/><paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="3" l10n="U" oldref="9">Phone</paragraph>
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_PHONE">Enter your home telephone number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_MOBILE" id="bm_id3152349" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Mobile</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_MOBILE" id="bm_id3152349" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Mobile</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_MOBILE">Enter your mobile telephone number.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datend"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_WWW" id="bm_id3155261" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="13">Homepage</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_WWW" id="bm_id3155261" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="13">Homepage</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_WWW">Enter the address of your internet homepage.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datene"/>
 </body>
diff --git a/helpcontent2/source/text/shared/01/01010304.xhp b/helpcontent2/source/text/shared/01/01010304.xhp
index d6bbb26e26..be12052eff 100644
--- a/helpcontent2/source/text/shared/01/01010304.xhp
+++ b/helpcontent2/source/text/shared/01/01010304.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010304.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,25 +53,25 @@
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card.</paragraph>
 <paragraph role="note" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="17">If you want to include your name on a business card, enter your name on the <emph>Private </emph>tab. Then choose a layout on the <emph>Business Cards </emph>tab that includes a name placeholder.</paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datenf"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COMP_EXT" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT" id="bm_id3147653" localize="false"/>
 <paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="5">Company 2nd line</paragraph>
 <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_COMP_EXT">Enter additional company details.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_SLOGAN" id="bm_id3149955" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN" id="bm_id3149955" localize="false"/>
 <paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="7">Slogan</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_SLOGAN">Enter the slogan of your company.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#strplzort"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_STATE" id="bm_id3145416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_STATE" id="bm_id3145416" localize="false"/>
 <paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="9">Country</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_STATE">Enter the name of the country where your business is located.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#dateng"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_PHONE" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_PHONE" id="bm_id3156152" localize="false"/>
 <paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="11">Phone</paragraph>
 <paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_PHONE">Enter your business telephone number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_MOBILE" id="bm_id3148990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_MOBILE" id="bm_id3148990" localize="false"/>
 <paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="13">Mobile</paragraph>
 <paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_MOBILE">Enter your mobile telephone number.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datend"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_WWW" id="bm_id3153665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_WWW" id="bm_id3153665" localize="false"/>
 <paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">Homepage</paragraph>
 <paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_WWW">Enter the address of your company's internet homepage.</ahelp></paragraph>
 <embed href="text/shared/optionen/01010100.xhp#datene"/>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index ecaa6f6d49..d07c510010 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,114 +31,137 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Open</title>
-<filename>/text/shared/01/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Open</title>
+         <filename>/text/shared/01/01020000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145211"><bookmark_value>directories; creating new</bookmark_value>
-<bookmark_value>folder creation</bookmark_value>
-<bookmark_value>My Documents folder; opening</bookmark_value>
-<bookmark_value>default directories</bookmark_value>
-<bookmark_value>multiple documents; opening</bookmark_value>
-<bookmark_value>opening; several files</bookmark_value>
-<bookmark_value>selecting; several files</bookmark_value>
-<bookmark_value>opening; files, with placeholders</bookmark_value>
-<bookmark_value>regular expressions; opening files</bookmark_value>
-<bookmark_value>files; opening with placeholders</bookmark_value>
-<bookmark_value>placeholders;on opening files</bookmark_value>
-<bookmark_value>documents; opening with templates</bookmark_value>
-<bookmark_value>templates; opening documents with</bookmark_value>
-<bookmark_value>documents; styles changed</bookmark_value>
-<bookmark_value>styles; 'changed' message</bookmark_value>
-</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment>
+      <bookmark_value>folder creation</bookmark_value>
+      <bookmark_value>My Documents folder; opening</bookmark_value>
+      <bookmark_value>default directories</bookmark_value>
+      <bookmark_value>multiple documents; opening</bookmark_value>
+      <bookmark_value>opening; several files</bookmark_value>
+      <bookmark_value>selecting; several files</bookmark_value>
+      <bookmark_value>opening; files, with placeholders</bookmark_value>
+      <bookmark_value>placeholders;on opening files</bookmark_value>
+      <bookmark_value>documents; opening with templates</bookmark_value>
+      <bookmark_value>templates; opening documents with</bookmark_value>
+      <bookmark_value>documents; styles changed</bookmark_value>
+      <bookmark_value>styles; 'changed' message</bookmark_value>
+</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment><comment>mw deleted "regular expressions;" and "files;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_OPENDOC" id="bm_id3908743" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Open" id="bm_id3146765" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146936" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151191" role="paragraph" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#oeffnen"/>
 </section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> dialog box. To activate the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="11">Up One Level</paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
-<embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id3153748" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="2" l10n="U" oldref="13">Create New Directory</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id3147008" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id5397808" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="2" l10n="U" oldref="38">Default Directory</paragraph>
-<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="19">Display area</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
-<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/><paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/><paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/><paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/><paragraph role="paragraph" id="par_id3161458" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/><paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
+<!-- removed HID SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147250" role="heading" level="2" l10n="U"
+                 oldref="11">Up One Level</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147226" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
+      <embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
+<!-- removed HID SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145211" role="heading" level="2" l10n="U"
+                 oldref="13">Create New Directory</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
+      <embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
+<!-- removed HID SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD -->
+<!-- removed HID svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147010" role="heading" level="2" l10n="U"
+                 oldref="38">Default Directory</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3109847" role="paragraph" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
+      <embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U"
+                 oldref="19">Display area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159256" role="tip" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
+         </listitem>
+         <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
+         </listitem>
+         <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES" id="bm_id3151245" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153331" role="paragraph" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3161458" role="paragraph" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL" id="bm_id3154346" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147531" role="paragraph" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_FOLDER_FILENAME" id="bm_id3149656" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/><paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="2" l10n="U" oldref="21">File name</paragraph>
-<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3153779" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154280" role="heading" level="2" l10n="U"
+                 oldref="21">File name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3161656" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150541" role="paragraph" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153779" role="paragraph" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>For example, to list all of the text files in a directory, enter the asterisk wildcard with the text file extension (*.txt), and then click<emph> Open</emph>. Use the question mark (?) wildcard to represent any character, as in (??3*.txt), which only displays text files with a '3' as the third character in the file name.</defaultinline></switchinline></paragraph>
-<embed href="text/shared/04/01010000.xhp#autocompurl"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="2" l10n="U" oldref="81">Version</paragraph>
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id3151176" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="25">File type</paragraph>
-<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/><paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="27">Open</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="2" l10n="U" oldref="88">Insert</paragraph>
-<paragraph role="paragraph" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="2" l10n="U" oldref="35">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
+      <embed href="text/shared/04/01010000.xhp#autocompurl"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145117" role="heading" level="2" l10n="U"
+                 oldref="81">Version</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149291" role="paragraph" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
+<!-- removed HID SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+                 oldref="25">File type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153969" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
+<!-- removed HID SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN -->
+<!-- removed HID svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL -->
+<paragraph xml-lang="en-US" id="hd_id3154125" role="heading" level="2" l10n="U"
+                 oldref="27">Open</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152933" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147085" role="heading" level="2" l10n="U"
+                 oldref="88">Insert</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156293" role="paragraph" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="2" l10n="U"
+                 oldref="35">Read-only</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
 <switch select="appl">
 <case select="IMPRESS">
-<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/><paragraph role="heading" id="hd_id3149984" xml-lang="en-US" level="2" l10n="U" oldref="113">Play</paragraph>
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149984" role="heading" level="2" l10n="U"
+                 oldref="113">Play</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
 </case>
 </switch>
 <section id="vorlagen">
-<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/><paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="3" l10n="U" oldref="53">Opening Documents With Templates</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="CHG" oldref="40">
-<item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151292" xml-lang="en-US" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144442" xml-lang="en-US" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory 
+<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="3" l10n="U"
+                    oldref="53">Opening Documents With Templates</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="CHG" oldref="40">
+            <item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3151292" role="listitem" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
 </caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph></link></paragraph>
+<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths">%PRODUCTNAME - Paths</link></emph></paragraph>
 </listitem>
 </list>
 <paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01020101.xhp b/helpcontent2/source/text/shared/01/01020101.xhp
index f62da6c19d..5d6f565e8e 100755
--- a/helpcontent2/source/text/shared/01/01020101.xhp
+++ b/helpcontent2/source/text/shared/01/01020101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020101.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01020103.xhp b/helpcontent2/source/text/shared/01/01020103.xhp
index 9fc9d123a4..cfa54f4586 100755
--- a/helpcontent2/source/text/shared/01/01020103.xhp
+++ b/helpcontent2/source/text/shared/01/01020103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020103.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,8 +47,8 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#filterauswahl"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX" id="bm_id3155351" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS" id="bm_id1646778" localize="false"/>
+<!-- removed HID SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX -->
+<bookmark xml-lang="en-US" branch="hid/uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS" id="bm_id1646778" localize="false"/>
 <paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="2" l10n="U" oldref="4">Filter list</paragraph>
 <paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX">Select the import filter for the file that you want to open.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="6">If $[officename] does not recognize the file type of the document that your want to open, try any of the following:</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01050000.xhp b/helpcontent2/source/text/shared/01/01050000.xhp
index c29b1ba121..4aa6d00947 100644
--- a/helpcontent2/source/text/shared/01/01050000.xhp
+++ b/helpcontent2/source/text/shared/01/01050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,7 @@
 <section id="schliessen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154545"><bookmark_value>documents; closing</bookmark_value>
 <bookmark_value>closing;documents</bookmark_value>
-<bookmark_value>backing window</bookmark_value>
-</bookmark><comment>mw made "closing..." a two level entry</comment>
+</bookmark><comment>mw deleted "backing window"</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_CLOSEDOC" id="bm_id5360279" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CloseDoc" id="bm_id3150702" localize="false"/>
 <paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01050000.xhp" name="Close">Close</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01060000.xhp b/helpcontent2/source/text/shared/01/01060000.xhp
index 04e779717f..86086eed28 100644
--- a/helpcontent2/source/text/shared/01/01060000.xhp
+++ b/helpcontent2/source/text/shared/01/01060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01070000.xhp b/helpcontent2/source/text/shared/01/01070000.xhp
index c71ee41858..a07eae10bf 100644
--- a/helpcontent2/source/text/shared/01/01070000.xhp
+++ b/helpcontent2/source/text/shared/01/01070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,11 +50,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#saveas"/>
 </section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Save as </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.<comment>UFI: using system dialogs works in Windows and Gnome 2.6</comment></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item>Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="note" id="par_id3147654" xml-lang="en-US" l10n="U" oldref="59">To save a document as a template, use the command <emph>File - Templates - Save</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_LEVELUP" id="bm_id3154380" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="19">Up One Level</paragraph>
 <section id="levelup">
diff --git a/helpcontent2/source/text/shared/01/01070001.xhp b/helpcontent2/source/text/shared/01/01070001.xhp
index f07a693f74..74e295051e 100644
--- a/helpcontent2/source/text/shared/01/01070001.xhp
+++ b/helpcontent2/source/text/shared/01/01070001.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070001.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#export"/>
 </section>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export </emph>dialog. To activate the <emph>$[officename] Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - $[officename] - General"><emph>Tools - Options - $[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog box. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="$[officename] - General">$[officename] - General</link></emph>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="4">Up One Level</paragraph>
 <embed href="text/shared/01/01070000.xhp#levelup"/>
 <paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="2" l10n="U" oldref="5">Create New Directory</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100000.xhp b/helpcontent2/source/text/shared/01/01100000.xhp
index f9a091d8fe..35d288e31a 100644
--- a/helpcontent2/source/text/shared/01/01100000.xhp
+++ b/helpcontent2/source/text/shared/01/01100000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +29,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0101100000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Properties of</title>
 <filename>/text/shared/01/01100000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-07T10:43:45">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/SID_DOCINFO" id="bm_id1332604" localize="false"/>
@@ -56,32 +49,16 @@
 </section>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="CHG" oldref="4">The <emph>Properties</emph> dialog contains the following tab pages:</paragraph>
 <embed href="text/shared/01/01100200.xhp#dokument"/>
+<embed href="text/shared/01/01100100.xhp#beschreibung"/>
+<embed href="text/shared/01/01100300.xhp#benutzer"/>
+<embed href="text/shared/01/01100500.xhp#internet"/>
+<embed href="text/shared/01/01100600.xhp#security"/>
 <switch select="appl">
-<case select="IMAGE">
-</case>
-<default><embed href="text/shared/01/01100100.xhp#beschreibung"/>
-</default>
-</switch>
-<switch select="appl">
-<case select="IMAGE">
-</case>
-<default><embed href="text/shared/01/01100300.xhp#benutzer"/>
-</default>
-</switch>
-<switch select="appl">
-<case select="IMAGE">
+<case select="WRITER">
+<embed href="text/shared/01/01100400.xhp#statistik"/>
 </case>
-<default><embed href="text/shared/01/01100500.xhp#internet"/>
-</default>
 </switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/shared/01/01100400.xhp#statistik"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="CALC">
-</case>
-</switch><embed href="text/shared/00/00000001.xhp#zurueck"/>
-<paragraph role="note" id="par_id3148643" xml-lang="en-US" l10n="U" oldref="5">Depending on your access rights to the file, you might not see all of tabs in the <emph>Properties </emph>dialog.</paragraph>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<paragraph role="note" id="par_id3148643" xml-lang="en-US" l10n="CHG" oldref="5">Depending on your access rights to the file, you might not see all of the tabs in the <emph>Properties</emph> dialog.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01100100.xhp b/helpcontent2/source/text/shared/01/01100100.xhp
index e3bd6b1985..1aed9aa23b 100755
--- a/helpcontent2/source/text/shared/01/01100100.xhp
+++ b/helpcontent2/source/text/shared/01/01100100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100100.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,16 +46,16 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#info3"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_TITLE" id="bm_id3149798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODESC:ED_TITLE" id="bm_id3149798" localize="false"/>
 <paragraph role="heading" id="hd_id3152372" xml-lang="en-US" level="2" l10n="U" oldref="3">Title</paragraph>
 <paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_TITLE">Enter a title for the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_THEMA" id="bm_id3145136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODESC:ED_THEMA" id="bm_id3145136" localize="false"/>
 <paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Subject</paragraph>
 <paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_THEMA">Enter a subject for the document. You can use a subject to group documents with similar contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS" id="bm_id3145313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS" id="bm_id3145313" localize="false"/>
 <paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="2" l10n="U" oldref="7">Keywords</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS">Enter the words that you want to use to index the content of your document. Keywords must be separated by commas. A keyword can contain white space characters or semicolons.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT" id="bm_id3147009" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT" id="bm_id3147009" localize="false"/>
 <paragraph role="heading" id="hd_id3148620" xml-lang="en-US" level="2" l10n="U" oldref="9">Comments</paragraph>
 <paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT">Enter comments to help identify the document.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/01100200.xhp b/helpcontent2/source/text/shared/01/01100200.xhp
index c4729f3d81..12460aa771 100755
--- a/helpcontent2/source/text/shared/01/01100200.xhp
+++ b/helpcontent2/source/text/shared/01/01100200.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,65 +27,69 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0101100200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/01/01100200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-06T09:12:13">UFI: added spec "Electronic Signatures and Encryption GUI"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="dokument">
+      <topic id="textshared0101100200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">General</title>
+         <filename>/text/shared/01/01100200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="dokument">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149955"><bookmark_value>version numbers of documents</bookmark_value>
-<bookmark_value>documents; version numbers</bookmark_value>
-<bookmark_value>files; version numbers</bookmark_value>
-<bookmark_value>editing time of documents</bookmark_value>
-<bookmark_value>documents; editing time</bookmark_value>
+         <bookmark_value>documents; version numbers</bookmark_value>
+         <bookmark_value>files; version numbers</bookmark_value>
+         <bookmark_value>editing time of documents</bookmark_value>
+         <bookmark_value>documents; editing time</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_DOCINFODOC" id="bm_id3154926" localize="false"/>
-<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100200.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODOC">Contains basic information about the current file.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#info2"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME" id="bm_id3149283" localize="false"/>
-<paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">File</paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME">Displays the file name.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="17">Type:</paragraph>
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="20">Displays the file type for the current document.</paragraph>
-<paragraph role="heading" id="hd_id3145314" xml-lang="en-US" level="2" l10n="U" oldref="18">Location:</paragraph>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="21">Displays the path and the name of the directory where the file is stored.</paragraph>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="19">Size:</paragraph>
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="22">Displays the size of the current document in bytes.</paragraph>
-<paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="7">Created:</paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="8">Displays the date and time and author when the file was first saved.</paragraph>
-<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="2" l10n="U" oldref="9">Modified:</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="10">Displays the date and time and author when the file was last saved in a $[officename] file format.</paragraph>
-<paragraph role="heading" id="par_idN106C5" xml-lang="en-US" level="2" l10n="NEW">Digitally signed:</paragraph>
-<paragraph role="paragraph" id="par_idN106C9" xml-lang="en-US" l10n="NEW">Displays the date and the time when the file was last signed as well as the name of the author who signed the document.</paragraph>
-<paragraph role="heading" id="par_idN106CC" xml-lang="en-US" level="2" l10n="NEW">Digital Signature</paragraph>
-<paragraph role="paragraph" id="par_idN106D0" xml-lang="en-US" l10n="NEW">Opens the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog where you can manage digital signatures for the current document.</paragraph>
-<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="11">Last printed:</paragraph>
-<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="12">Displays the date and time and user name when the file was last printed.</paragraph>
-<paragraph role="heading" id="hd_id3153252" xml-lang="en-US" level="2" l10n="U" oldref="15">Document number:</paragraph>
-<paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="16">Displays the number of times that the file has been saved.</paragraph>
-<paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="2" l10n="U" oldref="13"> Editing time:</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="14">Displays the amount of time that the file has been open for editing since the file was created. The editing time is updated when you save the file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
-<paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="2" l10n="U" oldref="33">Apply User Data</paragraph>
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="35">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE">Resets the editing time to zero, the creation date to the current date and time, and the version number to 1. The modification and printing dates are also deleted.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149576" xml-lang="en-US" level="2" l10n="U" oldref="5">Template:</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6">Displays the template that was used to create the file.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3148668" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100200.xhp" name="General">General</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154863" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODOC">Contains basic information about the current file.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000401.xhp#info2"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME" id="bm_id3149283" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149999" role="heading" level="2" l10n="U" oldref="3">File</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153114" role="paragraph" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME">Displays the file name.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156136" role="heading" level="2" l10n="U"
+                 oldref="17">Type:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="U" oldref="20">Displays the file type for the current document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145314" role="heading" level="2" l10n="U"
+                 oldref="18">Location:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="U" oldref="21">Displays the path and the name of the directory where the file is stored.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="2" l10n="U"
+                 oldref="19">Size:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="U" oldref="22">Displays the size of the current document in bytes.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149178" role="heading" level="2" l10n="U" oldref="7">Created:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="8">Displays the date and time and author when the file was first saved.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="9">Modified:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150355" role="paragraph" l10n="U" oldref="10">Displays the date and time and author when the file was last saved in a $[officename] file format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106C5" role="heading" level="2" l10n="NEW">Digitally signed:</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Displays the date and the time when the file was last signed as well as the name of the author who signed the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106CC" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph" l10n="NEW">Opens the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog where you can manage digital signatures for the current document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U"
+                 oldref="11">Last printed:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152780" role="paragraph" l10n="U" oldref="12">Displays the date and time and user name when the file was last printed.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153252" role="heading" level="2" l10n="CHG"
+                 oldref="15">Revision number:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149955" role="paragraph" l10n="U" oldref="16">Displays the number of times that the file has been saved.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2" l10n="U"
+                 oldref="13"> Editing time:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="14">Displays the amount of time that the file has been open for editing since the file was created. The editing time is updated when you save the file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="2" l10n="U"
+                 oldref="33">Apply User Data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+                 oldref="35">Delete</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="36"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE">Resets the editing time to zero, the creation date to the current date and time, and the version number to 1. The modification and printing dates are also deleted.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149576" role="heading" level="2" l10n="U" oldref="5">Template:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6">Displays the template that was used to create the file.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/01100300.xhp b/helpcontent2/source/text/shared/01/01100300.xhp
index 8a8994df9c..d4736c1ae3 100755
--- a/helpcontent2/source/text/shared/01/01100300.xhp
+++ b/helpcontent2/source/text/shared/01/01100300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100300.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,14 +46,14 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#info4"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO1" id="bm_id3154751" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO2" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO3" id="bm_id3148548" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4" id="bm_id3147399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFOUSER:ED_INFO1" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFOUSER:ED_INFO2" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFOUSER:ED_INFO3" id="bm_id3148548" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFOUSER:ED_INFO4" id="bm_id3147399" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_CTRL_CUSTOMPROPERTIES" id="bm_id0811200812001788" localize="false"/>
 <paragraph role="heading" id="hd_id3151234" xml-lang="en-US" level="2" l10n="CHG" oldref="2">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4">Enter your custom contents. You can change the name, type, and contents of each row. You can add or remove rows. The items will be exported as metadata to other file formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD" id="bm_id0811200812054521" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD" id="bm_id0811200812054521" localize="false"/>
 <paragraph role="heading" id="hd_id0811200812071796" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
 <paragraph role="paragraph" id="par_id0811200812071785" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to add a new row to the Properties list.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/01100400.xhp b/helpcontent2/source/text/shared/01/01100400.xhp
index 4b68514389..5f9594ebcc 100755
--- a/helpcontent2/source/text/shared/01/01100400.xhp
+++ b/helpcontent2/source/text/shared/01/01100400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100400.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <bookmark_value>OLE objects;number of</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_DOC_STAT" id="bm_id3147294" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_TABPAGE_RID_SCPAGE_STAT" id="bm_id3145356" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TabPage:RID_SCPAGE_STAT" id="bm_id3145356" localize="false"/>
 <paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100400.xhp" name="Statistics">Statistics</link></paragraph>
 <paragraph role="paragraph" id="par_id3156045" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_TABPAGE_RID_SCPAGE_STAT">Displays statistics for the current file.</ahelp></paragraph>
 </section>
@@ -100,7 +97,7 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3149650" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">Number of lines in the file. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_DOC_STAT_PB_PDATE" id="bm_id3154940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_DOC_STAT:PB_PDATE" id="bm_id3154940" localize="false"/>
 <paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="2" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Update 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW_PUSHBUTTON_TP_DOC_STAT_PB_PDATE">Updates the statistics.</ahelp>
diff --git a/helpcontent2/source/text/shared/01/01100500.xhp b/helpcontent2/source/text/shared/01/01100500.xhp
index d45203ab44..f4ebaa3362 100755
--- a/helpcontent2/source/text/shared/01/01100500.xhp
+++ b/helpcontent2/source/text/shared/01/01100500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100500.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,29 +55,29 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#info6"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_NOAUTOUPDATE" id="bm_id3149798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE" id="bm_id3149798" localize="false"/>
 <paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="2" l10n="U" oldref="26">Do not refresh automatically</paragraph>
 <paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_NOAUTOUPDATE">User must refresh the page manually.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_RELOADUPDATE" id="bm_id3153577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE" id="bm_id3153577" localize="false"/>
 <paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Refresh this document</paragraph>
 <paragraph role="paragraph" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_RELOADUPDATE">Reloads the HTML page after the number of seconds that you enter in the <emph>seconds</emph> box. To observe the result, open the page in a browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_NumericField_TP_DOCINFORELOAD_ED_RELOAD" id="bm_id6386608" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD" id="bm_id6386608" localize="false"/>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="U" oldref="7">Seconds</paragraph>
 <paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:NUMERICFIELD:TP_DOCINFORELOAD:ED_SECONDS">Enter the number of seconds to wait before the page is reloaded.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE" id="bm_id3147210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE" id="bm_id3147210" localize="false"/>
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="28">Redirect from this document</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE">Loads a page that you specify after the number of seconds that you enter in the <emph>seconds </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_NumericField_TP_DOCINFORELOAD_ED_FORWARD" id="bm_id7947935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD" id="bm_id7947935" localize="false"/>
 <paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="30">after ... seconds</paragraph>
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE">Enter the number of seconds to wait before redirecting the browser to a different file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_Edit_TP_DOCINFORELOAD_ED_URL" id="bm_id5280617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFORELOAD:ED_URL" id="bm_id5280617" localize="false"/>
 <paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="9">to URL</paragraph>
 <paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:EDIT:TP_DOCINFORELOAD:ED_URL">Enter the URL address of the file that you want to open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_DOCINFORELOAD_PB_BROWSEURL" id="bm_id4792931" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL" id="bm_id4792931" localize="false"/>
 <paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="32">...</paragraph>
 <paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:EDIT:TP_DOCINFORELOAD:ED_URL">Locate the file that you want to open, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT" id="bm_id3155434" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ComboBox_TP_DOCINFORELOAD_CB_FRAME" id="bm_id1734366" localize="false"/>
+<!-- removed HID SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME" id="bm_id1734366" localize="false"/>
 <paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="11">to frame</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT">If the current HTML page uses frames, select the name of the <link href="text/shared/00/00000002.xhp#frame" name="target frame">target frame</link> where you want the file to be loaded.</ahelp></paragraph>
 <section id="targets">
diff --git a/helpcontent2/source/text/shared/01/01100600.xhp b/helpcontent2/source/text/shared/01/01100600.xhp
new file mode 100644
index 0000000000..e801d63d11
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/01100600.xhp
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************-->
+
+
+
+<helpdocument version="1.0">
+<meta>
+<topic id="textshared0101100600xml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Security</title>
+<filename>/text/shared/01/01100600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="security">
+<bookmark xml-lang="en-US" branch="index" id="bm_id1472519"><bookmark_value>password as document property</bookmark_value>
+<bookmark_value>file sharing options for current document</bookmark_value>
+<bookmark_value>read-only documents;opening documents as</bookmark_value>
+<bookmark_value>saving;with password by default</bookmark_value>
+<bookmark_value>user data;removing when saving</bookmark_value>
+</bookmark>
+
+<paragraph role="heading" id="hd_id3149969" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/01100600.xhp" name="Security">Security</link></paragraph>
+<paragraph role="paragraph" id="par_id3156049" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets password options for the current document.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+  <embed href="text/shared/00/00000401.xhp#infosec"/>
+</section>
+
+<comment>
+<paragraph role="heading" id="hd_id31499" xml-lang="en-US" level="2" l10n="NEW">File encryption</paragraph>
+<paragraph role="paragraph" id="hd_id31499A" xml-lang="en-US" l10n="NEW">The password to open the current document can be set in the Properties dialog on the Security tab page. You can also set a password to open the document when you save the document. Check the Save with password option on the Save As dialog, and enter the password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<paragraph role="heading" id="par_idN106AA1" xml-lang="en-US" level="3" l10n="NEW">Enter password to open</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150502B" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<paragraph role="heading" id="par_idN106AA2" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151100E" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+
+
+<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options</paragraph>
+<paragraph role="paragraph" id="hd_id31499F" xml-lang="en-US" l10n="NEW">The password to edit the current document can be set in the Properties dialog on the Security tab page. Currently this option is evaluated for documents in some Microsoft file formats.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<paragraph role="heading" id="par_idN106AA3" xml-lang="en-US" level="3" l10n="NEW">Enter password to allow editing</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150502H" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<paragraph role="heading" id="par_idN106AA4" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151100J" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+</comment>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_OPEN_FILE_READONLY" id="bm_id8295846" localize="false"/>
+<paragraph role="heading" id="par_idN106AA" xml-lang="en-US" level="3" l10n="NEW">Open file read-only</paragraph>
+<paragraph role="paragraph" id="par_idN106AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to allow this document to be opened in read-only mode only.</ahelp></paragraph>
+<paragraph role="note" id="par_idN106B1" xml-lang="en-US" l10n="NEW">This file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_RECORD_CHANGES" id="bm_id868861" localize="false"/>
+<paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
+<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
+<paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without knowing the password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PROTECTION" id="bm_id2517166" localize="false"/>
+<paragraph role="heading" id="par_idN106D0" xml-lang="en-US" level="3" l10n="NEW">Protect / Unprotect</paragraph>
+<paragraph role="paragraph" id="par_idN106D4" xml-lang="en-US" l10n="NEW"><ahelp hid="703992336">Protects the change recording state with a password. If change recording is protected for the current document, the button is named <emph>Unprotect</emph>. Click <emph>Unprotect</emph> and type the correct password to disable the protection.</ahelp></paragraph>
+
+
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01110000.xhp b/helpcontent2/source/text/shared/01/01110000.xhp
index 438455b751..f247164cae 100755
--- a/helpcontent2/source/text/shared/01/01110000.xhp
+++ b/helpcontent2/source/text/shared/01/01110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4dd423bc76..e4cb1efbf3 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,14 +66,14 @@
 <bookmark xml-lang="en-US" branch="hid/HID_CTL_ORGANIZER_RIGHT" id="bm_id3149346" localize="false"/>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Left and Right Selection List (Templates / Documents)</paragraph>
 <paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="HID_CTL_ORGANIZER_RIGHT">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
-<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
+<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths">$[officename] - Paths</link></emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
 <paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="36">Template categories are represented by folder icons. To view the template files for a category, double-click a folder.</paragraph>
 <paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="C">To view the styles that are used in a file, double-click the file name, and then double-click the <emph>Styles</emph> icon.</paragraph>
 <paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT" id="bm_id3153542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT" id="bm_id3153542" localize="false"/>
 <paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="8">Commands</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="37">Depending on the type of file you select in the list, the following commands are available:</paragraph>
@@ -110,10 +107,10 @@
 <bookmark xml-lang="en-US" branch="hid/HID_ORGANIZE_STDTEMPLATE_DEL" id="bm_id3155131" localize="false"/>
 <paragraph role="heading" id="hd_id3153768" xml-lang="en-US" level="3" l10n="U" oldref="43">Reset Default Template</paragraph>
 <paragraph role="paragraph" id="par_id3155432" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_ORGANIZE_STDTEMPLATE_DEL">Select a $[officename] document type to reset the default template to the original template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_DLG_ORGANIZE_BTN_ADDRESSTEMPLATE" id="bm_id3151351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE" id="bm_id3151351" localize="false"/>
 <paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="38">Address Book</paragraph>
 <paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">Edit the field assignments and the data source for the address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_ORGANIZE:BTN_FILES" id="bm_id3155366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_FILES" id="bm_id3155366" localize="false"/>
 <paragraph role="heading" id="hd_id3154151" xml-lang="en-US" level="2" l10n="U" oldref="32">File</paragraph>
 <paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:PUSHBUTTON:DLG_ORGANIZE:BTN_FILES">Locate a file that you want to add to the document list, and then click<emph> Open</emph>.</ahelp></paragraph>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/01/01110101.xhp b/helpcontent2/source/text/shared/01/01110101.xhp
index 37372115b8..8afe137ac9 100644
--- a/helpcontent2/source/text/shared/01/01110101.xhp
+++ b/helpcontent2/source/text/shared/01/01110101.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110101.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,13 +54,13 @@
 </section>
 <paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Address Book Source</paragraph>
 <paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="4">Set the data source and data table for your address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_DATASOURCE" id="bm_id3155390" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE" id="bm_id3155390" localize="false"/>
 <paragraph role="heading" id="hd_id3147654" xml-lang="en-US" level="3" l10n="U" oldref="5">Data Source</paragraph>
 <paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_DATASOURCE">Select the data source for your address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_TABLE" id="bm_id3143271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE" id="bm_id3143271" localize="false"/>
 <paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="3" l10n="U" oldref="7">Table</paragraph>
 <paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_TABLE">Select the data table for your address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES" id="bm_id3154811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES" id="bm_id3154811" localize="false"/>
 <paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="9">Configure</paragraph>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES">Add a new data source to the <emph>Address Book Source </emph>list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="11">Field assignment</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01110300.xhp b/helpcontent2/source/text/shared/01/01110300.xhp
index 58d13a1e23..d6038feb84 100644
--- a/helpcontent2/source/text/shared/01/01110300.xhp
+++ b/helpcontent2/source/text/shared/01/01110300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,21 +49,21 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#dokuspei"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME" id="bm_id3152425" localize="false"/>
 <paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="4">New Template</paragraph>
 <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME">Enter a name for the template.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="6">Templates</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="7">Lists templates and template categories.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION" id="bm_id3156427" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION" id="bm_id3156427" localize="false"/>
 <paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="3" l10n="U" oldref="8">Categories</paragraph>
 <paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION">Select a category in which to save the new template.</ahelp> To add a new template category, click the <link href="text/shared/01/01110100.xhp" name="Organize">Organize</link> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS" id="bm_id3155942" localize="false"/>
 <paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="3" l10n="U" oldref="10">Templates</paragraph>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS">Lists the available template categories.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT" id="bm_id3154749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT" id="bm_id3154749" localize="false"/>
 <paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="12">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT">Opens the selected template for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE" id="bm_id3144439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE" id="bm_id3144439" localize="false"/>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="14">Organize</paragraph>
 <paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE">Opens the <emph>Template Management</emph> dialog where you can organize or create new templates.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/01110400.xhp b/helpcontent2/source/text/shared/01/01110400.xhp
index 3e0282d67f..53c3d37672 100644
--- a/helpcontent2/source/text/shared/01/01110400.xhp
+++ b/helpcontent2/source/text/shared/01/01110400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index d5913556c9..254e60bbbb 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01130000.xhp,v $
- * $Revision: 1.11.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,15 +29,15 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0101130000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Print</title>
-<filename>/text/shared/01/01130000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0101130000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Print</title>
+         <filename>/text/shared/01/01130000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154621"><bookmark_value>printing; documents</bookmark_value>
 <bookmark_value>documents; printing</bookmark_value>
 <bookmark_value>text documents; printing</bookmark_value>
@@ -56,111 +53,108 @@
 <bookmark_value>printing; copies</bookmark_value>
 <bookmark_value>copies; printing</bookmark_value>
 <bookmark_value>spoolfiles with Xprinter</bookmark_value>
-</bookmark><comment>MW deleted "selections;"</comment>
+</bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_PRINTDOC" id="bm_id1076258" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
-<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1">Print</paragraph>
-<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
+
+<bookmark xml-lang="en-US" branch="hid/HID_PRINTDLG" id="bm_id081820090410118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154621" role="heading" level="1" l10n="U" oldref="1">Print</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
 </variable> The printing options can vary according to the printer and the operating system that you use.</paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000401.xhp#drucken"/>
-</section>
+
+
+      <section id="howtoget">
+         <embed href="text/shared/00/00000401.xhp#drucken"/>
+      </section>
+<paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW"><emph>Printing text documents:</emph></paragraph>
+      <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+      <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
+      <embed href="text/swriter/guide/print_small.xhp#print_small"/>
+      <embed href="text/swriter/guide/printing_order.xhp#printing_order"/>
+      <embed href="text/swriter/guide/printer_tray.xhp#printer_tray"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW"><emph>Printing spreadsheets:</emph></paragraph>
+      <embed href="text/scalc/guide/printranges.xhp#printranges"/>
+      <embed href="text/scalc/guide/print_details.xhp#print_details"/>
+      <embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
+      <embed href="text/scalc/guide/print_landscape.xhp#print_landscape"/>
+      <embed href="text/scalc/guide/print_title_row.xhp#print_title_row"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW"><emph>Printing presentations:</emph></paragraph>
+      <embed href="text/simpress/guide/printing.xhp#printing"/>
+      <embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW"><emph>General printing:</emph></paragraph>
+      <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
+      <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
+      <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
+<paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
+</caseinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
+</caseinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
+</caseinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
+<paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
+<paragraph xml-lang="en-US" id="hd_id0818200912285056" role="heading" level="2" l10n="NEW">General</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
-<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="3">Printer</paragraph>
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES">Lists the default printer for the current document. The information for the printer is displayed below this box. If you select another printer, the information is updated.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
-<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="6">Lists the installed printers on your operating system. To change the default printer, select a printer name from the list.</paragraph>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="7">Status</paragraph>
-<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="8">Describes the current status of the selected printer.</paragraph>
-<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="9">Type</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="10">Displays the type of printer that you selected. </paragraph>
-<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="3" l10n="U" oldref="11">Location</paragraph>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="U" oldref="12">Displays the port for the selected printer.</paragraph>
-<paragraph role="heading" id="hd_id3148621" xml-lang="en-US" level="3" l10n="U" oldref="13">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14">Displays additional information for the printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/>
-<paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="3" l10n="U" oldref="15">Properties</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES">Opens the printer properties dialog.</ahelp> The printer properties vary according to the printer that you select.<comment>UFI: fix for #i29457#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="17">Print to File</paragraph>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT">Prints to a file instead of to a printer. Select this box, and then choose a location to save the file.</ahelp></paragraph><comment>obviously, AVIS embedded help texts AEND are no longer possible inside SWITCHed passages.
-This is the reason for continuos failure of i83561</comment>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid=".">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog. The printer properties vary according to the printer that you select.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043691" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043691" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043626" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043626" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043615" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043615" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043658" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043658" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043717" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043717" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043777" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043777" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
-<paragraph role="paragraph" id="par_id0909200810043750" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
-<switch select="appl">
-<case select="CALC"><comment>changed Calc print dialog, i83561</comment>
-<paragraph role="heading" id="hd_id439161" xml-lang="en-US" level="2" l10n="NEW">Print</paragraph>
-<paragraph role="paragraph" id="par_id1228064" xml-lang="en-US" l10n="NEW">Choose the spreadsheet contents to be printed.</paragraph>
-<paragraph role="heading" id="hd_id3263954" xml-lang="en-US" level="3" l10n="NEW">All sheets</paragraph>
-<paragraph role="paragraph" id="par_id9550462" xml-lang="en-US" l10n="NEW">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
-<paragraph role="heading" id="hd_id6590166" xml-lang="en-US" level="3" l10n="NEW">Selected sheets</paragraph>
-<paragraph role="paragraph" id="par_id7059846" xml-lang="en-US" l10n="NEW">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
-<paragraph role="heading" id="hd_id7471236" xml-lang="en-US" level="3" l10n="NEW">Selected cells</paragraph>
-<paragraph role="paragraph" id="par_id2208014" xml-lang="en-US" l10n="NEW">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
-</case>
-<case select="IMPRESS"><comment>inserted Impress section, i85723</comment>
-<paragraph role="heading" id="hd_id9578844" xml-lang="en-US" level="2" l10n="NEW">Print content</paragraph>
-<paragraph role="paragraph" id="par_id864284" xml-lang="en-US" l10n="NEW">For Impress, you can select the content to be printed.</paragraph>
-<paragraph role="heading" id="hd_id7683950" xml-lang="en-US" level="3" l10n="NEW">Content</paragraph>
-<paragraph role="paragraph" id="par_id7736442" xml-lang="en-US" l10n="NEW">Select whether you want to print Slides, Handouts, Notes, or Outline.</paragraph>
-<paragraph role="heading" id="hd_id6184575" xml-lang="en-US" level="3" l10n="NEW">Slides per page</paragraph>
-<paragraph role="paragraph" id="par_id3150425" xml-lang="en-US" l10n="NEW">For handouts, select the number of slides to print per page of paper.</paragraph>
-<paragraph role="heading" id="hd_id226142" xml-lang="en-US" level="3" l10n="NEW">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id838648" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a horizontal order first.</paragraph>
-<paragraph role="heading" id="hd_id1110568" xml-lang="en-US" level="3" l10n="NEW">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3713797" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a vertical order first.</paragraph>
-</case>
-</switch>
-<paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Print range</paragraph>
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="CHG" oldref="23">Defines the print range for the current document.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0909200810043750" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
-<paragraph role="heading" id="hd_id3155450" xml-lang="en-US" level="3" l10n="U" oldref="24">All</paragraph>
-<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/>
-<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="26">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES">Prints only the pages that you specify in the <emph>Pages </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages</emph> box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
-<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use the format 3-6. To print single pages, use the format 7;9;11. If you want, you can print a combination of page ranges and single pages, by using the format 3-6;8;10;12. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/>
-<paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="29">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="31">Copies</paragraph>
-<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="32">Specify the number of copies that you want to print and the sorting options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/>
-<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Number of copies</paragraph>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/>
-<paragraph role="heading" id="hd_id3154390" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Collate</paragraph>
-<paragraph role="paragraph" id="par_id3150865" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE">Preserves the page order of the original document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" id="bm_id3146909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/>
-<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
-<paragraph role="paragraph" id="par_id3159086" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" visibility="hidden">Changes the printer settings for the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156080" xml-lang="en-US" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_idN1099E" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_idN109CD" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item> printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example: 
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid=".">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
+      <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox" id="bm_id0818200903241442" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0818200904102910" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For brochure printing, you can select a left-to-right order of pages or a right-to-left order.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="CHG" oldref="18"><ahelp hid="." visibility="hidden">Prints to a file instead of to a printer. When this option is enabled, the Print button is renamed to Print to file...</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints
+</caseinline></switchinline><comment>are these still needed?</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or 
+<paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash) 
+<paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options. 
+<paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
 </caseinline></switchinline></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01140000.xhp b/helpcontent2/source/text/shared/01/01140000.xhp
index 77d8dc9307..3062aa8c5c 100644
--- a/helpcontent2/source/text/shared/01/01140000.xhp
+++ b/helpcontent2/source/text/shared/01/01140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_SETUPPRINTER" id="bm_id1751760" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:PrinterSetup" id="bm_id3150620" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:MODALDIALOG:DLG_SVT_PRNDLG_PRNSETUPDLG" id="bm_id3147000" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG" id="bm_id3147000" localize="false"/>
 <paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="1" l10n="U" oldref="1">Printer Setup</paragraph>
 <paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckereinstellungtext"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_SVT_PRNDLG_PRNSETUPDLG">Select the default printer for the current document.</ahelp>
 </variable></paragraph>
@@ -65,7 +62,7 @@
 <paragraph role="paragraph" id="par_id3145211" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="sys"><caseinline select="WIN">Lists the information that applies to the selected printer. 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="19">If the list is empty, you need to install a default printer for your operating system. Refer to the online help for your operating system for instructions on how to install and setup a default printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:LISTBOX:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES" id="bm_id3147574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES" id="bm_id3147574" localize="false"/>
 <paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="6">Name</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS:LISTBOX:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES">Lists the installed printers on your operating system. To change the default printer, select a printer name from the list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="WIN">Status 
@@ -84,7 +81,7 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="sys"><caseinline select="WIN">Displays additional information for the printer. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES" id="bm_id3159413" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES" id="bm_id3159413" localize="false"/>
 <paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="17"><switchinline select="sys"><caseinline select="WIN"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES">Changes the printer settings of your operating system for the current document.</ahelp>
 </caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01160000.xhp b/helpcontent2/source/text/shared/01/01160000.xhp
index 9ac1ba2e61..516386985a 100644
--- a/helpcontent2/source/text/shared/01/01160000.xhp
+++ b/helpcontent2/source/text/shared/01/01160000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index a6cb2f44b9..b6a1ac024f 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160200.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,8 +42,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_MAIL_SENDDOC" id="bm_id1274021" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SendMail" id="bm_id3155619" localize="false"/>
 <paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01160200.xhp">Document as E-mail</link></paragraph>
-<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used. If the document is new and unsaved, the format specified in Tools - Options - Load/Save - General is used.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General is used.</paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#dokument"/>
diff --git a/helpcontent2/source/text/shared/01/01160300.xhp b/helpcontent2/source/text/shared/01/01160300.xhp
index 42a12eaaf2..0f83fe92e6 100755
--- a/helpcontent2/source/text/shared/01/01160300.xhp
+++ b/helpcontent2/source/text/shared/01/01160300.xhp
@@ -4,36 +4,28 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, 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.
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *    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.
- *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
diff --git a/helpcontent2/source/text/shared/01/01170000.xhp b/helpcontent2/source/text/shared/01/01170000.xhp
index 4353978a0f..5d4d0567fa 100644
--- a/helpcontent2/source/text/shared/01/01170000.xhp
+++ b/helpcontent2/source/text/shared/01/01170000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01180000.xhp b/helpcontent2/source/text/shared/01/01180000.xhp
index a0b4ecd983..072252766a 100644
--- a/helpcontent2/source/text/shared/01/01180000.xhp
+++ b/helpcontent2/source/text/shared/01/01180000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01180000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,28 +27,26 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+ 
+	
 <meta>
-<topic id="textshared0101180000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Save All</title>
-<filename>/text/shared/01/01180000.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>
-  
-  
-  <section id="allesspeichern">
-  <bookmark xml-lang="en-US" branch="hid/SID_SAVEDOCS" id="bm_id8186141" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:SaveAll" xml-lang="en-US" id="bm_id3149988"/><paragraph id="hd_id3150347" role="heading" level="1" oldref="4" l10n="U" xml-lang="en-US"><link href="text/shared/01/01180000.xhp" name="Save All">Save All</link></paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3151299" xml-lang="en-US" oldref="1"><ahelp hid=".uno:SaveAll" visibility="visible">Saves all open $[officename] documents.</ahelp> This command is only available if two or more files have been modified.</paragraph>
-  </section>
-  <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#saveall"/>
-</section>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3148440" l10n="U" oldref="3">If you are saving a new file or a copy of a read-only file, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog appears.</paragraph>
- </body>
-</helpdocument>
+      <topic id="textshared0101180000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Save All</title>
+         <filename>/text/shared/01/01180000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="allesspeichern">
+<bookmark xml-lang="en-US" branch="hid/SID_SAVEDOCS" id="bm_id8186141" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SaveAll" id="bm_id3149988" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150347" role="heading" level="1" l10n="U" oldref="4"><link href="text/shared/01/01180000.xhp" name="Save All">Save All</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151299" role="paragraph" l10n="CHG" oldref="1"><ahelp hid=".uno:SaveAll">Saves all modified $[officename] documents.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000401.xhp#saveall"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="U" oldref="3">If you are saving a new file or a copy of a read-only file, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog appears.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/01190000.xhp b/helpcontent2/source/text/shared/01/01190000.xhp
index 9fa195bfb6..2759dbe1f0 100644
--- a/helpcontent2/source/text/shared/01/01190000.xhp
+++ b/helpcontent2/source/text/shared/01/01190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01190000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,29 +55,29 @@
 <paragraph role="warning" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="22">If you save a copy of a file that contains version information (by choosing <emph>File - Save As)</emph>, the version information is not saved with the file.</paragraph>
 <paragraph role="heading" id="hd_id3149750" xml-lang="en-US" level="2" l10n="U" oldref="4">New versions</paragraph>
 <paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="5">Set the options for saving a new version of the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE" id="bm_id3151110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_SAVE" id="bm_id3151110" localize="false"/>
 <paragraph role="heading" id="hd_id3147243" xml-lang="en-US" level="3" l10n="U" oldref="6">Save New Version</paragraph>
 <paragraph role="paragraph" id="par_id3149149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE">Saves the current state of the document as a new version. If you want, you can also enter comments in the <emph>Insert Version Comment </emph>dialog before you save the new version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS" id="bm_id3154898" localize="false"/>
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="4" l10n="U" oldref="8">Insert Version Comment</paragraph>
 <paragraph role="paragraph" id="par_id3150466" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS">Enter a comment here when you are saving a new version. If you clicked <emph>Show </emph>to open this dialog, you cannot edit the comment.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE" id="bm_id3145316" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE" id="bm_id3145316" localize="false"/>
 <paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="3" l10n="U" oldref="10">Always save version when closing</paragraph>
 <paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE">If you have made changes to your document, $[officename] automatically saves a new version when you close the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MODALDIALOG:DLG_VERSIONS" id="bm_id3148642" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ModalDialog:DLG_VERSIONS" id="bm_id3148642" localize="false"/>
 <paragraph role="heading" id="hd_id3159167" xml-lang="en-US" level="2" l10n="U" oldref="12">Existing versions</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2:MODALDIALOG:DLG_VERSIONS">Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN" id="bm_id3158431" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_OPEN" id="bm_id3158431" localize="false"/>
 <paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="14">Open</paragraph>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN">Opens the selected version in a read-only window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_VIEW" id="bm_id3148943" localize="false"/>
 <paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="16">Show</paragraph>
 <paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW">Displays the entire comment for the selected version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE" id="bm_id3149655" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_DELETE" id="bm_id3149655" localize="false"/>
 <paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="2" l10n="U" oldref="18">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE">Deletes the selected version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_COMPARE" id="bm_id3154389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_COMPARE" id="bm_id3154389" localize="false"/>
 <paragraph role="heading" id="hd_id3148739" xml-lang="en-US" level="2" l10n="U" oldref="21">Compare</paragraph>
 <paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_COMPARE">Compare the changes that were made in each version.</ahelp>If you want, you can <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link>.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/01990000.xhp b/helpcontent2/source/text/shared/01/01990000.xhp
index 8e70e34d1a..5ed05c67de 100755
--- a/helpcontent2/source/text/shared/01/01990000.xhp
+++ b/helpcontent2/source/text/shared/01/01990000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01990000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02010000.xhp b/helpcontent2/source/text/shared/01/02010000.xhp
index 5375df1012..16d202a2ff 100644
--- a/helpcontent2/source/text/shared/01/02010000.xhp
+++ b/helpcontent2/source/text/shared/01/02010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,13 +53,13 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#do"/>
 </section>
-<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose Tools - Options - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
+<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
 <paragraph role="note" id="par_id3163803" xml-lang="en-US" l10n="U" oldref="8">Some commands (for example, editing Styles) cannot be undone.</paragraph>
 <paragraph role="tip" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="11">You can cancel the Undo command by choosing Edit - Redo.</paragraph>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">About the Undo command in database tables</paragraph>
 <paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="3">When you are working with database tables, you can only undo the last command.</paragraph>
 <paragraph role="warning" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="4">If you change the content of a record in a database table that has not been saved, and then use the<emph> Undo</emph> command, the record is erased.</paragraph>
 <paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="2" l10n="U" oldref="9">About the Undo command in presentations</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo </emph>list is cleared when you apply a new layout to a slide.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo</emph> list is cleared when you apply a new layout to a slide.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02020000.xhp b/helpcontent2/source/text/shared/01/02020000.xhp
index d22517e110..1f1316bc75 100644
--- a/helpcontent2/source/text/shared/01/02020000.xhp
+++ b/helpcontent2/source/text/shared/01/02020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,10 +35,6 @@
 <title id="tit" xml-lang="en-US">Redo</title>
 <filename>/text/shared/01/02020000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T11:24:18">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="wiederholen">
@@ -52,7 +45,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:Redo" id="bm_id3154840" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_IMAPDLG_REDO" id="bm_id3155069" localize="false"/>
 <paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02020000.xhp" name="Redo">Redo</link></paragraph>
-<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo </emph>command. To select the <emph>Undo </emph>step that you want to reverse, click the arrow next to the <emph>Redo </emph>icon on the Standard bar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#redo"/>
diff --git a/helpcontent2/source/text/shared/01/02030000.xhp b/helpcontent2/source/text/shared/01/02030000.xhp
index dd10dbee84..d98062dc21 100644
--- a/helpcontent2/source/text/shared/01/02030000.xhp
+++ b/helpcontent2/source/text/shared/01/02030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02030000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02040000.xhp b/helpcontent2/source/text/shared/01/02040000.xhp
index cceb5b43c9..491613ca43 100644
--- a/helpcontent2/source/text/shared/01/02040000.xhp
+++ b/helpcontent2/source/text/shared/01/02040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02050000.xhp b/helpcontent2/source/text/shared/01/02050000.xhp
index 287092bc85..219a8ce434 100644
--- a/helpcontent2/source/text/shared/01/02050000.xhp
+++ b/helpcontent2/source/text/shared/01/02050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02060000.xhp b/helpcontent2/source/text/shared/01/02060000.xhp
index 47aec3b646..16ffaec7cc 100644
--- a/helpcontent2/source/text/shared/01/02060000.xhp
+++ b/helpcontent2/source/text/shared/01/02060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02060000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_PASTE" id="bm_id1292341" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Paste" id="bm_id3149119" localize="false"/>
 <paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02060000.xhp" name="Paste">Paste</link></paragraph>
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects. Click the arrow next to the icon to select the format.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#insert"/>
diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp
index a26bcab3bd..9f3eefb33e 100644
--- a/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/helpcontent2/source/text/shared/01/02070000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02070000.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,12 +38,12 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_PASTE_OBJECT" id="bm_id3145138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_PASTE2" id="bm_id1247062" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_PASTE_OBJECT -->
+<!-- removed HID SID_PASTE2 -->
 <bookmark xml-lang="en-US" branch="hid/.uno:PasteClipboard" id="bm_id3149987" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_PASTESPECIAL" id="bm_id3567618" localize="false"/>
+<!-- removed HID FN_PASTESPECIAL -->
 <bookmark xml-lang="en-US" branch="hid/.uno:PasteSpecial" id="bm_id3154100" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FID_PASTE_CONTENTS" id="bm_id3076570" localize="false"/>
+<!-- removed HID FID_PASTE_CONTENTS -->
 <paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="1">Paste Special</paragraph>
 <paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2"><variable id="inhalteeinfuegentext"><ahelp hid=".uno:PasteSpecial">Inserts the contents of the clipboard into the current file in a format that you can specify.</ahelp>
 </variable></paragraph>
@@ -81,8 +78,8 @@
 <bookmark xml-lang="en-US" branch="hid/HID_PASTE_DLG" id="bm_id3156410" localize="false"/>
 <paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="5">Source</paragraph>
 <paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_PASTE_DLG">Displays the source of the clipboard contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id3154750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST" id="bm_id080420080314218" localize="false"/>
+<!-- removed HID SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id080420080314218" localize="false"/>
 <paragraph role="heading" id="hd_id3153684" xml-lang="en-US" level="3" l10n="U" oldref="7">Selection</paragraph>
 <paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST">Select a format for the clipboard contents that you want to paste.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="appl"><caseinline select="WRITER">When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments. 
@@ -97,42 +94,42 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="appl"><caseinline select="CALC">Select a format for the clipboard contents that you want to paste. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/>
 <paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, notes, formats, and objects into the current document.</ahelp>
+<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, comments, formats, and objects into the current document.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/>
 <paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text 
 </caseinline></switchinline><comment>i50436</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149244" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing text. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/>
 <paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="45"><switchinline select="appl"><caseinline select="CALC">Numbers 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing numbers. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/>
 <paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Date &amp; Time 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154226" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing date and time values. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/>
 <paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Formulas 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS">Inserts cells containing formulae.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes 
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/>
+<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Comments 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts notes that are attached to cells. If you want to add the notes to the existing cell content, select the "Add" operation. 
+<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/>
 <paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS"><switchinline select="appl"><caseinline select="CALC">Inserts cell format attributes. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS" id="bm_id3145202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS" id="bm_id3145202" localize="false"/>
 <paragraph role="heading" id="hd_id3156282" xml-lang="en-US" level="3" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="CALC">Objects 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS"><switchinline select="appl"><caseinline select="CALC">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects. 
@@ -141,27 +138,27 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3151351" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="CALC">Select the operation to apply when you paste cells into your sheet. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/>
 <paragraph role="heading" id="hd_id3153952" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">None 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP"><switchinline select="appl"><caseinline select="CALC">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/>
 <paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains notes, adds the notes to the target cells. 
+<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/>
 <paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB"><switchinline select="appl"><caseinline select="CALC">Subtracts the values in the clipboard cells from the values in the target cells. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/>
 <paragraph role="heading" id="hd_id3155312" xml-lang="en-US" level="3" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Multiply 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL"><switchinline select="appl"><caseinline select="CALC">Multiplies the values in the clipboard cells with the values in the target cells. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/>
 <paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="3" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="CALC">Divide 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV"><switchinline select="appl"><caseinline select="CALC">Divides the values in the target cells by the values in the clipboard cells. 
@@ -170,7 +167,7 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Sets the paste options for the clipboard contents. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/>
 <paragraph role="heading" id="hd_id3151052" xml-lang="en-US" level="3" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="CALC">Skip empty cells 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3148775" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the <emph>Multiply</emph> or the <emph>Divide</emph> operation, the operation is not applied to the target cell of an empty cell in the clipboard.</ahelp>
@@ -180,12 +177,12 @@
 <paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U" oldref="32">If you select a mathematical operation and clear the<emph> Skip empty cells </emph>box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/>
 <paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="CALC">Transpose 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147223" xml-lang="en-US" l10n="CHG" oldref="34"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</ahelp>
 </caseinline></switchinline><comment>i59261</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/>
 <paragraph role="heading" id="hd_id3152971" xml-lang="en-US" level="3" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="CALC">Link 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the <emph>Insert All</emph> option is also selected. </ahelp>
@@ -196,17 +193,17 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3145169" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="CALC">Set the shift options for the target cells when the clipboard content is inserted. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/>
 <paragraph role="heading" id="hd_id3155518" xml-lang="en-US" level="3" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="CALC">Don't shift 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154158" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE"><switchinline select="appl"><caseinline select="CALC">Inserted cells replace the target cells. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/>
 <paragraph role="heading" id="hd_id3148483" xml-lang="en-US" level="3" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="CALC">Down 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted downward when you insert cells from the clipboard. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/>
 <paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="3" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="CALC">Right 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted to the right when you insert cells from the clipboard. 
diff --git a/helpcontent2/source/text/shared/01/02090000.xhp b/helpcontent2/source/text/shared/01/02090000.xhp
index 17b5d0f670..dfd0d8e309 100644
--- a/helpcontent2/source/text/shared/01/02090000.xhp
+++ b/helpcontent2/source/text/shared/01/02090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02090000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 5f612cf3dd..6bdf31007c 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02100000.xhp,v $
- * $Revision: 1.15.4.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,61 +29,75 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0102100000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Find &amp; Replace</title>
-<filename>/text/shared/01/02100000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="suchenersetzen">le<comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
+      <topic id="textshared0102100000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Find &amp; Replace</title>
+         <filename>/text/shared/01/02100000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="suchenersetzen"><comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_SEARCH_ITEM" id="bm_id9184950" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SearchProperties" id="bm_id3160463" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_SEARCH_DLG" id="bm_id7754440" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/>
-<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
+<paragraph xml-lang="en-US" id="hd_id3154044" role="heading" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
+         <paragraph xml-lang="en-US" id="par_id3149893" role="paragraph" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000402.xhp#suchen"/>
-</section>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000402.xhp#suchen"/>
+      </section>
+
+<comment>Find Toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:FindText" id="bm_id001" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00001" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Type the text to search in the current document. Press Enter to search the text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:DownSearch" id="bm_id002" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00002" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in downward direction.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:UpSearch" id="bm_id003" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00003" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in upward direction.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
-<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_SEARCH:ED_REPLACE" id="bm_id3148621" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="8">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS" id="bm_id3155179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells 
+<paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="2" l10n="U" oldref="3">Search For</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155805" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
+<!-- removed HID SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS -->
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE" id="bm_id3148621" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152551" role="heading" level="2" l10n="U" oldref="5">Replace With</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
+<!-- removed HID SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS -->
+<paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3166410" role="heading" level="2" l10n="U" oldref="8">Options</paragraph>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U"
+                 oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
 </caseinline><defaultinline>Whole words only</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3149579" role="paragraph" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS" id="bm_id3152910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP" id="bm_id3153542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/>
-<paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS" id="bm_id7027802" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="2" l10n="U"
+                 oldref="14">Backwards</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP" id="bm_id5147862" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144439" role="heading" level="2" l10n="U"
+                 oldref="16"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Regular expressions</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
+      <paragraph xml-lang="en-US" id="par_id3155342" role="paragraph" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Allows you to use wildcards in your search.</defaultinline></switchinline></paragraph><comment>i72448
 Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment>
-<paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3727225" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
 <switch select="appl">
 <case select="DRAW">
 </case>
@@ -95,147 +106,178 @@ Ext help text not found within switches. Solution: Keep switched text for normal
 <default><embed href="text/shared/01/02100001.xhp#02100001"/>
 </default>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE" id="bm_id3147303" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="2" l10n="U"
+                 oldref="45">Match case</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154760"><bookmark_value>case sensitivity;searching</bookmark_value>
 </bookmark><comment>mw made "case sensitive.." a two level entry</comment>
-<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3154760" role="paragraph" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147264"><bookmark_value>finding; selections</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS" id="bm_id3152771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/>
-<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
-<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
-<paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS" id="bm_id7007354" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="2" l10n="U"
+                 oldref="47">Current selection only</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
+<!-- removed HID svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8876918" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
 <switch select="appl">
 <case select="DRAW">
 </case>
 <case select="IMPRESS">
 </case>
 <default>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
-<paragraph role="paragraph" id="par_id3155103" xml-lang="en-US" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
-<paragraph role="note" id="par_idN109CC" xml-lang="en-US" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
-<paragraph role="note" id="par_idN109DF" xml-lang="en-US" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
-<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
+<!-- removed HID svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="CHG"
+                 oldref="49">Search for Styles / Including Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155103" role="paragraph" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN109CC" role="note" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN109DF" role="note" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES" id="bm_id0302200901445934" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="3" l10n="NEW">Comments</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the comment texts in your searches.</ahelp></paragraph>
+      <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
 </default>
-</switch>
-<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
-<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled) 
+</switch><embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149167" role="heading" level="2" l10n="U"
+                 oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
-<paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled) 
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153178" role="heading" level="2" l10n="U"
+                 oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
+      <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
-<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149765" role="paragraph" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
-<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
-<paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/>
-<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
-<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/>
-<paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
-<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="2" l10n="U" oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
+      <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
+<switch select="appl">
+<case select="DRAW">
+</case>
+<case select="IMPRESS">
+</case>
+<default>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154299" role="heading" level="2" l10n="U" oldref="66">Find All</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
+</default>
+</switch>
+      <bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163821" role="heading" level="2" l10n="U"
+                 oldref="68">Find</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+                 oldref="70">Replace All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145660" role="paragraph" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE" id="bm_id2296212" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149065" role="heading" level="2" l10n="U"
+                 oldref="72">Replace</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151170" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147348" role="heading" level="2" l10n="U"
+                 oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER"><embed href="text/shared/01/02100200.xhp#attributetext"/>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
+<paragraph xml-lang="en-US" id="hd_id3155854" role="heading" level="2" l10n="U"
+                 oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
+<paragraph xml-lang="en-US" id="par_id8641315" role="paragraph" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/>
-<paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format 
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="U"
+                 oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats. 
+      <paragraph xml-lang="en-US" id="par_id3159155" role="paragraph" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id1334269" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id1334269" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150337" role="note" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><comment>More Options / Less Options / Fewer Options - name subject to change</comment>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in 
+<bookmark xml-lang="en-US" branch="hid/svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE" id="bm_id7809076" localize="false"/><comment>More Options / Less Options / Fewer Options - name subject to change</comment>
+<paragraph xml-lang="en-US" id="par_id3150113" role="paragraph" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="2" l10n="U"
+                 oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
-<paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas 
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS -->
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146925" role="heading" level="2" l10n="U"
+                 oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id6719870" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/>
-<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values 
+      <paragraph xml-lang="en-US" id="par_id6719870" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES -->
+<paragraph xml-lang="en-US" id="hd_id3149400" role="heading" level="2" l10n="U"
+                 oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas. 
+      <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/>
-<paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes 
+      <paragraph xml-lang="en-US" id="par_id6064943" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES -->
+<paragraph xml-lang="en-US" id="hd_id3145650" role="heading" level="2" l10n="U"
+                 oldref="146"><switchinline select="appl"><caseinline select="CALC">Comments
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells. 
+      <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the comments that are attached to the cells.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id9799798" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the notes that are attached to the cells.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="3" l10n="U" oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction 
+      <paragraph xml-lang="en-US" id="par_id9799798" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the comments that are attached to the cells.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153004" role="heading" level="2" l10n="U"
+                 oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells. 
+      <paragraph xml-lang="en-US" id="par_id3156332" role="paragraph" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells.
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS" id="bm_id3156362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
-<paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows 
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS -->
+<bookmark xml-lang="en-US" branch="hid/svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155064" role="heading" level="2" l10n="U"
+                 oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id743430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS" id="bm_id3155445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
-<paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns 
+      <paragraph xml-lang="en-US" id="par_id743430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS -->
+<bookmark xml-lang="en-US" branch="hid/svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156277" role="heading" level="2" l10n="U"
+                 oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145207" xml-lang="en-US" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns. 
+      <paragraph xml-lang="en-US" id="par_id3145207" role="paragraph" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3470564" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras 
+      <paragraph xml-lang="en-US" id="par_id3470564" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153764" role="heading" level="2" l10n="U"
+                 oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras
 </caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152960"><bookmark_value>searching; all sheets</bookmark_value>
-<bookmark_value>finding; in all sheets</bookmark_value>
-<bookmark_value>sheets; searching all</bookmark_value>
+      <bookmark_value>finding; in all sheets</bookmark_value>
+      <bookmark_value>sheets; searching all</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES" id="bm_id3151358" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
-<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets 
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152960" role="heading" level="2" l10n="U"
+                 oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145619" xml-lang="en-US" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file. 
+      <paragraph xml-lang="en-US" id="par_id3145619" role="paragraph" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="par_id4089175" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#schliessen"/>
+      <paragraph xml-lang="en-US" id="par_id3151101" role="tip" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/finding.xhp#finding"/>
-<embed href="text/swriter/guide/finding.xhp#finding"/>
-</section>
-</body>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+         <embed href="text/shared/01/02100001.xhp#02100001"/>
+         <embed href="text/swriter/guide/finding.xhp#finding"/>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 6e83808296..71dadfdd8b 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02100001.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,320 +29,330 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">List of Regular Expressions</title>
-<filename>/text/shared/01/02100001.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">List of Regular Expressions</title>
+         <filename>/text/shared/01/02100001.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146765"><bookmark_value>regular expressions; list of</bookmark_value>
-<bookmark_value>lists;regular expressions</bookmark_value>
-<bookmark_value>concatenation, see ampersand symbol</bookmark_value>
-<bookmark_value>ampersand symbol, see also operators</bookmark_value>
-</bookmark><comment>mw added two cross-references</comment><paragraph role="heading" id="hd_id3146765" xml-lang="en-US" level="1" l10n="U" oldref="203"><variable id="02100001"><link href="text/shared/01/02100001.xhp">List of Regular Expressions</link>
+      <bookmark_value>lists;regular expressions</bookmark_value>
+      <bookmark_value>replacing;tab stops (regular expressions)</bookmark_value>
+      <bookmark_value>tab stops;regular expressions</bookmark_value>
+      <bookmark_value>concatenation, see ampersand symbol</bookmark_value>
+      <bookmark_value>ampersand symbol, see also operators</bookmark_value>
+</bookmark><comment>mw added "replacing;" and "tab stops;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3146765" role="heading" level="1" l10n="U"
+                 oldref="203"><variable id="02100001"><link href="text/shared/01/02100001.xhp">List of Regular Expressions</link>
 </variable></paragraph>
-<table id="tbl_id3149517">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149741" xml-lang="en-US" l10n="U" oldref="17">Character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="18">Result/Use</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6600543" xml-lang="en-US" l10n="NEW">Any character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9824518.00000001" xml-lang="en-US" l10n="CHG">Represents the given character unless otherwise specified.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152427" xml-lang="en-US" l10n="U" oldref="19">.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149031" xml-lang="en-US" l10n="CHG" oldref="20">Represents any single character except for a line break or paragraph break. For example, the search term "sh.rt" returns both "shirt" and "short".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="21">^</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155351" xml-lang="en-US" l10n="CHG" oldref="22">Only finds the search term if the term is at the beginning of a paragraph. Special objects such as empty fields or character-anchored frames, at the beginning of a paragraph are ignored. Example: "^Peter".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159194" xml-lang="en-US" l10n="CHG" oldref="23">$</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152542" xml-lang="en-US" l10n="CHG" oldref="24">Only finds the search term if the term appears at the end of a paragraph. Special objects such as empty fields or character-anchored frames at the end of a paragraph are ignored. Example: "Peter$".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="25">*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155555" xml-lang="en-US" l10n="CHG" oldref="26">Finds zero or more of the characters in front of the "*". For example, "Ab*c" finds "Ac", "Abc", "Abbc", "Abbbc", and so on.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="27">+</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="28">Finds one or more of the characters in front of the "+". For example, "AX.+4" finds "AXx4", but not "AX4".</paragraph>
-<paragraph role="tablecontent" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="207">The longest possible string that matches this search pattern in a paragraph is always found. If the paragraph contains the string "AX 4 AX4", the entire passage is highlighted.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="199">?</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153684" xml-lang="en-US" l10n="CHG" oldref="200">Finds zero or one of the characters in front of the "?". For example, "Texts?" finds "Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="158">\</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="159">Search interprets the special character that follows the "\" as a normal character and not as a regular expression (except for the combinations \n, \t, \&gt;, and \&lt;). For example, "tree\." finds "tree.", not "treed" or "trees".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152945" xml-lang="en-US" l10n="U" oldref="166">\n</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153700" xml-lang="en-US" l10n="CHG" oldref="167">Represents a line break that was inserted with the Shift+Enter key combination. To change a line break into a paragraph break, enter <emph>\n</emph> in the <emph>Search for</emph> and <emph>Replace with</emph> boxes, and then perform a search and replace.</paragraph>
-<paragraph role="tablecontent" id="par_id9262672" xml-lang="en-US" l10n="NEW">\n in the <emph>Search for</emph> text box stands for a line break that was inserted with the Shift+Enter key combination.</paragraph>
-<paragraph role="tablecontent" id="par_id2366100" xml-lang="en-US" l10n="NEW">\n in the <emph>Replace with</emph> text box stands for a paragraph break that can be entered with the Enter or Return key.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153258" xml-lang="en-US" l10n="U" oldref="29">\t</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157809" xml-lang="en-US" l10n="CHG" oldref="30">Represents a tab. You can also use this expression in the <emph>Replace with</emph> box.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146775" xml-lang="en-US" l10n="U" oldref="33">\&gt;</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148644" xml-lang="en-US" l10n="U" oldref="34">Only finds the search term if it appears at the end of a word. For example, "book\&gt;" finds "checkbook", but not "bookmark".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150670" xml-lang="en-US" l10n="U" oldref="35">\&lt;</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153666" xml-lang="en-US" l10n="CHG" oldref="36">Only finds the search term if it appears at the beginning of a word. For example, "\&lt;book" finds "bookmark", but not "checkbook".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149576" xml-lang="en-US" l10n="U" oldref="37">^$</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151245" xml-lang="en-US" l10n="CHG" oldref="38">Finds an empty paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="41">^.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159413" xml-lang="en-US" l10n="CHG" oldref="42">Finds the first character of a paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147282" xml-lang="en-US" l10n="CHG" oldref="43">&amp; or $0</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153961" xml-lang="en-US" l10n="CHG" oldref="44">Adds the string that was found by the search criteria in the <emph>Search for</emph> box to the term in the <emph>Replace with</emph> box when you make a replacement.</paragraph>
-<paragraph role="tablecontent" id="par_id3149650" xml-lang="en-US" l10n="CHG" oldref="201">For example, if you enter "window" in the <emph>Search for</emph> box and "&amp;frame" in the <emph>Replace with</emph> box, the word "window" is replaced with "windowframe".</paragraph>
-<paragraph role="tablecontent" id="par_id3150543" xml-lang="en-US" l10n="CHG" oldref="206">You can also enter an "&amp;" in the <emph>Replace with</emph> box to modify the <emph>Attributes</emph> or the <emph>Format</emph> of the string found by the search criteria.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="172">[abc123]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154630" xml-lang="en-US" l10n="CHG" oldref="173">Represents one of the characters that are between the brackets.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="174">[a-e]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149167" xml-lang="en-US" l10n="CHG" oldref="175">Represents any of the characters that are between a and e.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="176">[a-eh-x]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148676" xml-lang="en-US" l10n="CHG" oldref="177">Represents any of the characters that are between a-e and h-x.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="178">[^a-s]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153351" xml-lang="en-US" l10n="CHG" oldref="179">Represents any character that is not between a and s.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156543" xml-lang="en-US" l10n="U" oldref="180">\xXXXX</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="181">Represents a special character based on its four-digit hexadecimal code (XXXX).</paragraph>
-<paragraph role="tablecontent" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="208">The code for the special character depends on the font used. You can view the codes by choosing <emph>Insert - Special Character</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="186">|</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154985" xml-lang="en-US" l10n="CHG" oldref="187">Finds the terms that occur before or after the "|". For example, "this|that" finds "this" and "that".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147376" xml-lang="en-US" l10n="U" oldref="209">{2}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds "tree".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151289" xml-lang="en-US" l10n="U" oldref="211">{1,2}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="212">Defines the number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds both "tree" and "treated".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4870754" xml-lang="en-US" l10n="NEW">{1,}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id843836" xml-lang="en-US" l10n="NEW">Defines the minimum number of times that the character in front of the opening bracket can occur. For example, "tre{2,}" finds "tree", "treee", and "treeeee".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="213">( )</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2701803" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box:</paragraph>
-<paragraph role="tablecontent" id="par_id3153573" xml-lang="en-US" l10n="CHG" oldref="214">Defines the characters inside the parentheses as a reference. You can then refer to the first reference in the current expression with "\1", to the second reference with "\2", and so on.</paragraph>
-<paragraph role="tablecontent" id="par_id3156061" xml-lang="en-US" l10n="U" oldref="215">For example, if your text contains the number 13487889 and you search using the regular expression (8)7\1\1, "8788" is found.</paragraph>
-<paragraph role="tablecontent" id="par_id2367931" xml-lang="en-US" l10n="NEW">You can also use () to group terms, for example, "a(bc)?d" finds "ad" or "abcd".</paragraph>
-<paragraph role="tablecontent" id="par_id9200109" xml-lang="en-US" l10n="NEW">In the <emph>Replace with</emph> box:<comment>i83322</comment></paragraph>
-<paragraph role="tablecontent" id="par_id5766472" xml-lang="en-US" l10n="NEW">Use $ (dollar) instead of \ (backslash) to replace references. Use $0 to replace the whole found string.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154790" xml-lang="en-US" l10n="U" oldref="226">[:alpha:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147397" xml-lang="en-US" l10n="CHG" oldref="227">Represents an alphabetic character. Use [:alpha:]+ to find one of them.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="216">[:digit:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150010" xml-lang="en-US" l10n="CHG" oldref="217">Represents a decimal digit. Use [:digit:]+ to find one of them.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153743" xml-lang="en-US" l10n="U" oldref="224">[:alnum:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153281" xml-lang="en-US" l10n="CHG" oldref="225">Represents an alphanumeric character ([:alpha:] and [:digit:]).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="218">[:space:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150961" xml-lang="en-US" l10n="CHG" oldref="219">Represents a space character (but not other whitespace characters).<comment>UFI: see #i41706#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="220">[:print:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150872" xml-lang="en-US" l10n="CHG" oldref="221">Represents a printable character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="222">[:cntrl:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152576" xml-lang="en-US" l10n="CHG" oldref="223">Represents a nonprinting character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="228">[:lower:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145730" xml-lang="en-US" l10n="CHG" oldref="229">Represents a lowercase character if <emph>Match case</emph> is selected in <emph>Options</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="230">[:upper:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150092" xml-lang="en-US" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id5311441" xml-lang="en-US" level="2" l10n="NEW">Examples</paragraph>
-<paragraph role="paragraph" id="par_id9568773" xml-lang="en-US" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
-<paragraph role="head3" id="hd_id71413" xml-lang="en-US" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
-<paragraph role="code" id="par_id2924283" xml-lang="en-US" l10n="NEW">^[:digit:]{3}$</paragraph>
-<paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW">^ means the match has to be at the start of a paragraph, </paragraph>
-<paragraph role="paragraph" id="par_id6942045" xml-lang="en-US" l10n="NEW">[:digit:] matches any decimal digit, </paragraph>
-<paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW">{3} means there must be exactly 3 copies of "digit", </paragraph>
-<paragraph role="paragraph" id="par_id5806756" xml-lang="en-US" l10n="NEW">$ means the match must end a paragraph. </paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/02100000.xhp#02100000"/>
-<paragraph role="paragraph" id="par_id1751457" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
-<paragraph role="paragraph" id="par_id5483870" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <table id="tbl_id3149517">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149741" role="tablehead" l10n="U" oldref="17">Character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155577" role="tablehead" l10n="U" oldref="18">Result/Use</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6600543" role="tablecontent" l10n="NEW">Any character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9824518.00000001" role="tablecontent" l10n="CHG">Represents the given character unless otherwise specified.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152427" role="tablecontent" l10n="U" oldref="19">.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149031" role="tablecontent" l10n="CHG" oldref="20">Represents any single character except for a line break or paragraph break. For example, the search term "sh.rt" returns both "shirt" and "short".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154682" role="tablecontent" l10n="CHG" oldref="21">^</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155351" role="tablecontent" l10n="CHG" oldref="22">Only finds the search term if the term is at the beginning of a paragraph. Special objects such as empty fields or character-anchored frames, at the beginning of a paragraph are ignored. Example: "^Peter".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159194" role="tablecontent" l10n="CHG" oldref="23">$</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152542" role="tablecontent" l10n="CHG" oldref="24">Only finds the search term if the term appears at the end of a paragraph. Special objects such as empty fields or character-anchored frames at the end of a paragraph are ignored. Example: "Peter$".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156414" role="tablecontent" l10n="U" oldref="25">*</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155555" role="tablecontent" l10n="CHG" oldref="26">Finds zero or more of the characters in front of the "*". For example, "Ab*c" finds "Ac", "Abc", "Abbc", "Abbbc", and so on.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147399" role="tablecontent" l10n="U" oldref="27">+</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157958" role="tablecontent" l10n="CHG" oldref="28">Finds one or more of the characters in front of the "+". For example, "AX.+4" finds "AXx4", but not "AX4".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145313" role="tablecontent" l10n="U" oldref="207">The longest possible string that matches this search pattern in a paragraph is always found. If the paragraph contains the string "AX 4 AX4", the entire passage is highlighted.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3143267" role="tablecontent" l10n="U" oldref="199">?</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153684" role="tablecontent" l10n="CHG" oldref="200">Finds zero or one of the characters in front of the "?". For example, "Texts?" finds "Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166410" role="tablecontent" l10n="U" oldref="158">\</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147209" role="tablecontent" l10n="CHG" oldref="159">Search interprets the special character that follows the "\" as a normal character and not as a regular expression (except for the combinations \n, \t, \&gt;, and \&lt;). For example, "tree\." finds "tree.", not "treed" or "trees".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152945" role="tablecontent" l10n="U" oldref="166">\n</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153700" role="tablecontent" l10n="CHG" oldref="167">Represents a line break that was inserted with the Shift+Enter key combination. To change a line break into a paragraph break, enter <emph>\n</emph> in the <emph>Search for</emph> and <emph>Replace with</emph> boxes, and then perform a search and replace.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id9262672" role="tablecontent" l10n="NEW">\n in the <emph>Search for</emph> text box stands for a line break that was inserted with the Shift+Enter key combination.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id2366100" role="tablecontent" l10n="NEW">\n in the <emph>Replace with</emph> text box stands for a paragraph break that can be entered with the Enter or Return key.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153258" role="tablecontent" l10n="U" oldref="29">\t</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157809" role="tablecontent" l10n="CHG" oldref="30">Represents a tab. You can also use this expression in the <emph>Replace with</emph> box.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146775" role="tablecontent" l10n="U" oldref="33">\&gt;</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148644" role="tablecontent" l10n="U" oldref="34">Only finds the search term if it appears at the end of a word. For example, "book\&gt;" finds "checkbook", but not "bookmark".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150670" role="tablecontent" l10n="U" oldref="35">\&lt;</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153666" role="tablecontent" l10n="CHG" oldref="36">Only finds the search term if it appears at the beginning of a word. For example, "\&lt;book" finds "bookmark", but not "checkbook".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149576" role="tablecontent" l10n="U" oldref="37">^$</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151245" role="tablecontent" l10n="CHG" oldref="38">Finds an empty paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148550" role="tablecontent" l10n="U" oldref="41">^.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159413" role="tablecontent" l10n="CHG" oldref="42">Finds the first character of a paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147282" role="tablecontent" l10n="CHG" oldref="43">&amp; or $0</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153961" role="tablecontent" l10n="CHG" oldref="44">Adds the string that was found by the search criteria in the <emph>Search for</emph> box to the term in the <emph>Replace with</emph> box when you make a replacement.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149650" role="tablecontent" l10n="CHG" oldref="201">For example, if you enter "window" in the <emph>Search for</emph> box and "&amp;frame" in the <emph>Replace with</emph> box, the word "window" is replaced with "windowframe".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150543" role="tablecontent" l10n="CHG" oldref="206">You can also enter an "&amp;" in the <emph>Replace with</emph> box to modify the <emph>Attributes</emph> or the <emph>Format</emph> of the string found by the search criteria.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145419" role="tablecontent" l10n="U" oldref="172">[abc123]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154630" role="tablecontent" l10n="CHG" oldref="173">Represents one of the characters that are between the brackets.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156293" role="tablecontent" l10n="U" oldref="174">[a-e]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e, including both start and end characters</paragraph>
+               <paragraph xml-lang="en-US" id="par_id100520090232005" role="tablecontent" l10n="NEW">The characters are ordered by their code numbers.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155994" role="tablecontent" l10n="U" oldref="176">[a-eh-x]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148676" role="tablecontent" l10n="CHG" oldref="177">Represents any of the characters that are between a-e and h-x.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145318" role="tablecontent" l10n="U" oldref="178">[^a-s]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents everything that is not between a and s.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156543" role="tablecontent" l10n="U" oldref="180">\xXXXX</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153768" role="tablecontent" l10n="U" oldref="181">Represents a special character based on its four-digit hexadecimal code (XXXX).</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3159252" role="tablecontent" l10n="U" oldref="208">The code for the special character depends on the font used. You can view the codes by choosing <emph>Insert - Special Character</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153951" role="tablecontent" l10n="U" oldref="186">|</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before the "|" and also finds the terms that occur after the "|". For example, "this|that" finds "this" and "that".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147376" role="tablecontent" l10n="U" oldref="209">{2}</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds and selects "tree".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151289" role="tablecontent" l10n="U" oldref="211">{1,2}</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="CHG" oldref="212">Defines the minimum and maximum number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds and selects "tre" and "tree".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4870754" role="tablecontent" l10n="NEW">{1,}</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id843836" role="tablecontent" l10n="NEW">Defines the minimum number of times that the character in front of the opening bracket can occur. For example, "tre{2,}" finds "tree", "treee", and "treeeee".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148616" role="tablecontent" l10n="U" oldref="213">( )</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2701803" role="tablecontent" l10n="NEW">In the <emph>Search for</emph> box:</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153573" role="tablecontent" l10n="CHG" oldref="214">Defines the characters inside the parentheses as a reference. You can then refer to the first reference in the current expression with "\1", to the second reference with "\2", and so on.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156061" role="tablecontent" l10n="U" oldref="215">For example, if your text contains the number 13487889 and you search using the regular expression (8)7\1\1, "8788" is found.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id2367931" role="tablecontent" l10n="NEW">You can also use () to group terms, for example, "a(bc)?d" finds "ad" or "abcd".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id9200109" role="tablecontent" l10n="NEW">In the <emph>Replace with</emph> box:<comment>i83322</comment></paragraph>
+               <paragraph xml-lang="en-US" id="par_id5766472" role="tablecontent" l10n="NEW">Use $ (dollar) instead of \ (backslash) to replace references. Use $0 to replace the whole found string.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154790" role="tablecontent" l10n="U" oldref="226">[:alpha:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147397" role="tablecontent" l10n="CHG" oldref="227">Represents an alphabetic character. Use [:alpha:]+ to find one of them.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152885" role="tablecontent" l10n="U" oldref="216">[:digit:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150010" role="tablecontent" l10n="CHG" oldref="217">Represents a decimal digit. Use [:digit:]+ to find one of them.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153743" role="tablecontent" l10n="U" oldref="224">[:alnum:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153281" role="tablecontent" l10n="CHG" oldref="225">Represents an alphanumeric character ([:alpha:] and [:digit:]).</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153726" role="tablecontent" l10n="U" oldref="218">[:space:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150961" role="tablecontent" l10n="CHG" oldref="219">Represents a space character (but not other whitespace characters).<comment>UFI: see #i41706#</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150486" role="tablecontent" l10n="U" oldref="220">[:print:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150872" role="tablecontent" l10n="CHG" oldref="221">Represents a printable character.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155854" role="tablecontent" l10n="U" oldref="222">[:cntrl:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152576" role="tablecontent" l10n="CHG" oldref="223">Represents a nonprinting character.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149958" role="tablecontent" l10n="U" oldref="228">[:lower:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145730" role="tablecontent" l10n="CHG" oldref="229">Represents a lowercase character if <emph>Match case</emph> is selected in <emph>Options</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148455" role="tablecontent" l10n="U" oldref="230">[:upper:]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150092" role="tablecontent" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
+               </paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id5311441" role="heading" level="2" l10n="NEW">Examples</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9568773" role="paragraph" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id71413" role="heading" level="3" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2924283" role="code" l10n="NEW">^[:digit:]{3}$</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5781731" role="paragraph" l10n="NEW">^ means the match has to be at the start of a paragraph, </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6942045" role="paragraph" l10n="NEW">[:digit:] matches any decimal digit, </paragraph>
+      <paragraph xml-lang="en-US" id="par_id4721823" role="paragraph" l10n="NEW">{3} means there must be exactly 3 copies of "digit", </paragraph>
+      <paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">$ means the match must end a paragraph. </paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/01/02100000.xhp#02100000"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+         <embed href="text/swriter/guide/finding.xhp#finding"/>
+</case>
+</switch>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02100100.xhp b/helpcontent2/source/text/shared/01/02100100.xhp
index 1ebcb43de9..ddcebbf243 100755
--- a/helpcontent2/source/text/shared/01/02100100.xhp
+++ b/helpcontent2/source/text/shared/01/02100100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02100100.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156045"><bookmark_value>similarity search</bookmark_value>
 <bookmark_value>finding; similarity search</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_SIMILARITY" id="bm_id3148410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY" id="bm_id3148410" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROX" id="bm_id3154814" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROXSETTINGS" id="bm_id3154817" localize="false"/>
 <paragraph role="heading" id="hd_id3156045" xml-lang="en-US" level="1" l10n="U" oldref="52"><link href="text/shared/01/02100100.xhp" name="Similarity Search">Similarity Search</link></paragraph>
@@ -55,21 +52,21 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000402.xhp#suchenaehnlichkeit"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_SIMILARITY" id="bm_id3155351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY" id="bm_id3155351" localize="false"/>
 <paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="2" l10n="U" oldref="54">...</paragraph>
 <paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_SIMILARITY">Set the options for the similarity search.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="U" oldref="56">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="U" oldref="57">Define the criteria for determining if a word is similar to the search term.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER" id="bm_id3155338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER" id="bm_id3155338" localize="false"/>
 <paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="58">Exchange characters</paragraph>
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER">Enter the number of characters in the search term that can be exchanged.</ahelp> For example, if you specify 2 exchanged characters, "black" and "crack" are considered similar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER" id="bm_id3150443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER" id="bm_id3150443" localize="false"/>
 <paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="60">Add characters</paragraph>
 <paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER">Enter the maximum number of characters by which a word can exceed the number of characters in the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER" id="bm_id3158430" localize="false"/>
 <paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="3" l10n="U" oldref="62">Remove characters</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER">Enter the number of characters by which a word can be shorter than the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX" id="bm_id3159400" localize="false"/>
 <paragraph role="heading" id="hd_id3153700" xml-lang="en-US" level="3" l10n="U" oldref="64">Combine</paragraph>
 <paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX">Searches for a term that matches any combination of the similarity search settings.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/02100200.xhp b/helpcontent2/source/text/shared/01/02100200.xhp
index 16d3a5a27c..6748512c56 100755
--- a/helpcontent2/source/text/shared/01/02100200.xhp
+++ b/helpcontent2/source/text/shared/01/02100200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02100200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="1" l10n="U" oldref="1">Attributes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="1" l10n="U" oldref="1">Attributes</paragraph>
 <paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="2"><variable id="attributetext"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE">Choose the text attributes that you want to search for. For example, if you search for the <emph>Font</emph> attribute, all instances of text that do not use the default font are found. All text that has a directly coded font attribute, and all text where a style switches the font attribute, are found. </ahelp>
 </variable></paragraph>
 <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
diff --git a/helpcontent2/source/text/shared/01/02100300.xhp b/helpcontent2/source/text/shared/01/02100300.xhp
index 46cc12b471..e75e1f7a5e 100644
--- a/helpcontent2/source/text/shared/01/02100300.xhp
+++ b/helpcontent2/source/text/shared/01/02100300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02100300.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,8 +63,8 @@
 <embed href="text/shared/01/05020700.xhp#asitypo"/>
 </case>
 </switch><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id3151100" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_FORMAT" id="bm_id6877651" localize="false"/><paragraph role="paragraph" id="par_id3062837" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id3151100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id6877651" localize="false"/><paragraph role="paragraph" id="par_id3062837" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="C"><link href="text/shared/01/02100200.xhp" name="Attributes">Attributes</link></paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/01/02110000.xhp b/helpcontent2/source/text/shared/01/02110000.xhp
index ad1acee33f..7adc74931f 100644
--- a/helpcontent2/source/text/shared/01/02110000.xhp
+++ b/helpcontent2/source/text/shared/01/02110000.xhp
@@ -4,36 +4,28 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, 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.
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *    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.
- *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
@@ -58,7 +50,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3145313" role="paragraph" l10n="E">
-<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -75,7 +67,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="E">
-<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -93,7 +85,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3159166" role="paragraph" l10n="E">
-<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -132,7 +124,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="E">
-<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -165,7 +157,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3151351" role="paragraph" l10n="E">
-<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -182,7 +174,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154790" role="paragraph" l10n="E">
-<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -199,7 +191,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3156178" role="paragraph" l10n="E">
-<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index ad65cf89cb..f85b77a879 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02180000.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,53 +31,64 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0102180000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Edit Links</title>
-<filename>/text/shared/01/02180000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_UPDATE_BASELINKS" id="bm_id3151299" localize="false"/>
+      <topic id="textshared0102180000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Edit Links</title>
+         <filename>/text/shared/01/02180000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<!-- removed HID SO3:MODALDIALOG:MD_UPDATE_BASELINKS -->
 <bookmark xml-lang="en-US" branch="hid/FN_EDIT_LINK_DLG" id="bm_id199976" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:LinkDialog" id="bm_id3150008" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_LINKS" id="bm_id5458456" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EditLinks" id="bm_id3154926" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_MANAGE_LINKS" id="bm_id4013242" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ManageLinks" id="bm_id3147588" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening; files with links</bookmark_value>
-<bookmark_value>links; updating specific links</bookmark_value>
-<bookmark_value>updating; links, on opening</bookmark_value>
-<bookmark_value>links; opening files with</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150279" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Links</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening;documents with links</bookmark_value>
+      <bookmark_value>links; updating specific links</bookmark_value>
+      <bookmark_value>updating; links, on opening</bookmark_value>
+      <bookmark_value>links; opening files with</bookmark_value>
+</bookmark><comment>MW changed "opening;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3150279" role="heading" level="1" l10n="U" oldref="1">Edit Links</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000402.xhp#link"/>
-</section>
-<paragraph role="note" id="par_id3156156" xml-lang="en-US" l10n="U" oldref="27">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</paragraph>
-<paragraph role="note" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/><paragraph role="paragraph" id="par_idN10646" xml-lang="en-US" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155503" xml-lang="en-US" level="2" l10n="U" oldref="3">Source file</paragraph>
-<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
-<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="2" l10n="U" oldref="11">Element</paragraph>
-<paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="12">Lists the application (if known) that last saved the source file.</paragraph>
-<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="7">Type</paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="8">Lists the file type, such as graphic, of the source file.</paragraph>
-<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Status</paragraph>
-<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US" l10n="U" oldref="10">Lists additional information about the source file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC" id="bm_id3148550" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="30">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL" id="bm_id3154365" localize="false"/><paragraph role="heading" id="hd_id3154938" xml-lang="en-US" level="2" l10n="U" oldref="17">Manual</paragraph>
-<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL">Only updates the link when you click the <emph>Update </emph>button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW" id="bm_id3155994" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="19">Update</paragraph>
-<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="2" l10n="U" oldref="23">Break Link</paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000402.xhp#link"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156156" role="note" l10n="U" oldref="27">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143270" role="note" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10646" role="paragraph" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155503" role="heading" level="2" l10n="U" oldref="3">Source file</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155449" role="heading" level="2" l10n="U"
+                 oldref="11">Element</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="12">Lists the application (if known) that last saved the source file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153061" role="heading" level="2" l10n="U" oldref="7">Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="8">Lists the file type, such as graphic, of the source file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156343" role="heading" level="2" l10n="U" oldref="9">Status</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149046" role="paragraph" l10n="U" oldref="10">Lists additional information about the source file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC" id="bm_id0720200903092114" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="2" l10n="U"
+                 oldref="15">Automatic</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147304" role="paragraph" l10n="U" oldref="16"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="CHG" oldref="30">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL" id="bm_id0720200903100119" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154938" role="heading" level="2" l10n="U"
+                 oldref="17">Manual</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151210" role="paragraph" l10n="U" oldref="18"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL">Only updates the link when you click the <emph>Update </emph>button.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW" id="bm_id0720200903105198" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156280" role="heading" level="2" l10n="U"
+                 oldref="19">Update</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="20"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE" id="bm_id0720200903111714" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151381" role="heading" level="2" l10n="U"
+                 oldref="21">Modify</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="U" oldref="22"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK" id="bm_id0720200903114311" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147084" role="heading" level="2" l10n="U"
+                 oldref="23">Break Link</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="24"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02180100.xhp b/helpcontent2/source/text/shared/01/02180100.xhp
index 90d2d9154e..c5604a98e9 100755
--- a/helpcontent2/source/text/shared/01/02180100.xhp
+++ b/helpcontent2/source/text/shared/01/02180100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02180100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,13 +52,13 @@
 </section>
 <paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2" l10n="U" oldref="3">Edit Links</paragraph>
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="4">Lets you set the properties for the selected link.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP" id="bm_id3155552" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP -->
 <paragraph role="heading" id="hd_id3148548" xml-lang="en-US" level="3" l10n="U" oldref="5">Application:</paragraph>
 <paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP">Lists the application that last saved the source file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC" id="bm_id3149389" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC -->
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="7">File:</paragraph>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC">Lists the path to the source file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM" id="bm_id3155536" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM -->
 <paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="3" l10n="U" oldref="9">Section</paragraph>
 <paragraph role="paragraph" id="par_id3146958" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM">Lists the section that the link refers to in the source file. If you want, you can enter a new section here.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/02190000.xhp b/helpcontent2/source/text/shared/01/02190000.xhp
index fb06182f78..571fa002d2 100644
--- a/helpcontent2/source/text/shared/01/02190000.xhp
+++ b/helpcontent2/source/text/shared/01/02190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02190000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200000.xhp b/helpcontent2/source/text/shared/01/02200000.xhp
index 7eb1095213..191acad6af 100644
--- a/helpcontent2/source/text/shared/01/02200000.xhp
+++ b/helpcontent2/source/text/shared/01/02200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02200000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200100.xhp b/helpcontent2/source/text/shared/01/02200100.xhp
index 6a5ea25e34..50ee2e808b 100755
--- a/helpcontent2/source/text/shared/01/02200100.xhp
+++ b/helpcontent2/source/text/shared/01/02200100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02200100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200200.xhp b/helpcontent2/source/text/shared/01/02200200.xhp
index 47965a9cae..f29c803241 100755
--- a/helpcontent2/source/text/shared/01/02200200.xhp
+++ b/helpcontent2/source/text/shared/01/02200200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02200200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02210101.xhp b/helpcontent2/source/text/shared/01/02210101.xhp
index 7f16dc243f..f62b17fa76 100755
--- a/helpcontent2/source/text/shared/01/02210101.xhp
+++ b/helpcontent2/source/text/shared/01/02210101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02210101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,58 +40,58 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SFX2:TABPAGE:TP_FRAMEPROPERTIES" id="bm_id3153383" localize="false"/><paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02210101.xhp" name="Floating Frame Properties">Floating Frame Properties</link></paragraph>
+<!-- removed HID SFX2:TABPAGE:TP_FRAMEPROPERTIES --><paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02210101.xhp" name="Floating Frame Properties">Floating Frame Properties</link></paragraph>
 <paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SFX2:TABPAGE:TP_FRAMEPROPERTIES">Changes the properties of the selected floating frame. Floating frames work best when they contain an html document, and when they are inserted in another html document.</ahelp></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#rahmeneigenschaften"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME" id="bm_id3149549" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME" id="bm_id8971221.00000001" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
+<!-- removed HID SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME" id="bm_id8971221.00000001" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME">Enter a name for the floating frame. The name cannot contain spaces, special characters, or begin with an underscore ( _ ).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL" id="bm_id3149798" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL" id="bm_id3061311" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="5">Contents</paragraph>
+<!-- removed HID SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL" id="bm_id3061311" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="5">Contents</paragraph>
 <paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL">Enter the path and the name of the file that you want to display in the floating frame. You can also click the <emph>...</emph> button and locate the file that you want to display.</ahelp> For example, you can enter:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.sun.com</paragraph>
+<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.example.com</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="8">file:///c|/Readme.txt </paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN" id="bm_id3153346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN" id="bm_id1442609" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="2" l10n="U" oldref="10">...</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN" id="bm_id1442609" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="2" l10n="U" oldref="10">...</paragraph>
 <paragraph role="paragraph" id="par_id3155355" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN">Locate the file that you want to display in the selected floating frame, and then click <emph>Open</emph>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="12">Scrollbar</paragraph>
 <paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="13">Add or remove a scrollbar from the selected floating frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON" id="bm_id3152781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON" id="bm_id6702475" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="14">On</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON" id="bm_id6702475" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="14">On</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON">Displays the scrollbar for the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF" id="bm_id3147574" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF" id="bm_id7322916" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="16">Off</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF" id="bm_id7322916" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="16">Off</paragraph>
 <paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF">Hides the scrollbar for the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO" id="bm_id3153254" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO" id="bm_id6200140" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="18">Automatic</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO" id="bm_id6200140" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="18">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO">Mark this option if the currently active floating frame can have a scrollbar when needed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="20">Border</paragraph>
 <paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="21">Displays or hides the border of the floating frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON" id="bm_id3155504" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON" id="bm_id6881923" localize="false"/><paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="3" l10n="U" oldref="22">On</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON" id="bm_id6881923" localize="false"/><paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="3" l10n="U" oldref="22">On</paragraph>
 <paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON">Displays the border of the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF" id="bm_id3159157" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_OFF" id="bm_id8719138" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="24">Off</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF" id="bm_id8719138" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="24">Off</paragraph>
 <paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF">Hides the border of the floating frame.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="28">Spacing to contents</paragraph>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Define the amount of space that is left between the border of the floating frame and the contents of the floating frame provided that both documents inside and outside the floating frame are HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH" id="bm_id3148550" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH" id="bm_id1487472" localize="false"/><paragraph role="heading" id="hd_id3152473" xml-lang="en-US" level="3" l10n="U" oldref="30">Width</paragraph>
+<!-- removed HID SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH" id="bm_id1487472" localize="false"/><paragraph role="heading" id="hd_id3152473" xml-lang="en-US" level="3" l10n="U" oldref="30">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH">Enter the amount of horizontal space that you want to leave between the right and the left edges of the floating frame and the contents of the frame. Both documents inside and outside the floating frame must be HTML documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT" id="bm_id3145069" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT" id="bm_id869777" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="32">Height</paragraph>
+<!-- removed HID SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT" id="bm_id869777" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="32">Height</paragraph>
 <paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT">Enter the amount of vertical space that you want to leave between the top and bottom edges of the floating frame and the contents of the frame. Both documents inside and outside the floating frame must be HTML documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINWIDTHDEFAULT" id="bm_id3148739" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT" id="bm_id3154936" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT" id="bm_id1459089" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
+<!-- removed HID SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINWIDTHDEFAULT -->
+<!-- removed HID SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT" id="bm_id1459089" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
 <paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT">Applies the default spacing.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02220000.xhp b/helpcontent2/source/text/shared/01/02220000.xhp
index 5b6a994072..4bc8de6903 100644
--- a/helpcontent2/source/text/shared/01/02220000.xhp
+++ b/helpcontent2/source/text/shared/01/02220000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02220000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/SID_IMAP" id="bm_id7843932" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ImageMapDialog" id="bm_id3085157" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP" id="bm_id3150756" localize="false"/><paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1">ImageMap Editor</paragraph>
+<!-- removed HID SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP --><paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1">ImageMap Editor</paragraph>
 <paragraph role="paragraph" id="par_id3159194" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="imagemaptext"><ahelp hid="SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP">Allows you to attach URLs to specific areas, called hotspots, on a graphic or a group of graphics. An image map is a group of one or more hotspots.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
@@ -263,9 +260,9 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAP:CBB_URL" id="bm_id3150662" localize="false"/><paragraph role="heading" id="hd_id3144418" xml-lang="en-US" level="2" l10n="U" oldref="29">Address:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL" id="bm_id3150662" localize="false"/><paragraph role="heading" id="hd_id3144418" xml-lang="en-US" level="2" l10n="U" oldref="29">Address:</paragraph>
 <paragraph role="paragraph" id="par_id3157969" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAP:CBB_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to an anchor within the document, the address should be of the form "file:///C/document_name#anchor_name".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAP:EDT_TEXT" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3146132" xml-lang="en-US" level="2" l10n="U" oldref="31">Text:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3146132" xml-lang="en-US" level="2" l10n="U" oldref="31">Text:</paragraph>
 <paragraph role="paragraph" id="par_id3159090" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAP:EDT_TEXT">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp> If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
 <paragraph role="heading" id="hd_id3158445" xml-lang="en-US" level="2" l10n="U" oldref="33">Frame:</paragraph>
 <paragraph role="paragraph" id="par_id3150208" xml-lang="en-US" l10n="U" oldref="34">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name from the list.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02220100.xhp b/helpcontent2/source/text/shared/01/02220100.xhp
index 41414cb091..547236c9e9 100755..100644
--- a/helpcontent2/source/text/shared/01/02220100.xhp
+++ b/helpcontent2/source/text/shared/01/02220100.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02220100.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,33 +31,43 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Description</title>
-<filename>/text/shared/01/02220100.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SVX:MODALDIALOG:RID_SVXDLG_IMAPURL" id="bm_id3145416" localize="false"/><paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="1" l10n="U" oldref="1">Description</paragraph>
-<paragraph role="paragraph" id="par_id3152910" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:MODALDIALOG:RID_SVXDLG_IMAPURL">Lists the properties for the selected hotspot.</ahelp></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000402.xhp#imapeigbea"/>
-</section>
-<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyperlink</paragraph>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="4">Lists the properties of the URL that is attached to the hotspot.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="5">URL:</paragraph>
-<paragraph role="paragraph" id="par_id3155831" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to a named anchor within the current document, the address should be of the form “file:///C/[current_document_name]#anchor_name”.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153827" xml-lang="en-US" level="3" l10n="U" oldref="7">Alternative text:</paragraph>
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp>If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="9">Frame:</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list.</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="11">Name:</paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME">Enter a name for the image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1244989956" id="bm_id3190710" localize="false"/><paragraph role="heading" id="hd_id7557298" xml-lang="en-US" level="3" l10n="NEW">Description</paragraph>
-<paragraph role="paragraph" id="par_id5057222" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp><comment>see http://specs.openoffice.org/appwide/drawing_layer/imagemapdialog.odt</comment></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Description</title>
+         <filename>/text/shared/01/02220100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1202200909085990"><bookmark_value>hotspots;properties</bookmark_value>
+      <bookmark_value>properties;hotspots</bookmark_value>
+      <bookmark_value>ImageMap;hotspot properties</bookmark_value>
+</bookmark><comment>MW inserted index entries</comment>
+<bookmark xml-lang="en-US" branch="hid/SVX:MODALDIALOG:RID_SVXDLG_IMAPURL" id="bm_id3145416" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="1" l10n="U" oldref="1">Description</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152910" role="paragraph" l10n="U" oldref="2"><ahelp hid="SVX:MODALDIALOG:RID_SVXDLG_IMAPURL">Lists the properties for the selected hotspot.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000402.xhp#imapeigbea"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3150976" role="heading" level="2" l10n="U" oldref="3">Hyperlink</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="4">Lists the properties of the URL that is attached to the hotspot.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL" id="bm_id3149955" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156327" role="heading" level="2" l10n="U" oldref="5">URL:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155831" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to a named anchor within the current document, the address should be of the form "file:///C/[current_document_name]#anchor_name".</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION" id="bm_id3154307" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153827" role="heading" level="2" l10n="U" oldref="7">Alternative text:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp>If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS" id="bm_id3144510" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149166" role="heading" level="2" l10n="U" oldref="9">Frame:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list.</ahelp>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME" id="bm_id3149294" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147530" role="heading" level="2" l10n="U"
+                 oldref="11">Name:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME">Enter a name for the image.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_MULTILINEEDIT_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION" id="bm_id3190710" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7557298" role="heading" level="2" l10n="NEW">Description</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5057222" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02230000.xhp b/helpcontent2/source/text/shared/01/02230000.xhp
index f9d42dac18..506c4a233f 100755
--- a/helpcontent2/source/text/shared/01/02230000.xhp
+++ b/helpcontent2/source/text/shared/01/02230000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230100.xhp b/helpcontent2/source/text/shared/01/02230100.xhp
index 7018963477..51e2f3ae23 100644
--- a/helpcontent2/source/text/shared/01/02230100.xhp
+++ b/helpcontent2/source/text/shared/01/02230100.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02230100.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,11 +51,9 @@
   <embed href="text/shared/00/00000402.xhp#aufzeichnen"/>
 </section>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl">
-<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <emph><link href="text/shared/optionen/01040700.xhp" name="Writer - Changes">%PRODUCTNAME Writer - Changes</link></emph> in the Options dialog box.</caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
-<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="7">The following changes are tracked when the record changes command is active:</paragraph>
 <switch select="appl">
 <case select="WRITER"><list type="unordered">
@@ -118,11 +113,6 @@
 
 </case>
 </switch>
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="note" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="18">Changes made to formulas or numbers in tables are not recorded.</paragraph>
-
-</case>
-</switch>
+<comment>removed the note about no-tables-comparing in Writer</comment>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02230150.xhp b/helpcontent2/source/text/shared/01/02230150.xhp
index a30d013636..0396bdf89b 100644
--- a/helpcontent2/source/text/shared/01/02230150.xhp
+++ b/helpcontent2/source/text/shared/01/02230150.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230150.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230200.xhp b/helpcontent2/source/text/shared/01/02230200.xhp
index 4af15f460a..933eab75be 100644
--- a/helpcontent2/source/text/shared/01/02230200.xhp
+++ b/helpcontent2/source/text/shared/01/02230200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,26 +54,20 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000402.xhp#anzeigen"/>
 </section>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing<switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>. 
-</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp>
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
+<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp></caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="CALC"><embed href="text/shared/01/02230402.xhp#calc"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
-<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes 
-</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
+<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes</caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT">Shows or hides the changes that were accepted.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
 <paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="2" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="CALC">Show rejected changes 
 </caseinline></switchinline></paragraph>
 <paragraph role="relatedtopics" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT">Shows or hides the changes that were rejected.</ahelp>
diff --git a/helpcontent2/source/text/shared/01/02230300.xhp b/helpcontent2/source/text/shared/01/02230300.xhp
index 6d313daaee..99a41e51a2 100644
--- a/helpcontent2/source/text/shared/01/02230300.xhp
+++ b/helpcontent2/source/text/shared/01/02230300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230400.xhp b/helpcontent2/source/text/shared/01/02230400.xhp
index 369d4e8fcf..2fe124cb04 100644
--- a/helpcontent2/source/text/shared/01/02230400.xhp
+++ b/helpcontent2/source/text/shared/01/02230400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index deed07c0a1..afdcfc72de 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230401.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -101,7 +98,6 @@
 </tablecell>
 </tablerow>
 </table>
-
 </case>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_DG_VIEW" id="bm_id3151384" localize="false"/>
@@ -117,26 +113,35 @@
 <paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC">Lists the cells with contents that were changed. 
 </caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_AUTHOR" id="bm_id3149765" localize="false"/>
-<paragraph role="heading" id="hd_id3148452" xml-lang="en-US" level="3" l10n="U" oldref="12">Author</paragraph>
-<paragraph role="paragraph" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148452" role="heading" level="3" l10n="U"
+                 oldref="12">Author</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153178" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_DATE" id="bm_id3145171" localize="false"/>
-<paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="3" l10n="U" oldref="14">Date</paragraph>
-<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="3" l10n="U"
+                 oldref="14">Date</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156422" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_COMMENT" id="bm_id3145744" localize="false"/>
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="16">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+                 oldref="16">Comment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150868" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPT" id="bm_id3153106" localize="false"/>
-<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="18">Accept</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_ACCEPT_DIRECT" id="bm_id0122200903133817" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154218" role="heading" level="2" l10n="U"
+                 oldref="18">Accept</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECT" id="bm_id3157892" localize="false"/>
-<paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="2" l10n="U" oldref="22">Reject</paragraph>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_REJECT_DIRECT" id="bm_id0122200903140685" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="2" l10n="U"
+                 oldref="22">Reject</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150441" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPTALL" id="bm_id3149985" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="20">Accept All</paragraph>
-<paragraph role="paragraph" id="par_id3150012" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155429" role="heading" level="2" l10n="U"
+                 oldref="20">Accept All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150012" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECTALL" id="bm_id3153093" localize="false"/>
-<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="24">Reject All</paragraph>
-<paragraph role="paragraph" id="par_id3151353" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+                 oldref="24">Reject All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151353" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
 <switch select="appl">
 <case select="WRITER">
 <paragraph role="note" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="28">To reverse the acceptance or rejection of a change, choose <emph>Undo </emph>on the <emph>Edit </emph>menu.</paragraph>
@@ -147,27 +152,34 @@
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="WRITER">If you made changes by choosing <emph>Format - AutoCorrect - Apply and Edit Changes</emph>, the <emph>Undo </emph>button appears in the dialog.<ahelp hid="HID_REDLINING_VIEW_PB_UNDO"> Reverse the last Accept or Reject command.</ahelp>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_EDIT_COMMENT" id="bm_id3152416" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SC_CHANGES_COMMENT" id="bm_id3155307" localize="false"/>
-<paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="2" l10n="U" oldref="44">Edit comment</paragraph>
-<paragraph role="paragraph" id="par_id3153210" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153281" xml-lang="en-US" level="2" l10n="U" oldref="46">Sort</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146975" role="heading" level="2" l10n="U"
+                 oldref="44">Edit comment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153210" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153281" role="heading" level="2" l10n="U"
+                 oldref="46">Sort</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149486" role="paragraph" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SORT_ACTION" id="bm_id3148387" localize="false"/>
-<paragraph role="heading" id="hd_id3155316" xml-lang="en-US" level="3" l10n="U" oldref="48">Action</paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155316" role="heading" level="3" l10n="U"
+                 oldref="48">Action</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SORT_AUTHOR" id="bm_id3150094" localize="false"/>
-<paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="50">Author</paragraph>
-<paragraph role="paragraph" id="par_id3149960" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150116" role="heading" level="3" l10n="U"
+                 oldref="50">Author</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149960" role="paragraph" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SORT_DATE" id="bm_id3150420" localize="false"/>
-<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="3" l10n="U" oldref="52">Date</paragraph>
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148775" role="heading" level="3" l10n="U"
+                 oldref="52">Date</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SORT_COMMENT" id="bm_id3156286" localize="false"/>
-<paragraph role="heading" id="hd_id3150594" xml-lang="en-US" level="3" l10n="U" oldref="54">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3145595" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150594" role="heading" level="3" l10n="U"
+                 oldref="54">Comment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145595" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SORT_POSITION" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3153157" xml-lang="en-US" level="3" l10n="U" oldref="56">Document Position</paragraph>
-<paragraph role="paragraph" id="par_id3157976" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153157" role="heading" level="3" l10n="U"
+                 oldref="56">Document Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157976" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02230402.xhp b/helpcontent2/source/text/shared/01/02230402.xhp
index 09c62ee20a..e2b111c652 100644
--- a/helpcontent2/source/text/shared/01/02230402.xhp
+++ b/helpcontent2/source/text/shared/01/02230402.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230402.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,15 +95,15 @@
 </table>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN" id="bm_id3147230" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SIMPLEREF:RB_ASSIGN" id="bm_id3151044" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">Shrink/Max 
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN" id="bm_id3147230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN" id="bm_id3151044" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">Shrink/Max 
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="CALC"><table id="tbl_id3158407">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="E">
-<image id="img_id3154153" src="sc/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3154153" xml-lang="en-US">Icon</alt>
+<image id="img_id3154153" src="formula/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3154153" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/02230500.xhp b/helpcontent2/source/text/shared/01/02230500.xhp
index e6483e268c..f9044d2f90 100644
--- a/helpcontent2/source/text/shared/01/02230500.xhp
+++ b/helpcontent2/source/text/shared/01/02230500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02230500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02240000.xhp b/helpcontent2/source/text/shared/01/02240000.xhp
index 76bb15e50e..6b99bba7be 100644
--- a/helpcontent2/source/text/shared/01/02240000.xhp
+++ b/helpcontent2/source/text/shared/01/02240000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02240000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02250000.xhp b/helpcontent2/source/text/shared/01/02250000.xhp
index 1785afe06c..ba7fb575a0 100644
--- a/helpcontent2/source/text/shared/01/02250000.xhp
+++ b/helpcontent2/source/text/shared/01/02250000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02250000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,48 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0102250000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Bibliography Database</title>
-<filename>/text/shared/01/02250000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="litdat">
+      <topic id="textshared0102250000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Bibliography Database</title>
+         <filename>/text/shared/01/02250000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="litdat">
 <bookmark xml-lang="en-US" branch="hid/SID_COMP_BIBLIOGRAPHY" id="bm_id1785233" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:BibliographyComponent" id="bm_id3150756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_DB_TBX" id="bm_id3155354" localize="false"/><paragraph role="heading" id="hd_id3150999" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02250000.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="2"><variable id="litdattext"><ahelp hid="HID_BIB_DB_TBX">Insert, delete, edit, and organize records in the bibliography database.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_DB_TBX" id="bm_id3155354" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150999" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/02250000.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149119" role="paragraph" l10n="U" oldref="2"><variable id="litdattext"><ahelp hid="HID_BIB_DB_TBX">Insert, delete, edit, and organize records in the bibliography database.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000402.xhp#litdat"/>
-</section>
-<paragraph role="note" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="53">If the fields in your database are read-only, ensure that the data source view is closed.</paragraph>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="CHG" oldref="41">The supplied bibliography database contains sample records of books.</paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="CHG" oldref="4">Use the toolbar to select a table in the bibliography database, to search for records, or to sort the records using filters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/source" id="bm_id3154288" localize="false"/><paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="." visibility="hidden">Lists the available tables in the current database. Click a name in the list to display the records for that table.</ahelp></paragraph><comment>removed icons; converted to hidden help text</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3155831" localize="false"/><paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">Go to the first record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152909" localize="false"/><paragraph role="paragraph" id="par_id3149192" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Go to the previous record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3156435" localize="false"/><paragraph role="paragraph" id="par_id3146795" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Go to the next record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3150497" localize="false"/><paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Go to the last record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3154686" localize="false"/><paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="." visibility="hidden">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3150742" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="2" l10n="U" oldref="5">Inserting a New Record</paragraph>
-<paragraph role="paragraph" id="par_id3149168" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_GRID_TRAVEL_NEW" visibility="hidden">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHORITYTYPE_POS" id="bm_id3159151" localize="false"/><paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="." visibility="hidden">Select the type of record that you want to create. $[officename] inserts a number in the <emph>Type</emph> column of the record that corresponds to the type that you select here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_IDENTIFIER_POS" id="bm_id3154126" localize="false"/><paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="." visibility="hidden">Enter a short name for the record. The short name appears in the <emph>Identifier</emph> column in the list of records.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000402.xhp#litdat"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149346" role="note" l10n="U" oldref="53">If the fields in your database are read-only, ensure that the data source view is closed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="CHG" oldref="41">The supplied bibliography database contains sample records of books.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155356" role="paragraph" l10n="CHG" oldref="4">Use the toolbar to select a table in the bibliography database, to search for records, or to sort the records using filters.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/source" id="bm_id3154288" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="21"><ahelp hid="." visibility="hidden">Lists the available tables in the current database. Click a name in the list to display the records for that table.</ahelp></paragraph><comment>removed icons; converted to hidden help text</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3155831" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3158432" role="paragraph" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">Go to the first record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152909" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149192" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Go to the previous record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3156435" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146795" role="paragraph" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Go to the next record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3150497" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Go to the last record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3154686" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3157960" role="paragraph" l10n="U" oldref="31"><ahelp hid="." visibility="hidden">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3150742" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="5">Inserting a New Record</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_GRID_TRAVEL_NEW" visibility="hidden">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHORITYTYPE_POS" id="bm_id3159151" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="7"><ahelp hid="." visibility="hidden">Select the type of record that you want to create. $[officename] inserts a number in the <emph>Type</emph> column of the record that corresponds to the type that you select here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_IDENTIFIER_POS" id="bm_id3154126" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156423" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="." visibility="hidden">Enter a short name for the record. The short name appears in the <emph>Identifier</emph> column in the list of records.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_TITLE_POS" id="bm_id3150652" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_YEAR_POS" id="bm_id3154218" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHOR_POS" id="bm_id3150449" localize="false"/>
@@ -89,59 +94,75 @@
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_HOWPUBLISHED_POS" id="bm_id3154319" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_SCHOOL_POS" id="bm_id3153943" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_SERIES_POS" id="bm_id3156005" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_URL_POS" id="bm_id3147441" localize="false"/><paragraph role="paragraph" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="." visibility="hidden">Enter additional information for the selected record. If you want, you can also enter the information in the corresponding field in the table.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3163716" xml-lang="en-US" level="2" l10n="U" oldref="9">Finding and Filtering Records</paragraph>
-<paragraph role="paragraph" id="par_id3147478" xml-lang="en-US" l10n="U" oldref="10">You can search for records by matching a keyword to a field entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/query" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3159181" xml-lang="en-US" level="3" l10n="U" oldref="28">Entering Search key</paragraph>
-<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:Bib/query">Type the information that you want to search for, and then press Enter. To change the filter options for the search, long-click the <emph>AutoFilter</emph> icon, and then select a different data field. You can use wildcards such as % or * for any number of characters, and _ or ? for one character in your search. To display all of the records in the table, clear this box, and then press Enter. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/autoFilter" id="bm_id3149263" localize="false"/><paragraph role="heading" id="hd_id3155511" xml-lang="en-US" level="3" l10n="U" oldref="29">AutoFilter</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid=".uno:Bib/autoFilter">Long-click to select the data field that you want to search using the term that you entered in the <emph>Search Key</emph> box. You can only search one data field.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="15">The list of table records is automatically updated to match the new filter settings.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/standardFilter" id="bm_id8315073" localize="false"/><paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</ahelp></paragraph>
-<embed href="text/shared/02/12090000.xhp#filterdialog"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/removeFilter" id="bm_id8467360" localize="false"/><paragraph role="paragraph" id="par_id3155311" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Remove Filter</emph> icon.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETEROWS" id="bm_id3153954" localize="false"/><paragraph role="heading" id="hd_id3147580" xml-lang="en-US" level="2" l10n="U" oldref="17">Deleting a Record</paragraph>
-<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="18">To delete a record in the current table, right-click the row header of the record, and then select <emph>Delete</emph>. <ahelp hid="SID_FM_DELETEROWS" visibility="hidden">Deletes the selected record.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="33">Changing the data source</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/sdbsource" id="bm_id3147318" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="38">Data Source</paragraph>
-<paragraph role="paragraph" id="par_id3151118" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid=".uno:Bib/sdbsource">Select the data source for the bibliography database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ON_OPENDOC" id="bm_id3147485" localize="false"/><paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SID_ON_OPENDOC">Only the data sources that are registered in $[officename] are listed. To add a data source to the list, choose <emph>Tools – Data Sources</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_URL_POS" id="bm_id3147441" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155994" role="paragraph" l10n="U" oldref="8"><ahelp hid="." visibility="hidden">Enter additional information for the selected record. If you want, you can also enter the information in the corresponding field in the table.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3163716" role="heading" level="2" l10n="U" oldref="9">Finding and Filtering Records</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147478" role="paragraph" l10n="U" oldref="10">You can search for records by matching a keyword to a field entry.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/query" id="bm_id3152578" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159181" role="heading" level="3" l10n="U"
+                 oldref="28">Entering Search key</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="U" oldref="11"><ahelp hid=".uno:Bib/query">Type the information that you want to search for, and then press Enter. To change the filter options for the search, long-click the <emph>AutoFilter</emph> icon, and then select a different data field. You can use wildcards such as % or * for any number of characters, and _ or ? for one character in your search. To display all of the records in the table, clear this box, and then press Enter. </ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/autoFilter" id="bm_id3149263" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155511" role="heading" level="3" l10n="U"
+                 oldref="29">AutoFilter</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="14"><ahelp hid=".uno:Bib/autoFilter">Long-click to select the data field that you want to search using the term that you entered in the <emph>Search Key</emph> box. You can only search one data field.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="15">The list of table records is automatically updated to match the new filter settings.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/standardFilter" id="bm_id8315073" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145590" role="paragraph" l10n="U" oldref="30"><ahelp hid=".">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</ahelp></paragraph>
+      <embed href="text/shared/02/12090000.xhp#filterdialog"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/removeFilter" id="bm_id8467360" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155311" role="paragraph" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Remove Filter</emph> icon.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETEROWS" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147580" role="heading" level="2" l10n="U"
+                 oldref="17">Deleting a Record</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154471" role="paragraph" l10n="U" oldref="18">To delete a record in the current table, right-click the row header of the record, and then select <emph>Delete</emph>. <ahelp hid="SID_FM_DELETEROWS" visibility="hidden">Deletes the selected record.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="2" l10n="U"
+                 oldref="33">Changing the data source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/sdbsource" id="bm_id3147318" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147214" role="heading" level="3" l10n="U"
+                 oldref="38">Data Source</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151118" role="paragraph" l10n="U" oldref="39"><ahelp hid=".uno:Bib/sdbsource">Select the data source for the bibliography database.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:Bib/Mapping" id="bm_id3154944" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_MAPPINGDLG" id="bm_id4552446" localize="false"/><paragraph role="heading" id="hd_id3145645" xml-lang="en-US" level="3" l10n="U" oldref="35">Column Arrangement</paragraph>
-<paragraph role="paragraph" id="par_id3151282" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:Bib/Mapping">Lets you map the column headings to data fields from a different data source. To define a different data source for your bibliography, click the<emph> Data Source</emph> button on the record<emph> Object Bar</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_IDENTIFIER" id="bm_id3154729" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_TITLE" id="bm_id3149411" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ISBN" id="bm_id3156111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITION" id="bm_id3149379" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_INSTITUTION" id="bm_id3144741" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ANNOTE" id="bm_id3149911" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_PAGES" id="bm_id3150594" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_SCHOOL" id="bm_id3150570" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_VOLUME" id="bm_id3155416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM2" id="bm_id3150338" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM5" id="bm_id3150658" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHORITYTYPE" id="bm_id3145596" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_MONTH" id="bm_id3145594" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_BOOKTITLE" id="bm_id3152374" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITOR" id="bm_id3147046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_JOURNAL" id="bm_id3150419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_NUMBER" id="bm_id3148498" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_PUBLISHER" id="bm_id3153521" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_SERIES" id="bm_id3154503" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_URL" id="bm_id3149270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM3" id="bm_id3150965" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHOR" id="bm_id3159346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_YEAR" id="bm_id3156285" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CHAPTER" id="bm_id3151053" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_HOWPUBLISHED" id="bm_id3166413" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_NOTE" id="bm_id3151059" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ORGANIZATIONS" id="bm_id3149419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ADDRESS" id="bm_id3149417" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_REPORTTYPE" id="bm_id3157974" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM1" id="bm_id3153511" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4" id="bm_id3151039" localize="false"/><paragraph role="paragraph" id="par_id3144767" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4">Select the data field that you want to map to the current <emph>Column name</emph>. To change the available data fields, select a different data source for your bibliography.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/DeleteRecord" id="bm_id3157846" localize="false"/><paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="." visibility="hidden">Deletes the current record.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151019" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="." visibility="hidden">Lets you choose a different data source for your bibliography.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/InsertRecord" id="bm_id3149122" localize="false"/><paragraph role="paragraph" id="par_id3153730" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="." visibility="hidden">Inserts a new record into the current table.</ahelp></paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_MAPPINGDLG" id="bm_id4552446" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145645" role="heading" level="3" l10n="U"
+                 oldref="35">Column Arrangement</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151282" role="paragraph" l10n="U" oldref="36"><ahelp hid=".uno:Bib/Mapping">Lets you map the column headings to data fields from a different data source. To define a different data source for your bibliography, click the<emph> Data Source</emph> button on the record<emph> Object Bar</emph>.</ahelp></paragraph>
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_IDENTIFIER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_TITLE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ISBN -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITION -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_INSTITUTION -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ANNOTE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_PAGES -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_SCHOOL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_VOLUME -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM2 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM5 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHORITYTYPE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_MONTH -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_BOOKTITLE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITOR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_JOURNAL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_NUMBER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_PUBLISHER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_SERIES -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_URL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM3 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHOR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_YEAR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CHAPTER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_HOWPUBLISHED -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_NOTE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ORGANIZATIONS -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ADDRESS -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_REPORTTYPE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM1 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4 -->
+<paragraph xml-lang="en-US" id="par_id3144767" role="paragraph" l10n="U" oldref="37"><ahelp hid="BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4">Select the data field that you want to map to the current <emph>Column name</emph>. To change the available data fields, select a different data source for your bibliography.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/DeleteRecord" id="bm_id3157846" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="48"><ahelp hid="." visibility="hidden">Deletes the current record.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151019" role="paragraph" l10n="U" oldref="52"><ahelp hid="." visibility="hidden">Lets you choose a different data source for your bibliography.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/InsertRecord" id="bm_id3149122" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153730" role="paragraph" l10n="U" oldref="50"><ahelp hid="." visibility="hidden">Inserts a new record into the current table.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 8630186bc6..ab69c7b996 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
 	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010000.xhp,v $
- *
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,82 +32,87 @@
  
 	
 <meta>
-<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Zoom &amp; View Layout</title>
-<filename>/text/shared/01/03010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="zoom">
+      <topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
+         <filename>/text/shared/01/03010000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="zoom">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154682"><bookmark_value>zooming;page views</bookmark_value>
-<bookmark_value>views; scaling</bookmark_value>
-<bookmark_value>screen; scaling</bookmark_value>
-<bookmark_value>pages; scaling</bookmark_value>
+         <bookmark_value>views; scaling</bookmark_value>
+         <bookmark_value>screen; scaling</bookmark_value>
+         <bookmark_value>pages; scaling</bookmark_value>
 </bookmark><comment>mw deleted "scaling;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_ZOOM" id="bm_id2031101" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id3153321" localize="false"/>
-<paragraph role="head1" id="hd_id3154682" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom &amp; View Layout</link></paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154682" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom &amp; View Layout</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
 </variable> The current zoom factor is displayed as a percentage value on the <emph>Status</emph> bar.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000403.xhp#masstab"/>
-</section>
-<paragraph role="note" id="par_id3149655" xml-lang="en-US" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
-<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
-<paragraph role="paragraph" id="par_id3154389" xml-lang="en-US" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000403.xhp#masstab"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149655" role="note" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
-<paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="U" oldref="20">Optimal</paragraph>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cells. 
-</caseinline><defaultinline> Resizes the display to fit the width of the text in the document.</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
+                 oldref="20">Optimal</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started. 
+</caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
-<paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="22">Fit width and height</paragraph>
-<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE">Displays the entire page on your screen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
+                 oldref="22">Fit width and height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started. 
+</caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
-<paragraph role="heading" id="hd_id3152771" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Fit width</paragraph>
-<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152771" role="heading" level="2" l10n="CHG"
+                 oldref="24">Fit width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200" id="bm_id3149766" localize="false"/>
-<paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150" id="bm_id3153193" localize="false"/>
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
-<section id="hdrt">
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
+<paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
+      <section id="hdrt">
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_VIEW100" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_ZOOM_BTN_100" id="bm_id051420080349501" localize="false"/>
-<paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="9">100 %</paragraph>
-<paragraph role="paragraph" id="par_id3147353" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
-</section>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" id="bm_id051420080349501" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153106" role="heading" level="2" l10n="U" oldref="9">100 %</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75" id="bm_id3163710" localize="false"/>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75 -->
+<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50" id="bm_id3154319" localize="false"/>
-<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237588500" id="bm_id1551561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237582355" id="bm_id2212897" localize="false"/>
-<paragraph role="heading" id="hd_id3153191" xml-lang="en-US" level="3" l10n="U" oldref="15">Variable</paragraph>
-<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7319864" xml-lang="en-US" level="2" l10n="NEW">View layout</paragraph>
-<paragraph role="paragraph" id="par_id3423871" xml-lang="en-US" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582358" id="bm_id2504654" localize="false"/>
-<paragraph role="heading" id="hd_id3818475" xml-lang="en-US" level="3" l10n="NEW">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3187353" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582359" id="bm_id5292519" localize="false"/>
-<paragraph role="heading" id="hd_id8455153" xml-lang="en-US" level="3" l10n="NEW">Single page</paragraph>
-<paragraph role="paragraph" id="par_id9912411" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582360" id="bm_id3984496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237588505" id="bm_id9693899" localize="false"/>
-<paragraph role="heading" id="hd_id9204992" xml-lang="en-US" level="3" l10n="NEW">Columns</paragraph>
-<paragraph role="paragraph" id="par_id1993774" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582874" id="bm_id8689230" localize="false"/>
-<paragraph role="heading" id="hd_id2949919" xml-lang="en-US" level="3" l10n="NEW">Book mode</paragraph>
-<paragraph role="paragraph" id="par_id2355113" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
-</body>
-</helpdocument>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_USER" id="bm_id1551561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_USER" id="bm_id2212897" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153191" role="heading" level="2" l10n="U"
+                 oldref="15">Variable</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7319864" role="heading" level="2" l10n="NEW">View layout</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3423871" role="paragraph" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_AUTOMATIC" id="bm_id2504654" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3818475" role="heading" level="2" l10n="NEW">Automatic</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3187353" role="paragraph" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_SINGLE" id="bm_id5292519" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8455153" role="heading" level="2" l10n="NEW">Single page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_COLUMNS" id="bm_id3984496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_COLUMNS" id="bm_id9693899" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="2" l10n="NEW">Columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1993774" role="paragraph" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_ZOOM_CHK_BOOK" id="bm_id8689230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2949919" role="heading" level="2" l10n="NEW">Book mode</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2355113" role="paragraph" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/03020000.xhp b/helpcontent2/source/text/shared/01/03020000.xhp
index a34022e094..2812fef585 100644
--- a/helpcontent2/source/text/shared/01/03020000.xhp
+++ b/helpcontent2/source/text/shared/01/03020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03020000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03040000.xhp b/helpcontent2/source/text/shared/01/03040000.xhp
index be1a40ed0f..9a4e3217dc 100644
--- a/helpcontent2/source/text/shared/01/03040000.xhp
+++ b/helpcontent2/source/text/shared/01/03040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03050000.xhp b/helpcontent2/source/text/shared/01/03050000.xhp
index 332e668ca7..580eed37c4 100644
--- a/helpcontent2/source/text/shared/01/03050000.xhp
+++ b/helpcontent2/source/text/shared/01/03050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03060000.xhp b/helpcontent2/source/text/shared/01/03060000.xhp
index e0005ba506..f410ff5bf6 100644
--- a/helpcontent2/source/text/shared/01/03060000.xhp
+++ b/helpcontent2/source/text/shared/01/03060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03110000.xhp b/helpcontent2/source/text/shared/01/03110000.xhp
index 2bfff092f2..30911c55e6 100644
--- a/helpcontent2/source/text/shared/01/03110000.xhp
+++ b/helpcontent2/source/text/shared/01/03110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03150100.xhp b/helpcontent2/source/text/shared/01/03150100.xhp
index d59e2cabe1..e7ada31524 100755
--- a/helpcontent2/source/text/shared/01/03150100.xhp
+++ b/helpcontent2/source/text/shared/01/03150100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03150100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,13 +40,13 @@
 <body>
   
   
-  <bookmark branch="hid/SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" xml-lang="en-US" id="bm_id3152823"/><paragraph role="heading" level="1" id="hd_id3150278" l10n="U" xml-lang="en-US" oldref="1">Confirm Delete</paragraph>
+  <!-- removed HID SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE --><paragraph role="heading" level="1" id="hd_id3150278" l10n="U" xml-lang="en-US" oldref="1">Confirm Delete</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3148668" xml-lang="en-US" oldref="2"><ahelp hid="SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" visibility="visible">Confirms or cancels the deletion.</ahelp></paragraph>
-  <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" xml-lang="en-US" id="bm_id3155934"/><paragraph role="heading" level="2" id="hd_id3152821" l10n="U" xml-lang="en-US" oldref="3">Delete</paragraph>
+  <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES --><paragraph role="heading" level="2" id="hd_id3152821" l10n="U" xml-lang="en-US" oldref="3">Delete</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150040" xml-lang="en-US" oldref="4"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" visibility="visible">Performs the deletion in the current file.</ahelp></paragraph>
-  <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" xml-lang="en-US" id="bm_id3145829"/><paragraph role="heading" level="2" id="hd_id3149999" l10n="U" xml-lang="en-US" oldref="5">Delete All</paragraph>
+  <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL --><paragraph role="heading" level="2" id="hd_id3149999" l10n="U" xml-lang="en-US" oldref="5">Delete All</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155616" xml-lang="en-US" oldref="6"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" visibility="visible">Performs the deletion in all selected files.</ahelp></paragraph>
-  <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" xml-lang="en-US" id="bm_id3152426"/><paragraph role="heading" level="2" id="hd_id3157991" l10n="U" xml-lang="en-US" oldref="7">Do Not Delete</paragraph>
+  <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO --><paragraph role="heading" level="2" id="hd_id3157991" l10n="U" xml-lang="en-US" oldref="7">Do Not Delete</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147043" xml-lang="en-US" oldref="8"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" visibility="visible">Rejects the deletion for the current file.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="9">Cancel</paragraph>
   <paragraph role="paragraph" id="par_id3148620" l10n="U" xml-lang="en-US" oldref="10">Cancels the deletion in the current file and any other selected files.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/03170000.xhp b/helpcontent2/source/text/shared/01/03170000.xhp
index 188c78b5bb..762e687a86 100644
--- a/helpcontent2/source/text/shared/01/03170000.xhp
+++ b/helpcontent2/source/text/shared/01/03170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03170000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03990000.xhp b/helpcontent2/source/text/shared/01/03990000.xhp
index 43790c567d..e7c970d058 100755
--- a/helpcontent2/source/text/shared/01/03990000.xhp
+++ b/helpcontent2/source/text/shared/01/03990000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03990000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index d4129c08fd..b3e8b14380 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04050000.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,77 +29,73 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0104050000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Notes</title>
-<filename>/text/shared/01/04050000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>notes;inserting/editing/deleting/printing</bookmark_value>
-<bookmark_value>inserting; notes</bookmark_value>
-<bookmark_value>editing; notes</bookmark_value>
-<bookmark_value>deleting;notes</bookmark_value>
-<bookmark_value>Navigator;notes</bookmark_value>
-<bookmark_value>printing;notes</bookmark_value>
-<bookmark_value>records; inserting notes </bookmark_value>
-<bookmark_value>remarks, see also notes</bookmark_value>
+      <topic id="textshared0104050000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Comment</title>
+         <filename>/text/shared/01/04050000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
+      <bookmark_value>inserting; comments</bookmark_value>
+      <bookmark_value>editing; comments</bookmark_value>
+      <bookmark_value>deleting;comments</bookmark_value>
+      <bookmark_value>Navigator;comments</bookmark_value>
+      <bookmark_value>printing;comments</bookmark_value>
+      <bookmark_value>records; inserting comments </bookmark_value>
+      <bookmark_value>remarks, see also comments</bookmark_value>
 </bookmark><comment>mw changed "notes;" and added 3 entries</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_POSTIT" id="bm_id8906707" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id3156045" localize="false"/>
-<paragraph role="heading" id="hd_id3154100" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a note anchored to the current cursor position.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154100" role="heading" level="1" l10n="CHG"
+                 oldref="1">Comment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a comment.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000404.xhp#notiz"/>
-</section>
-<switch select="appl">
-<case select="WRITER"><comment>Writer</comment>
-<paragraph role="heading" id="hd_id9851680" xml-lang="en-US" level="2" l10n="NEW">Inserting notes</paragraph>
-<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
-<paragraph role="paragraph" id="par_id1831" xml-lang="en-US" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
-<paragraph role="paragraph" id="par_id6718649" xml-lang="en-US" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
-<paragraph role="heading" id="hd_id2929166" xml-lang="en-US" level="2" l10n="NEW">Editing notes</paragraph>
-<paragraph role="paragraph" id="par_id5201879" xml-lang="en-US" l10n="NEW">Every user with write permission to the text document can edit and delete notes of all authors.</paragraph>
-<paragraph role="paragraph" id="par_id2571794" xml-lang="en-US" l10n="NEW">The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000404.xhp#notiz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE" id="bm_id0429200810584478" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383431" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current note.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_NOTE" id="bm_id0915200910461391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_POSTIT" id="bm_id0915200910464881" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE_AUTHOR" id="bm_id0429200810592549" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETEALLBYAUTHOR_POSTIT" id="bm_id0915200910471559" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_DELETE_ALL_NOTES" id="bm_id0429200810593994" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>View - Notes command</comment>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETEALL_POSTIT" id="bm_id0915200910474796" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment>
+<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the comment in a text document was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
-<paragraph role="paragraph" id="par_id0804200803435883" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3445539" xml-lang="en-US" level="2" l10n="NEW">Navigating from note to note</paragraph>
-<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous note.</paragraph>
-<paragraph role="paragraph" id="par_id2116153" xml-lang="en-US" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
-<paragraph role="tip" id="par_id5381328" xml-lang="en-US" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
-<paragraph role="heading" id="hd_id5664235" xml-lang="en-US" level="2" l10n="NEW">Printing notes</paragraph>
-<paragraph role="paragraph" id="par_id2254402" xml-lang="en-US" l10n="NEW">To set the printing options for notes in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for notes for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
-</case>
-<case select="CALC"><comment>Calc</comment>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="6">When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose <emph>Show Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id8336741" xml-lang="en-US" l10n="NEW">To change the object properties of a note, for example the background color, choose <emph>Show Note</emph> as above, then right-click the note (do not double-click the text).</paragraph>
-<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="CHG" oldref="7">To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose <emph>Insert - Note</emph>. To specify the formatting of the note text, right-click the note text in edit mode.</paragraph>
-<paragraph role="paragraph" id="par_idN107A1" xml-lang="en-US" l10n="NEW">To change the position or size of a note, drag a border or corner of the note. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id9499496" xml-lang="en-US" l10n="NEW">To delete a note, right-click the cell, then choose <emph>Delete Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id2036805" xml-lang="en-US" l10n="NEW">You can also right-click a note name in the Navigator window to choose some editing commands.</paragraph>
-<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="8">To set the printing options for notes in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
-</case>
-<default><comment>Draw, Impress</comment>
-<paragraph role="paragraph" id="par_id4844508" xml-lang="en-US" l10n="NEW">In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired.</paragraph>
-<paragraph role="paragraph" id="par_id2419507" xml-lang="en-US" l10n="NEW">In Impress, you can use the Notes view to write a page of notes for every slide.</paragraph>
-</default>
-</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_POSTIT:ED_EDIT" id="bm_id3154935" localize="false"/><comment>Text edit box - are these still in use?</comment>
-<paragraph role="paragraph" id="par_id3153362" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="." visibility="hidden">Enter the text for your note.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_POSTIT:BTN_AUTHOR" id="bm_id3144434" localize="false"/><comment>Author edit box</comment>
-<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="." visibility="hidden">Enters your initials and the current date and time into the contents of the note.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from comment to comment in text documents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous comment.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing comments</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0915200910571612" role="heading" level="2" l10n="NEW">Comments in spreadsheets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, click in the cell that contains the comment, and then choose <emph>Insert - Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2419507" role="note" l10n="NEW">In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. </paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04060000.xhp b/helpcontent2/source/text/shared/01/04060000.xhp
index cbf22be225..ddaea4dd8c 100644
--- a/helpcontent2/source/text/shared/01/04060000.xhp
+++ b/helpcontent2/source/text/shared/01/04060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04060100.xhp b/helpcontent2/source/text/shared/01/04060100.xhp
index 27a08eb711..e0a2c2c448 100644
--- a/helpcontent2/source/text/shared/01/04060100.xhp
+++ b/helpcontent2/source/text/shared/01/04060100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04060200.xhp b/helpcontent2/source/text/shared/01/04060200.xhp
index dd069232da..78015e4c56 100644
--- a/helpcontent2/source/text/shared/01/04060200.xhp
+++ b/helpcontent2/source/text/shared/01/04060200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04100000.xhp b/helpcontent2/source/text/shared/01/04100000.xhp
index bd9cab9c9b..09b91c4fdb 100644
--- a/helpcontent2/source/text/shared/01/04100000.xhp
+++ b/helpcontent2/source/text/shared/01/04100000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04100000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/SID_CHARMAP" id="bm_id1495830" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertSymbol" id="bm_id3153391" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_BULLET" id="bm_id4021836" localize="false"/>
+<!-- removed HID SID_BULLET -->
 <bookmark xml-lang="en-US" branch="hid/.uno:Bullet" id="bm_id3146902" localize="false"/>
 <paragraph role="heading" id="hd_id3152937" xml-lang="en-US" level="1" l10n="U" oldref="1">Special Character</paragraph>
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="sonder"><ahelp hid=".uno:Bullet">Inserts special characters from the installed fonts.</ahelp>
@@ -56,10 +53,10 @@
   <embed href="text/shared/00/00000404.xhp#sonder"/>
 </section>
 <paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="11">When you click a character in the <emph>Special Characters </emph>dialog, a preview and the corresponding numerical code for the character is displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONT" id="bm_id3153910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT" id="bm_id3153910" localize="false"/>
 <paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="2" l10n="U" oldref="3">Font</paragraph>
 <paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONT">Select a font to display the special characters that are associated with it.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSET" id="bm_id3147292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET" id="bm_id3147292" localize="false"/>
 <paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="19">Subset</paragraph>
 <paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSET">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_CHARMAP_CTL_SHOWSET" id="bm_id3147576" localize="false"/>
@@ -67,7 +64,7 @@
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_CHARMAP_CTL_SHOWSET">Click the special character(s) that you want to insert, and then click <emph>OK</emph>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="2" l10n="U" oldref="7">Characters</paragraph>
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="8">Displays the special characters that you have selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_CHARMAP:BTN_DELETE" id="bm_id3147089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE" id="bm_id3147089" localize="false"/>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_CHARMAP:BTN_DELETE">Clears the current selection of special characters that you want to insert.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/04110000.xhp b/helpcontent2/source/text/shared/01/04110000.xhp
index 558e3f90e1..720fdef877 100644
--- a/helpcontent2/source/text/shared/01/04110000.xhp
+++ b/helpcontent2/source/text/shared/01/04110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04110000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04140000.xhp b/helpcontent2/source/text/shared/01/04140000.xhp
index e4b2ce210f..57e51c9425 100644
--- a/helpcontent2/source/text/shared/01/04140000.xhp
+++ b/helpcontent2/source/text/shared/01/04140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04140000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_IMAGE_TEMPLATE" id="bm_id3150902" localize="false"/>
 <paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" l10n="U" oldref="17">Style</paragraph>
 <paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_FILEOPEN_IMAGE_TEMPLATE">Select the frame style for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_IMPGRF_CB_LINK" id="bm_id3157991" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OFA_HYPERLINK_URL_TXT" id="bm_id3157991" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_LINK_CB" id="bm_id3152542" localize="false"/>
 <paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="6">Link</paragraph>
 <paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_FILEDLG_LINK_CB">Inserts the selected graphic file as a link.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/04150000.xhp b/helpcontent2/source/text/shared/01/04150000.xhp
index ef435dc50e..7bde2a135f 100755
--- a/helpcontent2/source/text/shared/01/04150000.xhp
+++ b/helpcontent2/source/text/shared/01/04150000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,31 +29,36 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Object</title>
-<filename>/text/shared/01/04150000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="objekt">
-<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/><paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04150000.xhp" name="Objects">Object</link></paragraph>
-<paragraph role="paragraph" id="par_id3159079" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000404.xhp#objekteinf"/>
-</section>
-<paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
-<embed href="text/shared/01/04150100.xhp#ole"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
-<embed href="text/shared/01/04150400.xhp#klang"/>
-<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
-<embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment><paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
-<embed href="text/shared/01/04160300.xhp#starmath"/>
-<paragraph role="heading" id="hd_id3152552" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
+      <topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Drawing Object</title>
+         <filename>/text/shared/01/04150000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="objekt">
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/shared/01/04150000.xhp" name="Drawing Object">Drawing Object</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159079" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000404.xhp#objekteinf"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154894" role="heading" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
+      <embed href="text/shared/01/04150100.xhp#ole"/>
+      <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
+      <embed href="text/shared/01/04150400.xhp#klang"/>
+      <paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
+      <embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment>
+<paragraph xml-lang="en-US" id="hd_id3153577" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
+      <embed href="text/shared/01/04160300.xhp#starmath"/>
+      <paragraph xml-lang="en-US" id="hd_id3152552" role="heading" level="2" l10n="U"
+                 oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
+</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200903593543" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="WRITER">Inserts a chart.
 </caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04150100.xhp b/helpcontent2/source/text/shared/01/04150100.xhp
index f5033b7cef..3e10467506 100644
--- a/helpcontent2/source/text/shared/01/04150100.xhp
+++ b/helpcontent2/source/text/shared/01/04150100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <bookmark_value>inserting; OLE objects</bookmark_value>
 <bookmark_value>objects; inserting OLE objects</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_INSERT_OLEOBJECT" id="bm_id3150278" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_INSERT_OLEOBJECT -->
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_OBJECT" id="bm_id9083923" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertObject" id="bm_id3152952" localize="false"/><paragraph role="heading" id="hd_id3153116" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert OLE Object</paragraph>
 <paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="2"><variable id="ole"><ahelp hid=".uno:InsertObject">Inserts an <link href="text/shared/00/00000005.xhp#ole" name="OLE">OLE</link> object into the current document. The OLE object is inserted as a link or an embedded object.</ahelp>
@@ -58,19 +55,19 @@
 <paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="U" oldref="19">To speed up the display of the document, OLE objects are kept in the program cache. If you want to change the cache settings, choose <link href="text/shared/optionen/01011000.xhp" name="Tools - Options - $[officename] - Memory"><emph>Tools - Options - $[officename] - Memory</emph></link>.</paragraph>
 <paragraph role="note" id="par_id3145314" xml-lang="en-US" l10n="U" oldref="18">You cannot use the clipboard or drag and drop to move OLE objects to other files.</paragraph>
 <paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="17">Empty and inactive OLE objects are transparent.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="3">Create new</paragraph>
+<!-- removed HID SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT --><paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="3">Create new</paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT">Creates a new OLE object based on the object type that you select.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE" id="bm_id3152781" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Object type</paragraph>
+<!-- removed HID SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE --><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Object type</paragraph>
 <paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE">Select the type of document that you want to create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE" id="bm_id3145383" localize="false"/><paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="7">Create from file</paragraph>
+<!-- removed HID SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE --><paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="7">Create from file</paragraph>
 <paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE">Creates an OLE object from an existing file.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150084" xml-lang="en-US" level="2" l10n="U" oldref="15">File</paragraph>
 <paragraph role="paragraph" id="par_id3146773" xml-lang="en-US" l10n="U" oldref="16">Choose the file that you want to insert as an OLE object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH" id="bm_id3159148" localize="false"/><paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
+<!-- removed HID SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH --><paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
 <paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH">Enter the name of the file that you want to link or embed, or click <emph>Search</emph>, to locate the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="11">Search...</paragraph>
+<!-- removed HID SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH --><paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="11">Search...</paragraph>
 <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH">Locate the file that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/so3_CheckBox_MD_INSERT_OLEOBJECT_CB_FILELINK" id="bm_id77211" localize="false"/><paragraph role="heading" id="hd_id4174321" xml-lang="en-US" level="3" l10n="NEW">Link to file</paragraph>
+<!-- removed HID so3_CheckBox_MD_INSERT_OLEOBJECT_CB_FILELINK --><paragraph role="heading" id="hd_id4174321" xml-lang="en-US" level="3" l10n="NEW">Link to file</paragraph>
 <paragraph role="paragraph" id="par_id6636555" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable this checkbox to insert the OLE object as a link to the original file. If this checkbox is not enabled, the OLE object will be embedded into your document.</ahelp><comment>which consequences? cannot find featuremail or spec doc</comment></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04150200.xhp b/helpcontent2/source/text/shared/01/04150200.xhp
index ae53c8fb12..585e959b46 100644
--- a/helpcontent2/source/text/shared/01/04150200.xhp
+++ b/helpcontent2/source/text/shared/01/04150200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 </bookmark>
   <comment>MW deleted "adding;"</comment>
   
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_INSERT_OBJECT_PLUGIN" id="bm_id3154812" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_INSERT_OBJECT_PLUGIN -->
   
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_PLUGIN" id="bm_id9254880" localize="false"/>
   
@@ -65,15 +62,15 @@
    
   </section>
   
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL" id="bm_id3157896" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL -->
   <paragraph xml-lang="en-US" id="hd_id3148585" role="heading" level="2" l10n="U" oldref="3">File/URL</paragraph>
   <paragraph xml-lang="en-US" id="par_id3147399" role="paragraph" l10n="U" oldref="4"><ahelp hid="SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL">Enter the URL for the plug-in or click <emph>Browse</emph>, and then locate the plug-in that you want to insert.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL" id="bm_id3155892" localize="false"/>
+<!-- removed HID SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL -->
   <paragraph xml-lang="en-US" id="hd_id3155552" role="heading" level="3" l10n="U" oldref="5">Browse</paragraph>
   <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="U" oldref="6"><ahelp hid="SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL">Locate the plug-in that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS" id="bm_id3155941" localize="false"/>
+<!-- removed HID SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS -->
   <paragraph xml-lang="en-US" id="hd_id3149750" role="heading" level="2" l10n="U" oldref="7">Options</paragraph>
   <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="8"><ahelp hid="SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS">Enter the parameters for the plug-in using the format <emph>parameter1="some text"</emph>.</ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/01/04150400.xhp b/helpcontent2/source/text/shared/01/04150400.xhp
index af5ea5826c..a1cbd96769 100644
--- a/helpcontent2/source/text/shared/01/04150400.xhp
+++ b/helpcontent2/source/text/shared/01/04150400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150400.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04150500.xhp b/helpcontent2/source/text/shared/01/04150500.xhp
index 967f2b2571..0cdaf7177b 100644
--- a/helpcontent2/source/text/shared/01/04150500.xhp
+++ b/helpcontent2/source/text/shared/01/04150500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150500.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04160300.xhp b/helpcontent2/source/text/shared/01/04160300.xhp
index 65f2e9ec41..ecb947e1fb 100644
--- a/helpcontent2/source/text/shared/01/04160300.xhp
+++ b/helpcontent2/source/text/shared/01/04160300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04160300.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index 3204779f73..5070e800df 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04160500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#eiobframe"/>
 </section>
-<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph>Tools - Options - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
+<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="C"><link href="text/shared/01/02210101.xhp" name="Floating frame properties">Floating frame properties</link></paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/01/04180100.xhp b/helpcontent2/source/text/shared/01/04180100.xhp
index 7f428f5c38..07f85fb394 100644
--- a/helpcontent2/source/text/shared/01/04180100.xhp
+++ b/helpcontent2/source/text/shared/01/04180100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04180100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04990000.xhp b/helpcontent2/source/text/shared/01/04990000.xhp
index 9c204d4e80..d9e3dd2c4b 100755
--- a/helpcontent2/source/text/shared/01/04990000.xhp
+++ b/helpcontent2/source/text/shared/01/04990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05010000.xhp b/helpcontent2/source/text/shared/01/05010000.xhp
index 95db7d8758..33161451c6 100644
--- a/helpcontent2/source/text/shared/01/05010000.xhp
+++ b/helpcontent2/source/text/shared/01/05010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05020000.xhp b/helpcontent2/source/text/shared/01/05020000.xhp
index cfe2e1245e..01494a6aba 100644
--- a/helpcontent2/source/text/shared/01/05020000.xhp
+++ b/helpcontent2/source/text/shared/01/05020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index fd05be04a3..3f4e7ddfa3 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020100.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,38 +76,38 @@
 <paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="57">Complex text layout font - right-to-left text direction</paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME" id="bm_id3149796" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME" id="bm_id3159158" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME" id="bm_id3155419" localize="false"/>
+<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME" id="bm_id3149796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME" id="bm_id3155419" localize="false"/>
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" l10n="U" oldref="4">Font</paragraph>
 <paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME">Enter the name of an installed font that you want to use, or select a font from the list.</ahelp></paragraph>
 <embed href="text/shared/02/02020000.xhp#vorschautext"/>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE" id="bm_id3158432" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_STYLE" id="bm_id3150670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE_NOCJK" id="bm_id3158430" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE" id="bm_id3144439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE" id="bm_id3158432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE" id="bm_id3150670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE" id="bm_id3144439" localize="false"/>
 <paragraph role="heading" id="hd_id3143271" xml-lang="en-US" level="2" l10n="U" oldref="10">Typeface</paragraph>
 <paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE">Select the formatting that you want to apply.</ahelp></paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#syfett"/>
 <embed href="text/shared/00/00040502.xhp#sykursiv"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE" id="bm_id3154389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_SIZE" id="bm_id3148756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE_NOCJK" id="bm_id3154388" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE" id="bm_id3152771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE" id="bm_id3154389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE" id="bm_id3148756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK" id="bm_id3154388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE" id="bm_id3152771" localize="false"/>
 <paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Size</paragraph>
 <paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="45">If you are creating a Style that is based on another Style, you can enter a percentage value or a point value (for example, -2pt or +5pt).</paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG" id="bm_id3154153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_LANG" id="bm_id3150289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG" id="bm_id3154068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG" id="bm_id3154153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG" id="bm_id3150289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG" id="bm_id3154068" localize="false"/>
 <paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="38">Language</paragraph>
 <paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 3bafd19072..5a663d6449 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05020200.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,134 +31,171 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Effects</title>
-<filename>/text/shared/01/05020200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="schrifteffekt">
+      <topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Font Effects</title>
+         <filename>/text/shared/01/05020200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="schrifteffekt">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153514"><bookmark_value>fonts;effects</bookmark_value>
-<bookmark_value>formatting; font effects</bookmark_value>
-<bookmark_value>characters; font effects</bookmark_value>
-<bookmark_value>text; font effects</bookmark_value>
-<bookmark_value>effects; fonts</bookmark_value>
-<bookmark_value>underlining; text</bookmark_value>
-<bookmark_value>capital letters; font effects</bookmark_value>
-<bookmark_value>lowercase letters; font effects</bookmark_value>
-<bookmark_value>titles; font effects</bookmark_value>
-<bookmark_value>small capitals</bookmark_value>
-<bookmark_value>strikethrough; font effects</bookmark_value>
-<bookmark_value>fonts; strikethrough</bookmark_value>
-<bookmark_value>outlines; font effects</bookmark_value>
-<bookmark_value>fonts; outlines</bookmark_value>
-<bookmark_value>shadows; characters</bookmark_value>
-<bookmark_value>fonts; shadows</bookmark_value>
-<bookmark_value>colors; fonts</bookmark_value>
-<bookmark_value>fonts;colors</bookmark_value>
-</bookmark><comment>ufi inserted "fonts;colors"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/><paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
-</section>
-<embed href="text/shared/01/05020100.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE" id="bm_id3153527" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="41">Underlining</paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
-<paragraph role="note" id="par_id3153147" xml-lang="en-US" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2" l10n="U" oldref="78">Color</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2" id="bm_id3153666" localize="false"/>
+         <bookmark_value>formatting; font effects</bookmark_value>
+         <bookmark_value>characters; font effects</bookmark_value>
+         <bookmark_value>text; font effects</bookmark_value>
+         <bookmark_value>effects; fonts</bookmark_value>
+         <bookmark_value>underlining; text</bookmark_value>
+         <bookmark_value>capital letters; font effects</bookmark_value>
+         <bookmark_value>lowercase letters; font effects</bookmark_value>
+         <bookmark_value>titles; font effects</bookmark_value>
+         <bookmark_value>small capitals</bookmark_value>
+         <bookmark_value>strikethrough; font effects</bookmark_value>
+         <bookmark_value>fonts; strikethrough</bookmark_value>
+         <bookmark_value>outlines; font effects</bookmark_value>
+         <bookmark_value>fonts; outlines</bookmark_value>
+         <bookmark_value>shadows; characters</bookmark_value>
+         <bookmark_value>fonts; shadows</bookmark_value>
+         <bookmark_value>fonts;color ignored</bookmark_value>
+         <bookmark_value>ignored font colors</bookmark_value>
+         <bookmark_value>colors;ignored text color</bookmark_value>
+</bookmark><comment>ufi inserted "fonts;colors"</comment><comment>MW copied two entries about font colors to text/shared/guide/text_color</comment><comment>mw added 3 index entries about ignored font colors</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
+      </section>
+      <embed href="text/shared/01/05020100.xhp#hinweis"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2" id="bm_id3153728" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR" id="bm_id0123200902114658" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
+                 oldref="81">Font Color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146924" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10CC2" role="paragraph" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10CC9" role="paragraph" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10CD6" role="paragraph" l10n="NEW">To undo the last change, right-click.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10CDA" role="paragraph" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
+         </listitem>
+      </list>
 <switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id3146137" xml-lang="en-US" level="2" l10n="U" oldref="3">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="3" l10n="U" oldref="65">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="67">Without - no effect is applied</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154937" xml-lang="en-US" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black</emph> check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Writer - Print"><emph>%PRODUCTNAME Writer - Print</emph></link> in the Options dialog box.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT" id="bm_id3150791" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="2" l10n="U" oldref="43">Strikethrough</paragraph>
-<paragraph role="paragraph" id="par_id3145203" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150496" xml-lang="en-US" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS" id="bm_id3154125" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="2" l10n="U" oldref="45">Individual words</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE" id="bm_id3149985" localize="false"/><paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="72">Outlines</paragraph>
-<paragraph role="paragraph" id="par_id3159126" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW" id="bm_id3147326" localize="false"/><paragraph role="heading" id="hd_id3163714" xml-lang="en-US" level="3" l10n="U" oldref="74">Shadows</paragraph>
-<paragraph role="paragraph" id="par_id3150962" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01013000.xhp"><emph>%PRODUCTNAME - Accessibility</emph></link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.
+</variable></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2" id="bm_id0123200902144733" localize="false"/>
 <switch select="appl">
 <case select="WRITER">
-<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
-<bookmark_value>flashing fonts</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id3159179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id1213415" localize="false"/><paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="3" l10n="U" oldref="15">Blinking</paragraph>
-<paragraph role="paragraph" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id2219000" localize="false"/><paragraph role="heading" id="par_idN10B81" xml-lang="en-US" level="3" l10n="NEW">Hidden</paragraph>
-<paragraph role="paragraph" id="par_idN10B85" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146137" role="heading" level="2" l10n="U" oldref="3">Effects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149575" role="heading" level="3" l10n="U"
+                 oldref="65">Effects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="67">Without - no effect is applied</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154280" role="listitem" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148947" role="listitem" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154937" role="listitem" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
+         </listitem>
+      </list>
 </case>
 </switch>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<embed href="text/shared/00/00000007.xhp#asia"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS" id="bm_id3163710" localize="false"/><paragraph role="heading" id="hd_id3150332" xml-lang="en-US" level="2" l10n="U" oldref="60">Emphasis mark</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION" id="bm_id3163820" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="2" l10n="U" oldref="62">Position</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF" id="bm_id3155511" localize="false"/><paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="2" l10n="U" oldref="76">Relief</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_COLOR2" id="bm_id3153728" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR" id="bm_id3147214" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="2" l10n="U" oldref="81">Font Color</paragraph>
-<paragraph role="paragraph" id="par_id3146924" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC2" xml-lang="en-US" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC9" xml-lang="en-US" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CD6" xml-lang="en-US" l10n="NEW">To undo the last change, right-click.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CDA" xml-lang="en-US" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
-</listitem>
-</list>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF" id="bm_id0123200902202314" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154129" role="heading" level="2" l10n="U"
+                 oldref="76">Relief</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE" id="bm_id0123200902155356" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="3" l10n="CHG"
+                 oldref="72">Outline</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW" id="bm_id0123200902163281" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163714" role="heading" level="3" l10n="CHG"
+                 oldref="74">Shadow</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
 <switch select="appl">
-<case select="WRITER"><paragraph role="warning" id="par_id3150037" xml-lang="en-US" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black </emph>check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<case select="WRITER">
+<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
+      <bookmark_value>flashing fonts</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING" id="bm_id012320090217277" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="3" l10n="U"
+                 oldref="15">Blinking</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
 </case>
 </switch>
-<paragraph role="warning" id="par_id7613757" xml-lang="en-US" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <link href="text/shared/optionen/01013000.xhp"><emph>Tools - Options - %PRODUCTNAME - Accessibility</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/><paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color </emph>toolbar. 
-</variable></ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3151053" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
-<embed href="text/shared/guide/text_color.xhp#text_color"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE" id="bm_id0123200902014986" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243376" role="heading" level="2" l10n="NEW">Overlining</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR" id="bm_id0123200902032228" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243470" role="heading" level="2" l10n="NEW">Overline color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid=".">Select the color for the overlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT" id="bm_id0123200902074215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="2" l10n="U"
+                 oldref="43">Strikethrough</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150496" role="note" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE" id="bm_id0123200902053711" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+                 oldref="41">Underlining</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153147" role="note" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
+      <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+      <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR" id="bm_id0123200902050229" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148642" role="heading" level="2" l10n="CHG"
+                 oldref="78">Underline color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS" id="bm_id0123200902090860" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153104" role="heading" level="2" l10n="U"
+                 oldref="45">Individual words</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
+      <embed href="text/shared/00/00000007.xhp#asia"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS" id="bm_id0123200902235399" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="2" l10n="U"
+                 oldref="60">Emphasis mark</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION" id="bm_id0123200902241815" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152460" role="heading" level="2" l10n="U"
+                 oldref="62">Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+         <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+         <paragraph xml-lang="en-US" id="par_id3151053" role="paragraph" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
+         <embed href="text/shared/guide/text_color.xhp#text_color"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05020300.xhp b/helpcontent2/source/text/shared/01/05020300.xhp
index 65d69fec8a..8293b72453 100644
--- a/helpcontent2/source/text/shared/01/05020300.xhp
+++ b/helpcontent2/source/text/shared/01/05020300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020300.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00040503.xhp#zahlen"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY" id="bm_id3153312" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY" id="bm_id3153312" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="3">Category</paragraph>
   <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY">Select a category from the list, and then select a formatting style in the <emph>Format </emph>box.</ahelp></paragraph>
   
@@ -81,7 +78,7 @@
   <paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2" l10n="U" oldref="5">Format</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_NUMBERFORMAT_LB_FORMAT">Select how you want the contents of the selected cell(s) to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY" id="bm_id3154381" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154811" role="heading" level="3" l10n="U" oldref="97">Currency category list boxes</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="98"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY">Select a currency, and then scroll to the top of the <emph>Format</emph> list to view the formatting options for the currency.</ahelp></paragraph>
   <section id="waehrungtext">
@@ -90,36 +87,36 @@
    
   </section>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE" id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE" id="bm_id3148797" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U" oldref="23">Language</paragraph>
   <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells 
 </caseinline><defaultinline>fields</defaultinline></switchinline>. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells 
 </caseinline><defaultinline>fields</defaultinline></switchinline>.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="102">The language setting ensures that date and currency formats are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT" id="bm_id3145747" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT" id="bm_id3145747" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2" l10n="U" oldref="104">Source format</paragraph>
   <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U" oldref="105"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT">Uses the same number format as the cells containing the data for the chart.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2" l10n="U" oldref="7">Options</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="8">Specify the options for the selected format.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS" id="bm_id3151178" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3" l10n="U" oldref="9">Decimal places</paragraph>
   <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS">Enter the number of decimal places that you want to display.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3" l10n="U" oldref="11">Leading zeroes</paragraph>
   <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3" l10n="U" oldref="13">Negative numbers in red</paragraph>
   <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED">Changes the font color of negative numbers to red.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND" id="bm_id3148645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND" id="bm_id3148645" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="3" l10n="U" oldref="15">Use thousands separator</paragraph>
   <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND">Inserts a separator between thousands. The type of separator that is used depends on your language settings.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT" id="bm_id3150961" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT" id="bm_id3150961" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3150103" role="heading" level="2" l10n="U" oldref="17">Format code</paragraph>
   <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT">Displays the number format code for the selected format. You can also enter a custom format.</ahelp> The following options are only available for user-defined number formats.</paragraph>
   
@@ -135,7 +132,7 @@
   <paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3" l10n="U" oldref="26">Edit Comment</paragraph>
   <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_NUMBERFORMAT_TBI_INFO">Adds a comment to the selected number format.</ahelp>.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT" id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT" id="bm_id3154470" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="3" l10n="U" oldref="95">Name line</paragraph>
   <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="96"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT">Enter a comment for the selected number format, and then click outside this box.</ahelp></paragraph>
   <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 567c64a43b..d89091ae99 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020301.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -671,7 +668,7 @@
 
 <paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
 <paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
+<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
 <paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
 <table id="tbl_id3145133">
 <tablerow>
diff --git a/helpcontent2/source/text/shared/01/05020400.xhp b/helpcontent2/source/text/shared/01/05020400.xhp
index 9517c4fb8b..c4ed42c4eb 100644
--- a/helpcontent2/source/text/shared/01/05020400.xhp
+++ b/helpcontent2/source/text/shared/01/05020400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0105020400xml" indexer="include" status="PUBLISH">
@@ -65,37 +62,37 @@
 </section>
 <paragraph role="heading" id="hd_id3147243" xml-lang="en-US" level="2" l10n="U" oldref="12">Hyperlink</paragraph>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="13">Specify the properties for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
-<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame. 
+<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
 <paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_URL">Locate the file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_TEXT" id="bm_id3159166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_TEXT" id="bm_id3159166" localize="false"/>
 <paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="3" l10n="U" oldref="18">Reference</paragraph>
 <paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_TEXT">Enter the text that you want to display for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CHAR_URL:PB_EVENT" id="bm_id3148491" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_EVENT" id="bm_id3148491" localize="false"/>
 <paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="28">Events</paragraph>
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_EVENT">Specify an event that triggers when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_NAME" id="bm_id3146847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_NAME" id="bm_id3146847" localize="false"/>
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
 <section id="textname">
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_NAME">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.sun.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.example.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
 <paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="3" l10n="U" oldref="20">Frame</paragraph>
 <section id="textframe2">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window. 
+<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
 </variable></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="22">Character Styles</paragraph>
 <paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="23">Specify the formatting options for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CHAR_URL:LB_VISITED" id="bm_id3148740" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_VISITED" id="bm_id3148740" localize="false"/>
 <paragraph role="heading" id="hd_id3151056" xml-lang="en-US" level="3" l10n="U" oldref="24">Visited links</paragraph>
 <paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_VISITED">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CHAR_URL:LB_NOT_VISITED" id="bm_id3148676" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED" id="bm_id3148676" localize="false"/>
 <paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="26">Unvisited links</paragraph>
 <paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_NOT_VISITED">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05020500.xhp b/helpcontent2/source/text/shared/01/05020500.xhp
index 66598e751a..9576dc43a7 100644
--- a/helpcontent2/source/text/shared/01/05020500.xhp
+++ b/helpcontent2/source/text/shared/01/05020500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,51 +69,51 @@
 <paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Set the subscript or superscript options for a character.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SET_SUPER_SCRIPT" id="bm_id5816078" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_HIGHPOS" id="bm_id3153032" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS" id="bm_id3153032" localize="false"/>
 <paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="5">Superscript</paragraph>
 <paragraph role="paragraph" id="par_id3154750" xml-lang="en-US" l10n="U" oldref="6"><variable id="hochtext"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_HIGHPOS">Reduces the font size of the selected text and raises the text above the baseline.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_NORMALPOS" id="bm_id3154897" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS" id="bm_id3154897" localize="false"/>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">Normal</paragraph>
 <paragraph role="paragraph" id="par_id3155503" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_NORMALPOS">Removes superscript or subscript formatting.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SET_SUB_SCRIPT" id="bm_id879503" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_LOWPOS" id="bm_id3159157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS" id="bm_id3159157" localize="false"/>
 <paragraph role="heading" id="hd_id3150465" xml-lang="en-US" level="3" l10n="U" oldref="9">Subscript</paragraph>
 <paragraph role="paragraph" id="par_id3155420" xml-lang="en-US" l10n="U" oldref="10"><variable id="tieftext"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_LOWPOS">Reduces the font size of the selected text and lowers the text below the baseline.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_HIGHLOW" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW" id="bm_id3156152" localize="false"/>
 <paragraph role="heading" id="hd_id3148992" xml-lang="en-US" level="3" l10n="U" oldref="11">Raise/lower by</paragraph>
 <paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_HIGHLOW">Enter the amount by which you want to raise or to lower the selected text in relation to the baseline. One hundred percent is equal to the height of the font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_FONTSIZE" id="bm_id3156155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE" id="bm_id3156155" localize="false"/>
 <paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="13">Relative font size</paragraph>
 <paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_FONTSIZE">Enter the amount by which you want to reduce the font size of the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_HIGHLOW" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW" id="bm_id3153666" localize="false"/>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="15">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_HIGHLOW">Automatically sets the amount by which the selected text is raised or lowered in relation to the baseline.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154905" xml-lang="en-US" level="2" l10n="U" oldref="30">Rotation / scaling</paragraph>
 <switch select="appl">
 <case select="WRITER">
 <paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="36">Set the rotation and the scaling options for the selected text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_0_DEG" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG" id="bm_id3154347" localize="false"/>
 <paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="3" l10n="U" oldref="31">0 degrees</paragraph>
 <paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_0_DEG">Does not rotate the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_90_DEG" id="bm_id3151056" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG" id="bm_id3151056" localize="false"/>
 <paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="32">90 degrees</paragraph>
 <paragraph role="paragraph" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_90_DEG">Rotates the selected text to the left by 90 degrees.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_270_DEG" id="bm_id3150792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG" id="bm_id3150792" localize="false"/>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="33">270 degrees</paragraph>
 <paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_270_DEG">Rotates the selected text to the right by 90 degrees.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_FIT_TO_LINE" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE" id="bm_id3157320" localize="false"/>
 <paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="34">Fit to line</paragraph>
 <paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_FIT_TO_LINE">Stretches or compresses the selected text so that it fits between the line that is above the text and the line that is below the text.</ahelp></paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_MF_SCALE_WIDTH" id="bm_id3150447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH" id="bm_id3150447" localize="false"/>
 <paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="3" l10n="U" oldref="35">Scale width</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_MF_SCALE_WIDTH">Enter the percentage of the font width by which to horizontally stretch or compress the selected text.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="2" l10n="U" oldref="17">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="18">Specify the spacing between individual characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_POSITION_LB_KERNING2" id="bm_id3153968" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2" id="bm_id3153968" localize="false"/>
 <paragraph role="heading" id="hd_id3125865" xml-lang="en-US" level="3" l10n="U" oldref="19">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_POSITION_LB_KERNING2">Specifies the spacing between the characters of the selected text. For expanded or condensed spacing, enter the amount that you want to expand or condense the text in the <emph>by </emph>box.</ahelp></paragraph>
 <list type="unordered">
@@ -133,10 +130,10 @@
 <emph>Condensed</emph> - decreases the character spacing</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_KERNING2" id="bm_id3150103" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2" id="bm_id3150103" localize="false"/>
 <paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="25">by</paragraph>
 <paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_KERNING2">Enter the amount by which you want to expand or condense the character spacing for the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_PAIRKERNING" id="bm_id3153095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING" id="bm_id3153095" localize="false"/>
 <paragraph role="heading" id="hd_id3154127" xml-lang="en-US" level="3" l10n="U" oldref="27"><link href="text/shared/00/00000005.xhp#kerning" name="Pair kerning">Pair kerning</link></paragraph>
 <paragraph role="paragraph" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_PAIRKERNING">Automatically adjust the character spacing for specific letter combinations.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="29">Kerning is only available for certain font types and requires that your printer support this option.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020600.xhp b/helpcontent2/source/text/shared/01/05020600.xhp
index 5c2d3a4fd0..c5f8a16bb2 100755
--- a/helpcontent2/source/text/shared/01/05020600.xhp
+++ b/helpcontent2/source/text/shared/01/05020600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020600.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,15 +56,15 @@
 </section>
 <paragraph role="heading" id="hd_id3152552" xml-lang="en-US" level="2" l10n="U" oldref="3">Double-lined</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">Set the double-line options for the selected text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_TWOLINES_CB_TWOLINES" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES" id="bm_id3154318" localize="false"/>
 <paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">Write in double lines</paragraph>
 <paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_TWOLINES_CB_TWOLINES">Allows you to write in double lines in the area that you selected in the current document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3157959" xml-lang="en-US" level="2" l10n="U" oldref="7">Enclosing characters</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="8">Specify the characters to enclose the double-lined area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_STARTBRACKET" id="bm_id3147620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET" id="bm_id3147620" localize="false"/>
 <paragraph role="heading" id="hd_id3148539" xml-lang="en-US" level="3" l10n="U" oldref="9">Initial character</paragraph>
 <paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_STARTBRACKET">Select the character to define the start of the double-lined area. If you want to choose a custom character, select <emph>Other Characters</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_ENDBRACKET" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET" id="bm_id3159158" localize="false"/>
 <paragraph role="heading" id="hd_id3159115" xml-lang="en-US" level="3" l10n="U" oldref="11">Final character</paragraph>
 <paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_ENDBRACKET">Select the character to define the end of the double-lined area. If you want to choose a custom character, select <emph>Other Characters</emph>.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 1a4145d727..ddd710aa6c 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020700.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,23 +46,23 @@
 <bookmark_value>paragraphs; Asian typography</bookmark_value>
 <bookmark_value>typography; Asian</bookmark_value>
 </bookmark><comment>MW changed "formats;" to "formatting;"</comment><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020700.xhp" name="Asian Typography">Asian Typography</link></paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Language Settings - Languages</emph> in the Options dialog box, and then select the <emph>Enabled</emph> box in the <emph>Asian language support</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00040500.xhp#asitypo"/>
 </section>
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="3">Line change</paragraph>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">Set the options for line breaks in Asian language documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose <emph>Tools - Options - Language Settings - </emph><link href="text/shared/optionen/01150100.xhp" name="Asian Layout"><emph>Asian Layout</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - <link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</link></emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
 <paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC">Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
 <emph>Apply spacing between Asian, Latin and Complex text</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE">Inserts a space between Asian, Latin and complex characters.</ahelp></paragraph>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/01/05020700.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
+<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01140000.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030000.xhp b/helpcontent2/source/text/shared/01/05030000.xhp
index 01820b9d0a..38813badae 100644
--- a/helpcontent2/source/text/shared/01/05030000.xhp
+++ b/helpcontent2/source/text/shared/01/05030000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05030100.xhp b/helpcontent2/source/text/shared/01/05030100.xhp
index 9cd75a17cd..26b92a23b1 100644
--- a/helpcontent2/source/text/shared/01/05030100.xhp
+++ b/helpcontent2/source/text/shared/01/05030100.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030100.xhp,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,53 +29,62 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0105030100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Indents and Spacing</title>
-<filename>/text/shared/01/05030100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einzuege">
+      <topic id="textshared0105030100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Indents and Spacing</title>
+         <filename>/text/shared/01/05030100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einzuege">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154689"><bookmark_value>spacing; between paragraphs in footnotes</bookmark_value>
-<bookmark_value>line spacing; paragraph</bookmark_value>
-<bookmark_value>spacing; lines and paragraphs</bookmark_value>
-<bookmark_value>single-line spacing in text</bookmark_value>
-<bookmark_value>one and a half line spacing in text</bookmark_value>
-<bookmark_value>double-line spacing in paragraphs</bookmark_value>
-<bookmark_value>leading between paragraphs</bookmark_value>
-<bookmark_value>paragraphs;spacing</bookmark_value>
+         <bookmark_value>line spacing; paragraph</bookmark_value>
+         <bookmark_value>spacing; lines and paragraphs</bookmark_value>
+         <bookmark_value>single-line spacing in text</bookmark_value>
+         <bookmark_value>one and a half line spacing in text</bookmark_value>
+         <bookmark_value>double-line spacing in paragraphs</bookmark_value>
+         <bookmark_value>leading between paragraphs</bookmark_value>
+         <bookmark_value>paragraphs;spacing</bookmark_value>
 </bookmark><comment>mw deleted "footnote spacings" and added "paragraphs;spacing"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_STD" id="bm_id3145138" localize="false"/><paragraph role="heading" id="hd_id3154689" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
-<paragraph role="paragraph" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
-</section>
-<paragraph role="note" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="64">To change the measurement units used in this dialog, choose Tools - Options - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_STD" id="bm_id3145138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154689" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3154823" role="tip" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
 </case>
 </switch>
 <section id="howtoget">
-<embed href="text/shared/00/00040500.xhp#einzug"/>
-</section>
-<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="2" l10n="U" oldref="3">Indent</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">Specify the amount of space to leave between the left and the right page margins and the paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3153698" xml-lang="en-US" level="3" l10n="U" oldref="5">Before text</paragraph>
-<paragraph role="paragraph" id="par_id3148990" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the left edge of the paragraph is indented with respect to the left page margin. In Right-to-Left languages, the right edge of the paragraph is indented with respect to the right page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT" id="bm_id3149656" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="U" oldref="9">After text</paragraph>
-<paragraph role="paragraph" id="par_id3154390" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the right edge of the paragraph is indented with respect to the right page margin. In Right-to-Left languages, the left edge of the paragraph is indented with respect to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT" id="bm_id3144762" localize="false"/><paragraph role="heading" id="hd_id3149169" xml-lang="en-US" level="3" l10n="U" oldref="7">First line</paragraph>
-<paragraph role="paragraph" id="par_id3150651" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT">Indents the first line of a paragraph by the amount that you enter. To create a hanging indent enter a positive value for "Before text" and a negative value for "First line". To indent the first line of a paragraph that uses numbering or bullets, choose "Format - Bullets and Numbering", click the <emph>Position</emph> tab, and then enter an amount in the "Minimum space numbering &lt;-&gt; text" box.</ahelp><comment>UFI: for complicated UI names, prefer quotes rather than emph tags for the Extended Help text because the yellow bubbles currently don't know any formatting</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO" id="bm_id3155994" localize="false"/><paragraph role="heading" id="hd_id3150288" xml-lang="en-US" level="3" l10n="U" oldref="52"><switchinline select="appl"><caseinline select="WRITER">Automatic 
+         <embed href="text/shared/00/00040500.xhp#einzug"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3158430" role="heading" level="2" l10n="U" oldref="3">Indent</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">Specify the amount of space to leave between the left and the right page margins and the paragraph.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT" id="bm_id3154898" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153698" role="heading" level="2" l10n="U" oldref="5">Before text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148990" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the left edge of the paragraph is indented with respect to the left page margin. In Right-to-Left languages, the right edge of the paragraph is indented with respect to the right page margin.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT" id="bm_id3149656" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152361" role="heading" level="2" l10n="U" oldref="9">After text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154390" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the right edge of the paragraph is indented with respect to the right page margin. In Right-to-Left languages, the left edge of the paragraph is indented with respect to the left page margin.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT" id="bm_id3144762" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149169" role="heading" level="2" l10n="U" oldref="7">First line</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150651" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT">Indents the first line of a paragraph by the amount that you enter. To create a hanging indent enter a positive value for "Before text" and a negative value for "First line". To indent the first line of a paragraph that uses numbering or bullets, choose "<link href="text/shared/01/06050600.xhp">Format - Bullets and Numbering - Position</link>".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO" id="bm_id3155994" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150288" role="heading" level="2" l10n="U"
+                 oldref="52"><switchinline select="appl"><caseinline select="WRITER">Automatic 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="CHG" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO">Automatically indents a paragraph according to the font size and the line spacing. The setting in the <emph>First Line </emph>box is ignored.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="CHG" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO">Automatically indents a paragraph according to the font size and the line spacing. The setting in the <emph>First Line </emph>box is ignored.</ahelp>
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3157894" xml-lang="en-US" level="2" l10n="U" oldref="22">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="23">Specify the amount of space to leave between selected paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST" id="bm_id3147350" localize="false"/><paragraph role="heading" id="hd_id3147216" xml-lang="en-US" level="3" l10n="U" oldref="24">Above paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST">Enter the amount of space that you want to leave above the selected paragraph(s).</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3157894" role="heading" level="2" l10n="U"
+                 oldref="22">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="23">Specify the amount of space to leave between selected paragraphs.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST" id="bm_id3147350" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147216" role="heading" level="2" l10n="U"
+                 oldref="24">Above paragraph</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST">Enter the amount of space that you want to leave above the selected paragraph(s).</ahelp></paragraph>
 <switch select="appl">
 <case select="DRAW"><embed href="text/shared/00/00000007.xhp#textobjektleiste"/>
 </case>
@@ -104,45 +109,63 @@
 <case select="IMPRESS"><embed href="text/shared/02/03120000.xhp#syabstandvermindern"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST" id="bm_id3154921" localize="false"/><paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="U" oldref="26">Below paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST">Enter the amount of space that you want to leave below the selected paragraph(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST" id="bm_id3153095" localize="false"/><paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="U" oldref="28">Line spacing</paragraph>
-<paragraph role="paragraph" id="par_id3146985" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST">Specify the amount of space to leave between lines of text in a paragraph.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146923" xml-lang="en-US" level="3" l10n="U" oldref="30">Single</paragraph>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="31"><variable id="einzeiligtext">Applies single line spacing to the current paragraph. This is the default setting. 
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST" id="bm_id3154921" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145590" role="heading" level="2" l10n="U"
+                 oldref="26">Below paragraph</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163822" role="paragraph" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST">Enter the amount of space that you want to leave below the selected paragraph(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST" id="bm_id3153095" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156441" role="heading" level="2" l10n="U"
+                 oldref="28">Line spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146985" role="paragraph" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST">Specify the amount of space to leave between lines of text in a paragraph.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146923" role="heading" level="2" l10n="U"
+                 oldref="30">Single</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="U" oldref="31"><variable id="einzeiligtext">Applies single line spacing to the current paragraph. This is the default setting. 
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3148500" xml-lang="en-US" level="3" l10n="U" oldref="33">1.5 lines</paragraph>
-<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to 1.5 lines. 
+      <paragraph xml-lang="en-US" id="hd_id3148500" role="heading" level="2" l10n="U"
+                 oldref="33">1.5 lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150094" role="paragraph" l10n="CHG" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to 1.5 lines. 
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3149378" xml-lang="en-US" level="3" l10n="U" oldref="36">Double</paragraph>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines. 
+      <paragraph xml-lang="en-US" id="hd_id3149378" role="heading" level="2" l10n="U"
+                 oldref="36">Double</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines. 
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3151206" xml-lang="en-US" level="3" l10n="U" oldref="39">Proportional</paragraph>
-<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="40">Select this option and then enter a percentage value in the box, where 100% corresponds to single line spacing.</paragraph>
-<paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="41">At Least</paragraph>
-<paragraph role="paragraph" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="42">Sets the minimum line spacing to the value that you enter in the box.</paragraph>
-<paragraph role="tip" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="47">If you use different font sizes within a paragraph, the line spacing is automatically adjusted to the largest font size. If you prefer to have identical spacing for all lines, specify a value in <emph>At least</emph> that corresponds to the largest font size.</paragraph>
-<paragraph role="heading" id="hd_id3153927" xml-lang="en-US" level="3" l10n="U" oldref="43">Leading</paragraph>
-<paragraph role="paragraph" id="par_id3153354" xml-lang="en-US" l10n="U" oldref="44">Sets the height of the vertical space that is inserted between two lines.</paragraph>
-<paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="54"><switchinline select="appl"><caseinline select="WRITER">Fixed 
+      <paragraph xml-lang="en-US" id="hd_id3151206" role="heading" level="2" l10n="U"
+                 oldref="39">Proportional</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147494" role="paragraph" l10n="U" oldref="40">Select this option and then enter a percentage value in the box, where 100% corresponds to single line spacing.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156332" role="heading" level="2" l10n="U"
+                 oldref="41">At Least</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="42">Sets the minimum line spacing to the value that you enter in the box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150744" role="tip" l10n="U" oldref="47">If you use different font sizes within a paragraph, the line spacing is automatically adjusted to the largest font size. If you prefer to have identical spacing for all lines, specify a value in <emph>At least</emph> that corresponds to the largest font size.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153927" role="heading" level="2" l10n="U"
+                 oldref="43">Leading</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153354" role="paragraph" l10n="U" oldref="44">Sets the height of the vertical space that is inserted between two lines.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U"
+                 oldref="54"><switchinline select="appl"><caseinline select="WRITER">Fixed 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Sets the line spacing to exactly match the value that you enter in the box. This can result in cropped characters. 
+      <paragraph xml-lang="en-US" id="par_id3153711" role="paragraph" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Sets the line spacing to exactly match the value that you enter in the box. This can result in cropped characters. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT" id="bm_id3147582" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC" id="bm_id3147338" localize="false"/><paragraph role="heading" id="hd_id3156383" xml-lang="en-US" level="3" l10n="U" oldref="45">of</paragraph>
-<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC">Enter the value to use for the line spacing.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<paragraph role="heading" id="hd_id3154965" xml-lang="en-US" level="2" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="WRITER">Register-true 
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT" id="bm_id3147582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC" id="bm_id3147338" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156383" role="heading" level="2" l10n="U"
+                 oldref="45">of</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC">Enter the value to use for the line spacing.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+      <paragraph xml-lang="en-US" id="hd_id3154965" role="heading" level="2" l10n="U"
+                 oldref="48"><switchinline select="appl"><caseinline select="WRITER">Register-true 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3146316" xml-lang="en-US" level="3" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Activate 
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER" id="bm_id3147344" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146316" role="heading" level="2" l10n="U"
+                 oldref="50"><switchinline select="appl"><caseinline select="WRITER">Activate 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156315" xml-lang="en-US" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER">Aligns the baseline of each line of text to a vertical document grid, so that each line is the same height. To use this feature, you must first activate the <emph>Register-true </emph>option for the current page style. To do this, choose <emph>Format - Page</emph>, click on the <emph>Page </emph>tab, and then select the<emph> Register-true</emph> box in the<emph> Layout settings</emph> area.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3156315" role="paragraph" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER">Aligns the baseline of each line of text to a vertical document grid, so that each line is the same height. To use this feature, you must first activate the <emph>Register-true </emph>option for the current page style. To do this, choose <emph>Format - Page</emph>, click on the <emph>Page </emph>tab, and then select the<emph> Register-true</emph> box in the<emph> Layout settings</emph> area.</ahelp>
 </caseinline></switchinline></paragraph>
 <switch select="appl">
-<case select="WRITER"><section id="relatedtopics">
-<embed href="text/swriter/guide/indenting.xhp#indenting"/>
-<paragraph role="paragraph" id="par_id9267250" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/registertrue.xhp" name="Writing Register-true">Writing Register-true</link></paragraph>
-</section>
+<case select="WRITER">
+<section id="relatedtopics">
+         <embed href="text/swriter/guide/indenting.xhp#indenting"/>
+         <paragraph xml-lang="en-US" id="par_id9267250" role="paragraph" l10n="NEW"><link href="text/swriter/guide/registertrue.xhp" name="Writing Register-true">Writing Register-true</link></paragraph>
+      </section>
 </case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05030300.xhp b/helpcontent2/source/text/shared/01/05030300.xhp
index f7a10320e8..14aad13b3a 100755
--- a/helpcontent2/source/text/shared/01/05030300.xhp
+++ b/helpcontent2/source/text/shared/01/05030300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,52 +51,52 @@
 <section id="howtoget">
 <embed href="text/shared/00/00040500.xhp#tabulator"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/>
 <paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
 <paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS">Select a tab stop type, enter a new measurement, and then click <emph>New</emph>. If you want, you can also specify the measurement units to use for the tab (cm for centimeter, or " for inches). Existing tabs to the left of the first tab that you set are removed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="2" l10n="U" oldref="9">Type</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Select the type of tab stop that you want to modify.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/>
 <paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="3" l10n="U" oldref="11">Left</paragraph>
 <paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="41">The name of this tab stop is <emph>Left/Top</emph> if Asian language support is enabled.</paragraph>
 <paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT">Aligns the left edge of the text to the tab stop and extends the text to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/>
 <paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="13">Right</paragraph>
 <paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="42">This name of this tab stop is <emph>Right/Bottom</emph> if Asian language support is enabled.</paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT">Aligns the right edge of the text to the tab stop and extends the text to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/>
 <paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="15">Center</paragraph>
 <paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER">Aligns the center of the text to the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/>
 <paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
 <paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL">Aligns the decimal point of a number to the center of the tab stop and text to the left of the tab.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="WIN">The character that is used as a decimal separator depends on the regional setting of your operating system. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/>
 <paragraph role="heading" id="hd_id3153380" xml-lang="en-US" level="3" l10n="U" oldref="20">Character</paragraph>
 <paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR">Enter a character that you want the decimal tab to use as a decimal separator.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159151" xml-lang="en-US" level="2" l10n="U" oldref="22">Fill Character</paragraph>
 <paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="23">Specify the characters to use as leader to the left of the tab stop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/>
 <paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="U" oldref="24">None</paragraph>
 <paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO">Inserts no fill characters, or removes existing fill characters to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/>
 <paragraph role="heading" id="hd_id3152933" xml-lang="en-US" level="3" l10n="U" oldref="26">.......</paragraph>
 <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS">Fills the empty space to the left of the tab stop with dots.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/>
 <paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="28">------</paragraph>
 <paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE">Fills the empty space to the left of the tab stop with dashes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/>
 <paragraph role="heading" id="hd_id3157960" xml-lang="en-US" level="3" l10n="U" oldref="30">______</paragraph>
 <paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE">Draws a line to fill the empty space to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER" id="bm_id3153057" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER" id="bm_id3153057" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/>
 <paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="32">Character</paragraph>
 <paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER">Allows you to specify a character to fill the empty space to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="36">New</paragraph>
 <paragraph role="paragraph" id="par_id3163717" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW">Adds the tab stop that you defined to the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/>
 <paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="2" l10n="U" oldref="38">Clear All</paragraph>
 <paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL">Removes all of the tab stops that you defined under <emph>Position</emph>. Sets <emph>Left</emph> tab stops at regular intervals as the default tab stops.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/01/05030500.xhp b/helpcontent2/source/text/shared/01/05030500.xhp
index d81485a1ac..1b4b4c918c 100644
--- a/helpcontent2/source/text/shared/01/05030500.xhp
+++ b/helpcontent2/source/text/shared/01/05030500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030500.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,22 +61,22 @@
 <paragraph role="paragraph" id="par_id3148643" xml-lang="en-US" l10n="CHG" oldref="5">If you are in a table or spreadsheet, you can also add or remove predefined borders. Use the <emph>Borders</emph> icon on the <emph>Table Bar</emph>.</paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/03130000.xhp#syumrandung"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINESTYLE" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="23">Line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="23">Line</paragraph>
 <paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINESTYLE">Click the border style that you want to apply. The style is applied to the borders selected in the preview.</ahelp></paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/03140000.xhp#sylinienstil"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="2" l10n="U" oldref="21">Spacing to contents</paragraph>
 <paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="22">Specify the amount of space that you want to leave between the border and the contents of the selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_LEFT" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="45">Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="45">Left</paragraph>
 <paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_LEFT">Enter the distance that you want to have between the left border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_RIGHT" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="47">Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="47">Right</paragraph>
 <paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_RIGHT">Enter the distance that you want to have between the right border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_TOP" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Top</paragraph>
 <paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_TOP">Enter the distance that you want to have between the top border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_BOTTOM" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3158410" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_BOTTOM">Enter the distance that you want to have between the bottom border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_BORDER_CB_SYNC" id="bm_id3157893" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="53">Synchronize</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC" id="bm_id3157893" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="53">Synchronize</paragraph>
 <paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_BORDER_CB_SYNC">Applies the same <emph>spacing to contents</emph> setting to all four borders when you enter a new distance.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155855"><bookmark_value>shadows; borders</bookmark_value>
 <bookmark_value>borders; shadows</bookmark_value>
@@ -90,16 +87,16 @@
 <paragraph role="note" id="par_id3157309" xml-lang="en-US" l10n="U" oldref="43">Graphics or objects that are anchored to a frame in the document cannot exceed the size of the frame. If you apply a shadow to the borders of an object that fills an entire frame, the size of the object is reduced to display the shadows.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BORDER_CTL_SHADOWS" id="bm_id3154321" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="33">Position</paragraph>
 <paragraph role="paragraph" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_BORDER_CTL_SHADOWS">Click a shadow style for the selected borders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_BORDER:ED_SHADOWSIZE" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3156444" xml-lang="en-US" level="3" l10n="U" oldref="35">Distance</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3156444" xml-lang="en-US" level="3" l10n="U" oldref="35">Distance</paragraph>
 <paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_BORDER:ED_SHADOWSIZE">Enter the width of the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR" id="bm_id3152463" localize="false"/><paragraph role="heading" id="hd_id3155307" xml-lang="en-US" level="3" l10n="U" oldref="37">Color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR" id="bm_id3152463" localize="false"/><paragraph role="heading" id="hd_id3155307" xml-lang="en-US" level="3" l10n="U" oldref="37">Color</paragraph>
 <paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR">Select a color for the shadow.</ahelp></paragraph>
 <switch select="appl">
 <case select="WRITER"><paragraph role="heading" id="par_idN10A2B" xml-lang="en-US" level="2" l10n="CHG">Properties</paragraph>
 <paragraph role="paragraph" id="par_idN10A2F" xml-lang="en-US" l10n="CHG">Specifies the properties for the current paragraph or the selected paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEWITHNEXT" id="bm_id177312" localize="false"/><paragraph role="heading" id="par_idN10A3A" xml-lang="en-US" level="3" l10n="CHG">Merge with next paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT" id="bm_id177312" localize="false"/><paragraph role="heading" id="par_idN10A3A" xml-lang="en-US" level="3" l10n="CHG">Merge with next paragraph</paragraph>
 <paragraph role="paragraph" id="par_idN10A3E" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT">Merges the border style and the shadow style of the current paragraph with the next paragraph.</ahelp> These styles are only merged if the indent, border, and shadow styles of the next paragraph are the same as the current paragraph. This option is also available for Paragraph Styles.<comment>UFI: see spec "spec-merge-borders-and-shadow"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEADJACENTBORDERS" id="bm_id678731" localize="false"/><paragraph role="heading" id="par_idN109BA" xml-lang="en-US" level="3" l10n="NEW">Merge adjacent line styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS" id="bm_id678731" localize="false"/><paragraph role="heading" id="par_idN109BA" xml-lang="en-US" level="3" l10n="NEW">Merge adjacent line styles</paragraph>
 <paragraph role="paragraph" id="par_idN109BE" xml-lang="en-US" l10n="NEW"><ahelp hid="700793922">Merges two different border styles of adjacent cells in a Writer table into one border style. This property is valid for a whole table in a Writer document.</ahelp></paragraph>
 <paragraph role="note" id="par_idN109C1" xml-lang="en-US" l10n="NEW">The rules can be condensed to the statement that the stronger attribute wins. If, for example, one cell has a red border of 2 point width, and the adjacent cell has a blue border of 3 point width, then the common border between these two cells will be blue with 3 point width.<comment>UFI: see spec "collapsing_table_borders"</comment></paragraph>
 </case>
diff --git a/helpcontent2/source/text/shared/01/05030600.xhp b/helpcontent2/source/text/shared/01/05030600.xhp
index 4648a08ede..18aed6e477 100644
--- a/helpcontent2/source/text/shared/01/05030600.xhp
+++ b/helpcontent2/source/text/shared/01/05030600.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05030600.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,23 +27,18 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
 
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Background</title>
-<filename>/text/shared/01/05030600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T13:47:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hintergrund">
+      <topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Background</title>
+         <filename>/text/shared/01/05030600.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="hintergrund">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151097"><bookmark_value>frames; backgrounds</bookmark_value>
 <bookmark_value>backgrounds; frames/sections/indexes</bookmark_value>
 <bookmark_value>sections; backgrounds</bookmark_value>
@@ -54,77 +47,89 @@
 <bookmark_value>headers;backgrounds</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND" id="bm_id3147000" localize="false"/>
-<paragraph role="heading" id="hd_id3151097" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes. 
-</caseinline><caseinline select="CALC">cells and pages. 
+<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3147653" role="paragraph" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
+</caseinline><caseinline select="CALC">cells and pages.
 </caseinline></switchinline></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#hintergrund"/>
-</section>
-<embed href="text/shared/guide/background.xhp#background"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR" id="bm_id3153321" localize="false"/>
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="2" l10n="U" oldref="4">As</paragraph>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#hintergrund"/>
+      </section>
+      <embed href="text/shared/guide/background.xhp#background"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR" id="bm_id3153321" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="2" l10n="U" oldref="4">As</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154380" role="paragraph" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_BGDCOLORSET" id="bm_id3159414" localize="false"/>
-<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2" l10n="U" oldref="8">Color Background</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
-<embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS" id="bm_id3150400" localize="false"/>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency 
+<paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="3" l10n="U" oldref="8">Color Background</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
+
+      <embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
+      <embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+      <embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS" id="bm_id3150400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="3" l10n="U"
+                 oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="note" id="par_idN107A4" xml-lang="en-US" l10n="NEW">Background transparency can be set only for frames.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107A4" role="note" l10n="NEW">Background transparency can be set only for frames.</paragraph>
 </case>
 </switch>
-<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3150358" role="paragraph" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
 </caseinline></switchinline></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX" id="bm_id3147228" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX" id="bm_id3153352" localize="false"/>
-<paragraph role="heading" id="hd_id3154216" xml-lang="en-US" level="2" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="WRITER">For 
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX" id="bm_id3147228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX" id="bm_id3153352" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154216" role="heading" level="3" l10n="U"
+                 oldref="11"><switchinline select="appl"><caseinline select="WRITER">For
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column. 
+      <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column.
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="note" id="par_id3150497" xml-lang="en-US" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150497" role="note" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="U" oldref="14">Using a Graphic as a Background</paragraph>
-<paragraph role="heading" id="hd_id3149983" xml-lang="en-US" level="2" l10n="U" oldref="15">File</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
-<paragraph role="heading" id="hd_id3145592" xml-lang="en-US" level="3" l10n="U" oldref="17">Display field</paragraph>
-<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK" id="bm_id3145264" localize="false"/>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="19">Link</paragraph>
-<paragraph role="paragraph" id="par_id3154150" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW" id="bm_id3159196" localize="false"/>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE" id="bm_id3153095" localize="false"/>
-<paragraph role="heading" id="hd_id3154472" xml-lang="en-US" level="3" l10n="U" oldref="23">Browse</paragraph>
-<paragraph role="paragraph" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="25">Type</paragraph>
-<paragraph role="paragraph" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="U"
+                 oldref="14">Using a Graphic as a Background</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149983" role="heading" level="3" l10n="U"
+                 oldref="15">File</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145592" role="heading" level="3" l10n="U"
+                 oldref="17">Display field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154920" role="paragraph" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK" id="bm_id3145264" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="3" l10n="U"
+                 oldref="19">Link</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW" id="bm_id3159196" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155366" role="heading" level="3" l10n="U"
+                 oldref="21">Preview</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE" id="bm_id3153095" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154472" role="heading" level="3" l10n="U"
+                 oldref="23">Browse</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="3" l10n="U"
+                 oldref="25">Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147442" role="paragraph" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_POSITION" id="bm_id3083445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION" id="bm_id3156062" localize="false"/>
-<paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="3" l10n="U" oldref="27">Position</paragraph>
-<paragraph role="paragraph" id="par_id3153741" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA" id="bm_id3146146" localize="false"/>
-<paragraph role="heading" id="hd_id3156005" xml-lang="en-US" level="3" l10n="U" oldref="29">Area</paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE" id="bm_id3153138" localize="false"/>
-<paragraph role="heading" id="hd_id3145663" xml-lang="en-US" level="3" l10n="U" oldref="32">Tile</paragraph>
-<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION" id="bm_id3156062" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153366" role="heading" level="3" l10n="U"
+                 oldref="27">Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153741" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA" id="bm_id3146146" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156005" role="heading" level="3" l10n="U"
+                 oldref="29">Area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152596" role="paragraph" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE" id="bm_id3153138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145663" role="heading" level="3" l10n="U"
+                 oldref="32">Tile</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149481" role="paragraph" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
 <bookmark xml-lang="en-US" branch="hid/HID_POPUP_COLOR_CTRL" id="bm_id3151075" localize="false"/>
-<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_POPUP_COLOR_CTRL" visibility="hidden">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3151114" role="paragraph" l10n="U" oldref="35"><ahelp hid="." visibility="hidden">Click a color. Click No Fill to remove a background or highlighting color. Click Automatic to reset a font color.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05030700.xhp b/helpcontent2/source/text/shared/01/05030700.xhp
index dc6de00788..faeeb4e2ae 100755
--- a/helpcontent2/source/text/shared/01/05030700.xhp
+++ b/helpcontent2/source/text/shared/01/05030700.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030700.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,56 +56,56 @@
 </section>
 <paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="CHG" oldref="4">Set the alignment options for the current paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN" id="bm_id3155941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN" id="bm_id3155941" localize="false"/>
 <paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="5">Left</paragraph>
 <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="6"><variable id="linkstext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN">Aligns the paragraph to the left page margin.</ahelp>
 </variable> If Asian language support is enabled, this option is named Left/Top.</paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN" id="bm_id3150465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN" id="bm_id3150465" localize="false"/>
 <paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="7">Right</paragraph>
 <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="8"><variable id="rechtstext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN">Aligns the paragraph to the right page margin.</ahelp>
 </variable> If Asian language support is enabled, this option is named Right/Bottom.</paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN" id="bm_id3155179" localize="false"/>
 <paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="3" l10n="U" oldref="9">Centered</paragraph>
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="10"><variable id="zentrierttext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN">Centers the contents of the paragraph on the page.</ahelp>
 </variable></paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#syzentriert"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN" id="bm_id3159270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN" id="bm_id3159270" localize="false"/>
 <paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="3" l10n="U" oldref="11">Justify</paragraph>
 <paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="U" oldref="12"><variable id="blocksatztext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN">Aligns the paragraph to the left and to the right page margins.</ahelp>
 </variable></paragraph>
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/00/00040502.xhp#syblocksatz"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE" id="bm_id3153896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE" id="bm_id3153896" localize="false"/>
 <paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Last Line 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE">Specify the alignment for the last line in the paragraph.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND" id="bm_id3150542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND" id="bm_id3150542" localize="false"/>
 <paragraph role="heading" id="hd_id3154936" xml-lang="en-US" level="3" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">Expand single word 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND">If the last line of a justified paragraph consists of one word, the word is stretched to the width of the paragraph.</ahelp>
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER"><embed href="text/shared/00/00000007.xhp#asia"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP" id="bm_id3154123" localize="false"/>
 <paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="U" oldref="22">Snap to text grid (if active)<comment>UFI: asian enabled</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154331" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP">Aligns the paragraph to a text grid. To activate the text grid, choose <link href="text/swriter/01/05040800.xhp" name="Format - Page - Text Grid"><emph>Format - Page - Text Grid</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN" id="bm_id3384807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN" id="bm_id3384807" localize="false"/>
 <paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="18">Text-to-text - Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN">Select an alignment option for oversized or undersized characters in the paragraph relative to the rest of the text in the paragraph.</ahelp></paragraph>
 </case>
 </switch>
 <section id="textflow">
 <paragraph role="heading" id="hd_id3144434" xml-lang="en-US" level="2" l10n="U" oldref="23">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3151044" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FORMAT_TABLE_LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3149797" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
+<!-- removed HID SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/>
 <paragraph role="heading" id="hd_id3154631" xml-lang="en-US" level="3" l10n="U" oldref="25">Text direction</paragraph>
 <paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/01/05030800.xhp b/helpcontent2/source/text/shared/01/05030800.xhp
index 08592a655e..89beae9ffb 100755
--- a/helpcontent2/source/text/shared/01/05030800.xhp
+++ b/helpcontent2/source/text/shared/01/05030800.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030800.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,42 +59,42 @@
 <section id="pixelcut">
 <paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="2" l10n="U" oldref="3">Crop</paragraph>
 <paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4">Use this area to trim or scale the selected graphic, or to add white space around the graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST" id="bm_id3154751" localize="false"/>
 <paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="3" l10n="U" oldref="15">Keep scale</paragraph>
 <paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST">Maintains the original scale of the graphic when you crop, so that only the size of the graphic changes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_SIZECONST" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST" id="bm_id3147577" localize="false"/>
 <paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="13">Keep image size</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_SIZECONST">Maintains the original size of the graphic when you crop, so that only the scale of the graphic changes. To reduce the scale of the graphic, select this option and enter negative values in the cropping boxes. To increase the scale of the graphic, enter positive values in the cropping boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_LEFT" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT" id="bm_id3155392" localize="false"/>
 <paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="5">Left</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_LEFT">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the left edge of the graphic, or a negative amount to add white space to the left of the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the horizontal scale of the graphic, or a negative amount to decrease the horizontal scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_RIGHT" id="bm_id3154750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT" id="bm_id3154750" localize="false"/>
 <paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="3" l10n="U" oldref="7">Right</paragraph>
 <paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_RIGHT">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the right edge of the graphic, or a negative amount to add white space to the right of the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the horizontal scale of the graphic, or a negative amount to decrease the horizontal scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_TOP" id="bm_id3153320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP" id="bm_id3153320" localize="false"/>
 <paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="9">Top</paragraph>
 <paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_TOP">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the top of the graphic, or a negative amount to add white space above the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the vertical scale of the graphic, or a negative amount to decrease the vertical scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_BOTTOM" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM" id="bm_id3156156" localize="false"/>
 <paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="3" l10n="U" oldref="11">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_BOTTOM">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the bottom of the graphic, or a negative amount to add white space below the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the vertical scale of the graphic, or a negative amount to decrease the vertical scale of the graphic.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="23">Scale</paragraph>
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="24">Changes the scale of the selected graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTHZOOM" id="bm_id3151384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM" id="bm_id3151384" localize="false"/>
 <paragraph role="heading" id="hd_id3155504" xml-lang="en-US" level="3" l10n="U" oldref="25">Width</paragraph>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTHZOOM">Enter the width for the selected graphic as a percentage.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHTZOOM" id="bm_id3144422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM" id="bm_id3144422" localize="false"/>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="27">Height</paragraph>
 <paragraph role="paragraph" id="par_id3154348" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHTZOOM">Enter the height of the selected graphic as a percentage.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="17">Image size</paragraph>
 <paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="18">Changes the size of the selected graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTH" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH" id="bm_id3150359" localize="false"/>
 <paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="19">Width</paragraph>
 <paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTH">Enter a width for the selected graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHT" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT" id="bm_id3157320" localize="false"/>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="21">Height</paragraph>
 <paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHT">Enter a height for the selected graphic.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_GRFCROP_PB_ORGSIZE" id="bm_id3153178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE" id="bm_id3153178" localize="false"/>
 <paragraph role="heading" id="hd_id3148676" xml-lang="en-US" level="2" l10n="U" oldref="31">Original Size</paragraph>
 <paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_GRFCROP_PB_ORGSIZE">Returns the selected graphic to its original size.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/01/05040100.xhp b/helpcontent2/source/text/shared/01/05040100.xhp
index d6c4be1fe3..945c04229e 100644
--- a/helpcontent2/source/text/shared/01/05040100.xhp
+++ b/helpcontent2/source/text/shared/01/05040100.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,56 +29,54 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Organizer</title>
-<filename>/text/shared/01/05040100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:30:14">UFI: spec "Assign Keyboard Shortcuts to Styles"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="verwalten">
+      <topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Organizer</title>
+         <filename>/text/shared/01/05040100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="verwalten">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153383"><bookmark_value>organizing; styles</bookmark_value>
-<bookmark_value>styles; organizing</bookmark_value>
+         <bookmark_value>styles; organizing</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_MANAGE_STYLES" id="bm_id3145356" localize="false"/>
-<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
-<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sfx2_Edit_TP_MANAGE_STYLES_ED_NAME" id="bm_id3804437" localize="false"/>
-<paragraph role="heading" id="hd_id3149525" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3160481" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_TP_MANAGE_STYLES_CB_AUTO" id="bm_id8273873" localize="false"/>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate 
+<paragraph xml-lang="en-US" id="hd_id3153383" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147588" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_MANAGE_STYLES:ED_NAME" id="bm_id3804437" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149525" role="heading" level="2" l10n="U" oldref="3">Name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3160481" role="paragraph" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO" id="bm_id8273873" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="2" l10n="U"
+                 oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153749" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3153749" role="paragraph" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_NEXT" id="bm_id1614123" localize="false"/>
-<paragraph role="heading" id="hd_id3155392" xml-lang="en-US" level="2" l10n="U" oldref="5">Next Style</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE" id="bm_id373241" localize="false"/>
-<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="7">Linked with</paragraph>
-<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_REGION" id="bm_id7994018" localize="false"/>
-<paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="2" l10n="U" oldref="9">Category</paragraph>
-<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC" id="bm_id3153127" localize="false"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2" l10n="U" oldref="11">Contains</paragraph>
-<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1072D" xml-lang="en-US" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id0107200910584081" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT" id="bm_id1614123" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="5">Next Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE" id="bm_id373241" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="2" l10n="U" oldref="7">Linked with</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166461" role="paragraph" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION" id="bm_id7994018" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148474" role="heading" level="2" l10n="U" oldref="9">Category</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159269" role="paragraph" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150771" role="note" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC" id="bm_id3153127" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="2" l10n="U"
+                 oldref="11">Contains</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154306" role="paragraph" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1072D" role="heading" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 7f1ef53547..f3325b883b 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <helpdocument version="1.0">
-	
+
 <!--
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040200.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.19.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,8 +30,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Page</title>
@@ -64,50 +60,81 @@
 <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
 <paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2" l10n="U" oldref="31">Paper format</paragraph>
 <paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="32">Select from a list of predefined paper sizes, or define a custom paper format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" id="bm_id3147834" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" id="bm_id3147834" localize="false"/>
 <paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="3" l10n="U" oldref="33">Format</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_SIZE">Select a predefined paper size, or create a custom format by entering the dimensions for the paper in the <emph>Height </emph>and <emph>Width </emph>boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" id="bm_id3155893" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" id="bm_id3155893" localize="false"/>
 <paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="35">Width</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH">Displays the width of the selected paper format. To define a custom format, enter a width here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" id="bm_id3155392" localize="false"/>
 <paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3" l10n="U" oldref="37">Height</paragraph>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT">Displays the height of the selected paper format. To define a custom format, enter a height here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_PORTRAIT" id="bm_id3147276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT" id="bm_id3147276" localize="false"/>
 <paragraph role="heading" id="hd_id3146798" xml-lang="en-US" level="3" l10n="U" oldref="39">Portrait</paragraph>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_PORTRAIT">Displays and prints the current document with the paper oriented vertically.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_LANDSCAPE" id="bm_id3159116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE" id="bm_id3159116" localize="false"/>
 <paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="41">Landscape</paragraph>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_LANDSCAPE">Displays and prints the current document with the paper oriented horizontally.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_PAGE_LB_TEXT_FLOW" id="bm_id3146774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW" id="bm_id3146774" localize="false"/>
 <paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="74">Text direction</paragraph>
 <paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_PAGE_LB_TEXT_FLOW">Select the text direction that you want to use in your document.</ahelp> The "right-to-left (vertical)" text flow direction rotates all layout settings to the right by 90 degrees, except for the header and footer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_TRAY" id="bm_id3154516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY" id="bm_id3154516" localize="false"/>
 <paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="43">Paper tray</paragraph>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_TRAY">Select the paper source for your printer. If you want, you can assign different paper trays to different page styles. For example, assign a different tray to the First Page style and load the tray with your company's letterhead paper.</ahelp><comment>UFI: #i31234#</comment></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 <paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="3">Margins</paragraph>
 <paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="4">Specify the amount of space to leave between the edges of the page and the document text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN" id="bm_id3148943" localize="false"/>
 <paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="3" l10n="U" oldref="5">Left / Inner</paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN">Enter the amount of space to leave between the left edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the inner text margin and the inner edge of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN" id="bm_id3154758" localize="false"/>
 <paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="U" oldref="8">Right / Outer</paragraph>
 <paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN">Enter the amount of space to leave between the right edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the outer text margin and the outer edge of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_TOP_MARGIN" id="bm_id3148739" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN" id="bm_id3148739" localize="false"/>
 <paragraph role="heading" id="hd_id3161657" xml-lang="en-US" level="3" l10n="U" oldref="11">Top</paragraph>
 <paragraph role="paragraph" id="par_id3154226" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_TOP_MARGIN">Enter the amount of space to leave between the upper edge of the page and the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
 <paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="13">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
 <paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Page Layout</defaultinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3157962" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Select the page layout style to use in the current document.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id3153104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_PAGE_LB_LAYOUT" id="bm_id5546128" localize="false"/><comment>ufi: see i47727 why the switched help text is not shown</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id3153104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id5546128" localize="false"/><comment>ufi: see i47727 why the switched help text is not shown</comment>
 <paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="17"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Page layout</defaultinline></switchinline></paragraph>
@@ -138,43 +165,14 @@
 <paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_PAGE_CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. 
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment 
+<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page. 
-</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page. 
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_PAGE_LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
+
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
 <paragraph role="heading" id="hd_id3083281" xml-lang="en-US" level="3" l10n="CHG" oldref="27">Format</paragraph>
 <paragraph role="paragraph" id="par_id3153745" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT">Select the page numbering format that you want to use for the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_ADAPT" id="bm_id3156178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT" id="bm_id3156178" localize="false"/>
 <paragraph role="paragraph" id="par_id0522200809473965" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3151318" xml-lang="en-US" level="3" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="OFFICE">
 </caseinline><caseinline select="WRITER">
diff --git a/helpcontent2/source/text/shared/01/05040300.xhp b/helpcontent2/source/text/shared/01/05040300.xhp
index 293ffc9379..52fa6a286e 100644
--- a/helpcontent2/source/text/shared/01/05040300.xhp
+++ b/helpcontent2/source/text/shared/01/05040300.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040300.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,66 +29,87 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0105040300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Header</title>
-<filename>/text/shared/01/05040300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="kopfzeile">
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_HEADER" id="bm_id3154926" localize="false"/><paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040300.xhp" name="Header">Header</link></paragraph>
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_HEADER">Adds a header to the current page style. A header is an area in the top page margin, where you can add text or graphics.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="33">If you want, you can also add borders or a background fill to a header.</paragraph>
+      <topic id="textshared0105040300xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Header</title>
+         <filename>/text/shared/01/05040300.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="kopfzeile">
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_HEADER" id="bm_id3154926" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040300.xhp" name="Header">Header</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156027" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_HEADER">Adds a header to the current page style. A header is an area in the top page margin, where you can add text or graphics.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150693" role="paragraph" l10n="U" oldref="33">If you want, you can also add borders or a background fill to a header.</paragraph>
 <switch select="appl">
 <case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/>
 </case>
 </switch>
 <section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#kopfzeile"/>
-</section>
-<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER">To add a header to the current page style, select <emph>Header on</emph>, and then click <emph>OK</emph>. 
+         <embed href="text/shared/00/00040500.xhp#kopfzeile"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153821" role="paragraph" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER">To add a header to the current page style, select <emph>Header on</emph>, and then click <emph>OK</emph>. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="31">If you want to extend a header into the page margins, insert a frame into the header.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153827" role="paragraph" l10n="U" oldref="31">If you want to extend a header into the page margins, insert a frame into the header.</paragraph>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3154046" role="tip" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3152360" xml-lang="en-US" level="2" l10n="U" oldref="4">Header</paragraph>
-<paragraph role="paragraph" id="par_id3154924" xml-lang="en-US" l10n="U" oldref="5">Set the properties of the header.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON" id="bm_id3158209" localize="false"/><paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="3" l10n="U" oldref="7">Header on</paragraph>
-<paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON">Adds a header to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED" id="bm_id3150543" localize="false"/><paragraph role="heading" id="hd_id3154936" xml-lang="en-US" level="3" l10n="U" oldref="21">Same content left/right<comment>i80087</comment></paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different header to even and odd pages, clear this option, and then click <emph>Edit</emph>. 
+<paragraph xml-lang="en-US" id="hd_id3152360" role="heading" level="2" l10n="U" oldref="4">Header</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154924" role="paragraph" l10n="U" oldref="5">Set the properties of the header.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON" id="bm_id3158209" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147304" role="heading" level="3" l10n="U" oldref="7">Header on</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154388" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON">Adds a header to the current page style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED" id="bm_id3150543" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154936" role="heading" level="3" l10n="U"
+                 oldref="21">Same content left/right<comment>i80087</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different header to even and odd pages, clear this option, and then click <emph>Edit</emph>. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN" id="bm_id3154153" localize="false"/><paragraph role="heading" id="hd_id3145202" xml-lang="en-US" level="3" l10n="U" oldref="17">Left margin</paragraph>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN" id="bm_id3151041" localize="false"/><paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="U" oldref="19">Right margin</paragraph>
-<paragraph role="paragraph" id="par_id3157322" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="3" l10n="U" oldref="9">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the header and the top edge of the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING" id="bm_id3144432" localize="false"/><paragraph role="heading" id="hd_id3154330" xml-lang="en-US" level="4" l10n="U" oldref="35">Use dynamic spacing</paragraph>
-<paragraph role="paragraph" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting, and allows the header to expand into the area between the header and the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT" id="bm_id3153056" localize="false"/><paragraph role="heading" id="hd_id3150290" xml-lang="en-US" level="3" l10n="U" oldref="13">Height</paragraph>
-<paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT">Enter the height that you want for the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN" id="bm_id3154300" localize="false"/><paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="3" l10n="U" oldref="15">AutoFit height</paragraph>
-<paragraph role="paragraph" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN">Automatically adjusts the height of the header to fit the content that you enter.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3145271" xml-lang="en-US" level="2" l10n="U" oldref="24">More</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_HEADER_EDIT" id="bm_id3145592" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="2" l10n="U" oldref="27"><switchinline select="appl"><caseinline select="CALC">Edit 
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN" id="bm_id3154153" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145202" role="heading" level="3" l10n="U"
+                 oldref="17">Left margin</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN" id="bm_id3151041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="3" l10n="U"
+                 oldref="19">Right margin</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157322" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST" id="bm_id3149167" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148672" role="heading" level="3" l10n="U" oldref="9">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153970" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the header and the top edge of the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING" id="bm_id3144432" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154330" role="heading" level="4" l10n="U"
+                 oldref="35">Use dynamic spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148453" role="paragraph" l10n="U" oldref="36"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting, and allows the header to expand into the area between the header and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT" id="bm_id3153056" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150290" role="heading" level="3" l10n="U"
+                 oldref="13">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155429" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT">Enter the height that you want for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN" id="bm_id3154300" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="3" l10n="U"
+                 oldref="15">AutoFit height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153095" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN">Automatically adjusts the height of the header to fit the content that you enter.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS" id="bm_id3147434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145271" role="heading" level="2" l10n="U"
+                 oldref="24">More</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_HEADER_EDIT" id="bm_id3145592" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155306" role="heading" level="2" l10n="U"
+                 oldref="27"><switchinline select="appl"><caseinline select="CALC">Edit 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_SC_HEADER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit">Add or edit</link> header text. 
+      <paragraph xml-lang="en-US" id="par_id0609200910261473" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Add or edit header text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" oldref="28"><ahelp hid="HID_SC_HEADER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit">Add or edit</link> header text. 
 </caseinline></switchinline></ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3163716" xml-lang="en-US" l10n="C"><link href="text/swriter/01/04220000.xhp" name="Headers">Headers</link></paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
-<paragraph role="paragraph" id="par_id3150873" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
-<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3163716" role="paragraph" l10n="C"><link href="text/swriter/01/04220000.xhp" name="Headers">Headers</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150873" role="paragraph" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147326" role="paragraph" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05040400.xhp b/helpcontent2/source/text/shared/01/05040400.xhp
index ffc76d66af..4b4ecae6fb 100644
--- a/helpcontent2/source/text/shared/01/05040400.xhp
+++ b/helpcontent2/source/text/shared/01/05040400.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040400.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,66 +29,87 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0105040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Footer</title>
-<filename>/text/shared/01/05040400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="fusszeile">
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_FOOTER" id="bm_id3145348" localize="false"/><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040400.xhp" name="Footer">Footer</link></paragraph>
-<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_FOOTER">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="32">If you want, you can also add borders or a background fill to a footer.</paragraph>
+      <topic id="textshared0105040400xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Footer</title>
+         <filename>/text/shared/01/05040400.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="fusszeile">
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_FOOTER" id="bm_id3145348" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040400.xhp" name="Footer">Footer</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_FOOTER">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="32">If you want, you can also add borders or a background fill to a footer.</paragraph>
 <switch select="appl">
 <case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/>
 </case>
 </switch>
 <section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#fusszeile"/>
-</section>
-<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">To insert a footer into the current document, select <emph>Footer on</emph>, and then click <emph>OK</emph>. 
+         <embed href="text/shared/00/00040500.xhp#fusszeile"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155339" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">To insert a footer into the current document, select <emph>Footer on</emph>, and then click <emph>OK</emph>. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="30">If you want to extend a footer into the page margins, insert a frame into the footer.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="30">If you want to extend a footer into the page margins, insert a frame into the footer.</paragraph>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3150976" xml-lang="en-US" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3150976" role="tip" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="2" l10n="U" oldref="3">Footer</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="4">Set the properties of the footer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="6">Footer on</paragraph>
-<paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON">Adds a footer to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED" id="bm_id3149244" localize="false"/><paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="3" l10n="U" oldref="20">Same content left/right</paragraph>
-<paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>. 
+<paragraph xml-lang="en-US" id="hd_id3150504" role="heading" level="2" l10n="U" oldref="3">Footer</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="4">Set the properties of the footer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON" id="bm_id3155434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154380" role="heading" level="3" l10n="U" oldref="6">Footer on</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON">Adds a footer to the current page style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED" id="bm_id3149244" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="3" l10n="U"
+                 oldref="20">Same content left/right</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149575" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN" id="bm_id3149457" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="16">Left margin</paragraph>
-<paragraph role="paragraph" id="par_id3156434" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3154073" xml-lang="en-US" level="3" l10n="U" oldref="18">Right margin</paragraph>
-<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="3" l10n="U" oldref="8">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="4" l10n="U" oldref="34">Use dynamic spacing</paragraph>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT" id="bm_id3150495" localize="false"/><paragraph role="heading" id="hd_id3154821" xml-lang="en-US" level="3" l10n="U" oldref="12">Height</paragraph>
-<paragraph role="paragraph" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN" id="bm_id3153968" localize="false"/><paragraph role="heading" id="hd_id3150742" xml-lang="en-US" level="3" l10n="U" oldref="14">AutoFit height</paragraph>
-<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS" id="bm_id3147084" localize="false"/><paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="2" l10n="U" oldref="23">More</paragraph>
-<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FOOTER_EDIT" id="bm_id3145787" localize="false"/><paragraph role="heading" id="hd_id3157892" xml-lang="en-US" level="2" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Edit 
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN" id="bm_id3149457" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="3" l10n="U"
+                 oldref="16">Left margin</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156434" role="paragraph" l10n="U" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN" id="bm_id3153360" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154073" role="heading" level="3" l10n="U"
+                 oldref="18">Right margin</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154224" role="paragraph" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST" id="bm_id3154123" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154140" role="heading" level="3" l10n="U" oldref="8">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING" id="bm_id3152933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158409" role="heading" level="4" l10n="U"
+                 oldref="34">Use dynamic spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="35"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT" id="bm_id3150495" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154821" role="heading" level="3" l10n="U"
+                 oldref="12">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3125865" role="paragraph" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN" id="bm_id3153968" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150742" role="heading" level="3" l10n="U"
+                 oldref="14">AutoFit height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS" id="bm_id3147084" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="2" l10n="U"
+                 oldref="23">More</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FOOTER_EDIT" id="bm_id3145787" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157892" role="heading" level="2" l10n="U"
+                 oldref="26"><switchinline select="appl"><caseinline select="CALC">Edit 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SC_FOOTER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit footer text.">Add or edit footer text.</link>
+      <paragraph xml-lang="en-US" id="par_id0609200910255518" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Add or edit footer text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_SC_FOOTER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit footer text.">Add or edit footer text.</link>
 </caseinline></switchinline></ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="C"><link href="text/swriter/01/04230000.xhp" name="Footers">Footers</link></paragraph>
-<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
-<paragraph role="paragraph" id="par_id3154189" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3151112" role="paragraph" l10n="C"><link href="text/swriter/01/04230000.xhp" name="Footers">Footers</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155411" role="paragraph" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154189" role="paragraph" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05050000.xhp b/helpcontent2/source/text/shared/01/05050000.xhp
index 52ff1dda9b..e726cc306d 100644
--- a/helpcontent2/source/text/shared/01/05050000.xhp
+++ b/helpcontent2/source/text/shared/01/05050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,38 +27,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0105050000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Change Case</title>
 <filename>/text/shared/01/05050000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T14:40:09">converted from old format - fpe
-dedr: fixed #i30332#
-UFI: changed name, see spec Format Menu in Writer
-dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <section id="grossklein">
 <bookmark xml-lang="en-US" branch="hid/.uno:TransliterateMenu" id="bm_id668355" localize="false"/>
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Change Case</link></paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of the selected characters, or if the cursor is in a word, changes the case of all of the characters in the word.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of characters in the selection. If the cursor is within a word and no text is selected, then the word is the selection.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00040500.xhp#grossklein"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
-<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">Uppercase</paragraph>
-<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to capital letters</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_SENTENCE" id="bm_id7402005" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToSentenceCase" id="bm_id3149347" localize="false"/>
+<paragraph role="heading" id="hd_id3147572" xml-lang="en-US" level="2" l10n="U" oldref="5">Sentence case</paragraph>
+<paragraph role="paragraph" id="par_id3150694" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first letter of the selected western characters to an uppercase character.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_LOWER" id="bm_id7402004" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToLower" id="bm_id3149346" localize="false"/>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Lowercase</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase letters.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">lowercase</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
+<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">UPPERCASE</paragraph>
+<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to uppercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_CAPITALIZE" id="bm_id7402014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToTitleCase" id="bm_id3149316" localize="false"/>
+<paragraph role="heading" id="hd_id3147511" xml-lang="en-US" level="2" l10n="U" oldref="5">Capitalize Every Word</paragraph>
+<paragraph role="paragraph" id="par_id3150613" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first character of every word of the selected western characters to an uppercase character.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_TOGGLE" id="bm_id7402024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToToggleCase" id="bm_id3149326" localize="false"/>
+<paragraph role="heading" id="hd_id3147521" xml-lang="en-US" level="2" l10n="U" oldref="5">tOGGLE cASE</paragraph>
+<paragraph role="paragraph" id="par_id3150623" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Toggles case of all selected western characters.</ahelp></paragraph>
+
 <embed href="text/shared/00/00000007.xhp#asia"/>
 <bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_HALFWIDTH" id="bm_id203258" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToHalfWidth" id="bm_id3154288" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05060000.xhp b/helpcontent2/source/text/shared/01/05060000.xhp
index ba72b6f498..8b63a74cbd 100644
--- a/helpcontent2/source/text/shared/01/05060000.xhp
+++ b/helpcontent2/source/text/shared/01/05060000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,23 +63,23 @@
 <paragraph role="listitem" id="par_id3154838" xml-lang="en-US" l10n="U" oldref="15">Enter the text that you want to use as a pronunciation guide in the <emph>Ruby text</emph> box.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_1" id="bm_id3149031" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_2" id="bm_id3153209" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_3" id="bm_id3156082" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_4" id="bm_id3148981" localize="false"/><paragraph role="heading" id="hd_id3150793" xml-lang="en-US" level="2" l10n="U" oldref="3">Base text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1" id="bm_id3149031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2" id="bm_id3153209" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3" id="bm_id3156082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4" id="bm_id3148981" localize="false"/><paragraph role="heading" id="hd_id3150793" xml-lang="en-US" level="2" l10n="U" oldref="3">Base text</paragraph>
 <paragraph role="paragraph" id="par_id3154155" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_4">Displays the base text that you selected in the current file. If you want, you can modify the base text by entering new text here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_1" id="bm_id3154821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_2" id="bm_id3153180" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_3" id="bm_id3149767" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_4" id="bm_id3152922" localize="false"/><paragraph role="heading" id="hd_id3145154" xml-lang="en-US" level="2" l10n="U" oldref="5">Ruby text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1" id="bm_id3154821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2" id="bm_id3153180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3" id="bm_id3149767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4" id="bm_id3152922" localize="false"/><paragraph role="heading" id="hd_id3145154" xml-lang="en-US" level="2" l10n="U" oldref="5">Ruby text</paragraph>
 <paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_4">Enter the text that you want to use as a pronunciation guide for the base text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_ADJUST" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="7">Alignment</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="7">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_ADJUST">Select the horizontal alignment for the Ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_POSITION" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="16">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="16">Position</paragraph>
 <paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_POSITION">Select where you want to place the ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_CHAR_STYLE" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Character Style for ruby text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Character Style for ruby text</paragraph>
 <paragraph role="paragraph" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_CHAR_STYLE">Select a character style for the ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_RUBY_PB_STYLIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="2" l10n="U" oldref="11">Styles and Formatting<comment>UFI: renamed??</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="2" l10n="U" oldref="11">Styles and Formatting<comment>UFI: renamed??</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_RUBY_PB_STYLIST">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05140000.xhp" name="Styles">Styles and Formatting window</link>
 </caseinline><defaultinline>Styles and Formatting window</defaultinline></switchinline> where you can select a character style for the ruby text.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05070000.xhp b/helpcontent2/source/text/shared/01/05070000.xhp
index 06a1493731..c0c5781fd4 100644
--- a/helpcontent2/source/text/shared/01/05070000.xhp
+++ b/helpcontent2/source/text/shared/01/05070000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070000.xhp,v $
- * $Revision: 1.9.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070100.xhp b/helpcontent2/source/text/shared/01/05070100.xhp
index ff703c3add..f4119e69d5 100644
--- a/helpcontent2/source/text/shared/01/05070100.xhp
+++ b/helpcontent2/source/text/shared/01/05070100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070100.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070200.xhp b/helpcontent2/source/text/shared/01/05070200.xhp
index 705964ad62..930753a381 100644
--- a/helpcontent2/source/text/shared/01/05070200.xhp
+++ b/helpcontent2/source/text/shared/01/05070200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070200.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070300.xhp b/helpcontent2/source/text/shared/01/05070300.xhp
index 1b2b4e3f9d..80a8309c59 100644
--- a/helpcontent2/source/text/shared/01/05070300.xhp
+++ b/helpcontent2/source/text/shared/01/05070300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070300.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070400.xhp b/helpcontent2/source/text/shared/01/05070400.xhp
index d95e717a2b..3f14088596 100644
--- a/helpcontent2/source/text/shared/01/05070400.xhp
+++ b/helpcontent2/source/text/shared/01/05070400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070400.xhp,v $
- * $Revision: 1.6.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070500.xhp b/helpcontent2/source/text/shared/01/05070500.xhp
index 1df4ae8113..f3d71e2ee4 100644
--- a/helpcontent2/source/text/shared/01/05070500.xhp
+++ b/helpcontent2/source/text/shared/01/05070500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070500.xhp,v $
- * $Revision: 1.6.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070600.xhp b/helpcontent2/source/text/shared/01/05070600.xhp
index 3db52f6ce6..2d0e64adc9 100644
--- a/helpcontent2/source/text/shared/01/05070600.xhp
+++ b/helpcontent2/source/text/shared/01/05070600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05070600.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080000.xhp b/helpcontent2/source/text/shared/01/05080000.xhp
index 74800da30f..5eaa355824 100755
--- a/helpcontent2/source/text/shared/01/05080000.xhp
+++ b/helpcontent2/source/text/shared/01/05080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080100.xhp b/helpcontent2/source/text/shared/01/05080100.xhp
index 5b2d7a6f39..1057bceb51 100644
--- a/helpcontent2/source/text/shared/01/05080100.xhp
+++ b/helpcontent2/source/text/shared/01/05080100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080200.xhp b/helpcontent2/source/text/shared/01/05080200.xhp
index b90606d3c2..d0ca499d07 100644
--- a/helpcontent2/source/text/shared/01/05080200.xhp
+++ b/helpcontent2/source/text/shared/01/05080200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080300.xhp b/helpcontent2/source/text/shared/01/05080300.xhp
index 1a5691367b..6bda92690c 100644
--- a/helpcontent2/source/text/shared/01/05080300.xhp
+++ b/helpcontent2/source/text/shared/01/05080300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080400.xhp b/helpcontent2/source/text/shared/01/05080400.xhp
index 5d9bc5c861..3304b2f797 100644
--- a/helpcontent2/source/text/shared/01/05080400.xhp
+++ b/helpcontent2/source/text/shared/01/05080400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05090000.xhp b/helpcontent2/source/text/shared/01/05090000.xhp
index 600e744f8a..bba07b8c0a 100755
--- a/helpcontent2/source/text/shared/01/05090000.xhp
+++ b/helpcontent2/source/text/shared/01/05090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100000.xhp b/helpcontent2/source/text/shared/01/05100000.xhp
index 665176c12c..4dca5ec674 100755
--- a/helpcontent2/source/text/shared/01/05100000.xhp
+++ b/helpcontent2/source/text/shared/01/05100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100100.xhp b/helpcontent2/source/text/shared/01/05100100.xhp
index 24f10ba262..ad7ba427df 100644
--- a/helpcontent2/source/text/shared/01/05100100.xhp
+++ b/helpcontent2/source/text/shared/01/05100100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100100.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
index 0461b8cef1..c800efc2c6 100644
--- a/helpcontent2/source/text/shared/01/05100200.xhp
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100200.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,17 +69,17 @@
 
 </section>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
+<!-- removed HID SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT -->
 <paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="3">Split cell into</paragraph>
 <paragraph role="paragraph" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_SPLIT:ED_COUNT">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2" l10n="U" oldref="5">Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ" id="bm_id3149028" localize="false"/>
+<!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ -->
 <paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="7">Horizontally</paragraph>
 <paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_HORZ">Splits the selected cell(s) into the number of rows that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SPLIT_CB_PROP" id="bm_id3151185" localize="false"/>
+<!-- removed HID SW_CHECKBOX_DLG_SPLIT_CB_PROP -->
 <paragraph role="heading" id="hd_id3147566" xml-lang="en-US" level="3" l10n="U" oldref="11">Into equal proportions</paragraph>
 <paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_DLG_SPLIT_CB_PROP">Splits cells into rows of equal height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT" id="bm_id3151168" localize="false"/>
+<!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT -->
 <paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3" l10n="U" oldref="9">Vertically</paragraph>
 <paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_VERT">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp
index 346c369bf8..070cf01fd7 100644
--- a/helpcontent2/source/text/shared/01/05100500.xhp
+++ b/helpcontent2/source/text/shared/01/05100500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100500.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp
index b9a090e6e3..e15d1d1d28 100644
--- a/helpcontent2/source/text/shared/01/05100600.xhp
+++ b/helpcontent2/source/text/shared/01/05100600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100600.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp
index 7fa2e119f5..aff2221327 100644
--- a/helpcontent2/source/text/shared/01/05100700.xhp
+++ b/helpcontent2/source/text/shared/01/05100700.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100700.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110000.xhp b/helpcontent2/source/text/shared/01/05110000.xhp
index e58be3c355..feb0ba4bbe 100755
--- a/helpcontent2/source/text/shared/01/05110000.xhp
+++ b/helpcontent2/source/text/shared/01/05110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110100.xhp b/helpcontent2/source/text/shared/01/05110100.xhp
index b98581bf39..43b253b32c 100644
--- a/helpcontent2/source/text/shared/01/05110100.xhp
+++ b/helpcontent2/source/text/shared/01/05110100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110200.xhp b/helpcontent2/source/text/shared/01/05110200.xhp
index bb5c51e29c..c3581a2090 100644
--- a/helpcontent2/source/text/shared/01/05110200.xhp
+++ b/helpcontent2/source/text/shared/01/05110200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110200.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110300.xhp b/helpcontent2/source/text/shared/01/05110300.xhp
index 9c8fa4440d..750c865a79 100644
--- a/helpcontent2/source/text/shared/01/05110300.xhp
+++ b/helpcontent2/source/text/shared/01/05110300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110400.xhp b/helpcontent2/source/text/shared/01/05110400.xhp
index 900fd058e9..9886e8069e 100644
--- a/helpcontent2/source/text/shared/01/05110400.xhp
+++ b/helpcontent2/source/text/shared/01/05110400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110500.xhp b/helpcontent2/source/text/shared/01/05110500.xhp
index 12750938ec..614d1cfba7 100644
--- a/helpcontent2/source/text/shared/01/05110500.xhp
+++ b/helpcontent2/source/text/shared/01/05110500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110500.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
index 5846a241ac..4969c12662 100644
--- a/helpcontent2/source/text/shared/01/05110600m.xhp
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110600m.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05110700.xhp b/helpcontent2/source/text/shared/01/05110700.xhp
index 4d23fb2c98..5f963baed9 100644
--- a/helpcontent2/source/text/shared/01/05110700.xhp
+++ b/helpcontent2/source/text/shared/01/05110700.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110700.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110800.xhp b/helpcontent2/source/text/shared/01/05110800.xhp
index 50d79f9be1..1313cbd28c 100644
--- a/helpcontent2/source/text/shared/01/05110800.xhp
+++ b/helpcontent2/source/text/shared/01/05110800.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110800.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120000.xhp b/helpcontent2/source/text/shared/01/05120000.xhp
index 49589ba0cf..befa57e665 100755
--- a/helpcontent2/source/text/shared/01/05120000.xhp
+++ b/helpcontent2/source/text/shared/01/05120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120100.xhp b/helpcontent2/source/text/shared/01/05120100.xhp
index a030f28f7b..b3046c5a3d 100644
--- a/helpcontent2/source/text/shared/01/05120100.xhp
+++ b/helpcontent2/source/text/shared/01/05120100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120200.xhp b/helpcontent2/source/text/shared/01/05120200.xhp
index b0472a9fd2..aa766ff8a2 100644
--- a/helpcontent2/source/text/shared/01/05120200.xhp
+++ b/helpcontent2/source/text/shared/01/05120200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120200.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120300.xhp b/helpcontent2/source/text/shared/01/05120300.xhp
index 23a1d9524b..c3cafc87f1 100644
--- a/helpcontent2/source/text/shared/01/05120300.xhp
+++ b/helpcontent2/source/text/shared/01/05120300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120300.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
index a7d0233c12..ab826963e2 100644
--- a/helpcontent2/source/text/shared/01/05120600.xhp
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120600.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05140100.xhp b/helpcontent2/source/text/shared/01/05140100.xhp
index f92450ab67..228d5630e3 100644
--- a/helpcontent2/source/text/shared/01/05140100.xhp
+++ b/helpcontent2/source/text/shared/01/05140100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05140100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
   <bookmark xml-lang="en-US" branch="hid/SID_STYLE_NEW_BY_EXAMPLE" id="bm_id7425973" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:StyleNewByExample" xml-lang="en-US" id="bm_id3152942"/><paragraph role="heading" level="1" id="hd_id3152823" l10n="U" xml-lang="en-US" oldref="1">Create Style</paragraph>
   <comment>This command is a Styl_ist icon</comment>
-  <bookmark branch="hid/SFX2:COMBOBOX:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" xml-lang="en-US" id="bm_id3155069"/><paragraph role="heading" level="2" id="hd_id3152790" l10n="U" xml-lang="en-US" oldref="4">Style name</paragraph>
+  <bookmark branch="hid/sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" xml-lang="en-US" id="bm_id3155069"/><paragraph role="heading" level="2" id="hd_id3152790" l10n="U" xml-lang="en-US" oldref="4">Style name</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155599" xml-lang="en-US" oldref="5"><ahelp hid="SFX2:COMBOBOX:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" visibility="visible">Enter a name for the new Style.</ahelp></paragraph>
   <paragraph role="heading" level="3" id="hd_id3154682" l10n="U" xml-lang="en-US" oldref="6">List of Custom Styles</paragraph>
   <paragraph role="paragraph" id="par_id3154894" l10n="U" xml-lang="en-US" oldref="7">Lists the user-defined styles that are attached to the current document.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05150101.xhp b/helpcontent2/source/text/shared/01/05150101.xhp
index 68a2e32360..62eaca0bb9 100755
--- a/helpcontent2/source/text/shared/01/05150101.xhp
+++ b/helpcontent2/source/text/shared/01/05150101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05150101.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
   
   
   <paragraph role="heading" level="1" id="hd_id3154841" l10n="U" xml-lang="en-US" oldref="1">Add AutoFormat</paragraph>
-  <bookmark branch="hid/SW:EDIT:DLG_SWDLG_STRINPUT:ED_INPUT" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
+  <bookmark branch="hid/sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153391" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="SW:EDIT:DLG_SWDLG_STRINPUT:ED_INPUT">Enter a name for the new AutoFormat, and then click<emph> OK</emph>.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05190000.xhp b/helpcontent2/source/text/shared/01/05190000.xhp
index 53ac8d994b..92f607da09 100644
--- a/helpcontent2/source/text/shared/01/05190000.xhp
+++ b/helpcontent2/source/text/shared/01/05190000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05190000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
 </caseinline><defaultinline>The name is also displayed in the Status Bar when you select the object.</defaultinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_FORMAT_NAME_OBJECT_NAME" id="bm_id3154422" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_NAMEDIALOG_OBJECT" id="bm_id3154186" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME" id="bm_id8149052" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME" id="bm_id8149052" localize="false"/>
 <paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_SD_NAMEDIALOG_OBJECT">Enter a name for the selected object. The name will be visible in the Navigator.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05190100.xhp b/helpcontent2/source/text/shared/01/05190100.xhp
index 6da9f0be4c..1e56eff311 100644
--- a/helpcontent2/source/text/shared/01/05190100.xhp
+++ b/helpcontent2/source/text/shared/01/05190100.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05190100.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,17 +31,16 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Description</title>
-<filename>/text/shared/01/05190100.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Description</title>
+         <filename>/text/shared/01/05190100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147366"><bookmark_value>objects;titles and descriptions</bookmark_value>
-<bookmark_value>descriptions for objects</bookmark_value>
-<bookmark_value>titles;objects</bookmark_value>
+      <bookmark_value>descriptions for objects</bookmark_value>
+      <bookmark_value>titles;objects</bookmark_value>
 </bookmark><comment>mw made one index entry out of two "objects;" entries and made "descriptions;" a one level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_TITLE_DESCRIPTION_OBJECT" id="bm_id267952" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_OBJECT_TITLE_DESCRIPTION" id="bm_id2231513" localize="false"/>
@@ -54,9 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00040502.xhp#descript"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/><paragraph role="heading" id="hd_id2576982" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/><paragraph role="heading" id="hd_id2576982" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
 <paragraph role="paragraph" id="par_id1283608" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a title text. This short name is visible as an alternative tag in HTML format. Accessibility tools can read this text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/><paragraph role="heading" id="hd_id8173467" xml-lang="en-US" level="2" l10n="NEW">Description</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/><paragraph role="heading" id="hd_id8173467" xml-lang="en-US" level="2" l10n="NEW">Description</paragraph>
 <paragraph role="paragraph" id="par_id693685" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a description text. The long description text can be entered to describe a complex object or group of objects to users with screen reader software. The description is visible as an alternative tag for accessibility tools.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05200000.xhp b/helpcontent2/source/text/shared/01/05200000.xhp
index cf62cb9f9c..a38f5dca8b 100644
--- a/helpcontent2/source/text/shared/01/05200000.xhp
+++ b/helpcontent2/source/text/shared/01/05200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05200000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05200100.xhp b/helpcontent2/source/text/shared/01/05200100.xhp
index 9d9f736321..9f30da787a 100644
--- a/helpcontent2/source/text/shared/01/05200100.xhp
+++ b/helpcontent2/source/text/shared/01/05200100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05200100.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,23 +50,23 @@
 <paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Line properties</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_STYLE" id="bm_id3568890" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:XLineStyle" id="bm_id3148520" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_LINE_STYLE" id="bm_id3154863" localize="false"/><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="5">Styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE" id="bm_id3154863" localize="false"/><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="5">Styles</paragraph>
 <paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="CHG" oldref="6"><variable id="stiltext"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_LINE_STYLE">Select the line style that you want to use.</ahelp>
 </variable></paragraph>
 <embed href="text/shared/00/00000004.xhp#sylistil"/>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_COLOR" id="bm_id367227" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:XLineColor" id="bm_id3151234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_COLOR" id="bm_id3156136" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="3" l10n="U" oldref="7">Colors</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR" id="bm_id3156136" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="3" l10n="U" oldref="7">Colors</paragraph>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="8"><variable id="farbetext"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_COLOR">Select a color for the line.</ahelp>
 </variable></paragraph>
 <embed href="text/shared/00/00000004.xhp#sylifarbe"/>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_WIDTH" id="bm_id4880880" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:LineWidth" id="bm_id3149750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="9">Widths</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="9">Widths</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="10"><variable id="breitetext"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH">Select the width for the line. You can append a measurement unit. A zero line width results in a hairline with a width of one pixel of the output medium.</ahelp>
 </variable></paragraph>
 <embed href="text/shared/00/00000004.xhp#sylibreite"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT" id="bm_id3154983" localize="false"/><paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="11">Transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT" id="bm_id3154983" localize="false"/><paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="11">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT">Enter the transparency of the line, where 100% corresponds to completely transparent and 0% to completely opaque. </ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">
 </caseinline><caseinline select="DRAW">
@@ -77,26 +74,26 @@
 </caseinline><defaultinline>The <emph>Line</emph> tab of the <emph>Data Series</emph> dialog is only available if you select an XY <emph>Chart type</emph>.</defaultinline></switchinline></paragraph>
 <paragraph role="heading" id="hd_id3153331" xml-lang="en-US" level="2" l10n="U" oldref="23">Icon</paragraph>
 <paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="24">Set the options for the data point symbols in your chart.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MENUBUTTON:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP" id="bm_id3154047" localize="false"/><paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="25">Select</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP" id="bm_id3154047" localize="false"/><paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="25">Select</paragraph>
 <paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP">Select the symbol style that you want to use in your chart.</ahelp> If you select <emph>Automatic</emph>, $[officename] uses the default symbols for the selected chart type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="27">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="27">Width</paragraph>
 <paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH">Enter a width for the symbol.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="29">Height</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="29">Height</paragraph>
 <paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT">Enter a height for the symbol.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO" id="bm_id3148686" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep ratio</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO" id="bm_id3148686" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep ratio</paragraph>
 <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO">Maintains the proportions of the symbol when you enter a new height or width value.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154579" xml-lang="en-US" level="2" l10n="U" oldref="13">Arrow styles</paragraph>
 <paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="14">You can add arrowheads to one end, or both ends of the selected line. To add a custom arrow style to the list, select the arrow in your document, and then click on the <link href="text/shared/01/05200300.xhp" name="Arrow Styles"><emph>Arrow Styles</emph></link> tab of this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_START_STYLE" id="bm_id3155922" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_END_STYLE" id="bm_id3144422" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="15">Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE" id="bm_id3155922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE" id="bm_id3144422" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="15">Style</paragraph>
 <paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_END_STYLE">Select the arrowhead that you want to apply to the selected line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH" id="bm_id3153896" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH" id="bm_id3159414" localize="false"/><paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="3" l10n="U" oldref="17">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH" id="bm_id3153896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH" id="bm_id3159414" localize="false"/><paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="3" l10n="U" oldref="17">Width</paragraph>
 <paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH">Enter a width for the arrowhead.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_START" id="bm_id3161657" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_END" id="bm_id3150358" localize="false"/><paragraph role="heading" id="hd_id3154935" xml-lang="en-US" level="3" l10n="U" oldref="19">Center</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START" id="bm_id3161657" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END" id="bm_id3150358" localize="false"/><paragraph role="heading" id="hd_id3154935" xml-lang="en-US" level="3" l10n="U" oldref="19">Center</paragraph>
 <paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_END">Places the center of the arrowhead(s) on the endpoint(s) of the selected line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE" id="bm_id3154138" localize="false"/><paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="21">Synchronize ends</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE" id="bm_id3154138" localize="false"/><paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="21">Synchronize ends</paragraph>
 <paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE">Automatically updates both arrowhead settings when you enter a different width, select a different arrowhead style,or center an arrowhead.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 48ff35bc75..ad25a37e0e 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05200200.xhp,v $
- * $Revision: 1.6.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105200200xml" indexer="include">
 <title id="tit" xml-lang="en-US">Line Styles</title>
@@ -50,41 +47,41 @@
 <embed href="text/shared/00/00040502.xhp#linienstile"/>
 </section>
 <paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES" id="bm_id3147212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES" id="bm_id3147212" localize="false"/>
 <paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="3" l10n="U" oldref="15">Line style</paragraph>
 <paragraph role="paragraph" id="par_id3146807" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES">Select the style of line that you want to create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_1" id="bm_id3151097" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_2" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1" id="bm_id3151097" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2" id="bm_id3152895" localize="false"/>
 <paragraph role="heading" id="hd_id3149948" xml-lang="en-US" level="3" l10n="U" oldref="5">Type</paragraph>
 <paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_2">Select the combination of dashes and dots that you want.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_1" id="bm_id3146067" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_2" id="bm_id3154230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1" id="bm_id3146067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2" id="bm_id3154230" localize="false"/>
 <paragraph role="heading" id="hd_id3148731" xml-lang="en-US" level="3" l10n="U" oldref="7">Number</paragraph>
 <paragraph role="paragraph" id="par_id3155351" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_2">Enter the number of times that you want a dot or a dash to appear in a sequence.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_1" id="bm_id3153935" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2" id="bm_id3149283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1" id="bm_id3153935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2" id="bm_id3149283" localize="false"/>
 <paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="3" l10n="U" oldref="9">Length</paragraph>
 <paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2">Enter the length of the dash.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE" id="bm_id3156414" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE" id="bm_id3156414" localize="false"/>
 <paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="3" l10n="U" oldref="11">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE">Enter the amount of space that you want to leave between dots or dashes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE" id="bm_id3147250" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE" id="bm_id3147250" localize="false"/>
 <paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="3" l10n="U" oldref="13">Fit to line width</paragraph>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE">Automatically adjusts the entries relative to the length of the line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD" id="bm_id3152551" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD" id="bm_id3152551" localize="false"/>
 <paragraph role="heading" id="hd_id3155355" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD">Creates a new line style using the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING" id="bm_id3145313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_NAME:EDT_STRING" id="bm_id3145313" localize="false"/>
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="19">Name</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING">Enter a name for the new line style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY" id="bm_id3147011" localize="false"/>
+<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="">Enter a name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY" id="bm_id3147011" localize="false"/>
 <paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD" id="bm_id3149812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD" id="bm_id3149812" localize="false"/>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="23">Load line style table</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD">Imports a list of line styles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_SAVE" id="bm_id3149579" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE" id="bm_id3149579" localize="false"/>
 <paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2" l10n="U" oldref="25">Save line style table</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_SAVE">Saves the current list of line styles, so that you can load it again later.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05200300.xhp b/helpcontent2/source/text/shared/01/05200300.xhp
index 8255f66301..0fbf0b1679 100755
--- a/helpcontent2/source/text/shared/01/05200300.xhp
+++ b/helpcontent2/source/text/shared/01/05200300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05200300.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,23 +48,23 @@
 </section>
 <paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="5">Organize arrow styles</paragraph>
 <paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="6">Lets you organize the current list of arrow styles.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_LINEEND_DEF:EDT_NAME" id="bm_id3152426" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME" id="bm_id3152426" localize="false"/>
 <paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="3" l10n="U" oldref="7">Title</paragraph>
 <paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_LINEEND_DEF:EDT_NAME">Displays the name of the selected arrow style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS" id="bm_id3153578" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS" id="bm_id3153578" localize="false"/>
 <paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Arrow style</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS">Choose a predefined arrow style symbol from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_ADD" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD" id="bm_id3153346" localize="false"/>
 <paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="2" l10n="U" oldref="11">Add</paragraph>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_ADD">To define a custom arrow style, select a drawing object in the document, and then click here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY" id="bm_id3159158" localize="false"/>
 <paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY">Changes the name of the selected arrow style.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD" id="bm_id3148992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD" id="bm_id3148992" localize="false"/>
 <paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="2" l10n="U" oldref="15">Load Arrow Styles</paragraph>
 <paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD">Imports a list of arrow styles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE" id="bm_id3150772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE" id="bm_id3150772" localize="false"/>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="17">Save Arrow Styles</paragraph>
 <paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE">Saves the current list of arrow styles, so that you can load it later.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210000.xhp b/helpcontent2/source/text/shared/01/05210000.xhp
index 23575bc0aa..7100af7ec8 100644
--- a/helpcontent2/source/text/shared/01/05210000.xhp
+++ b/helpcontent2/source/text/shared/01/05210000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05210100.xhp b/helpcontent2/source/text/shared/01/05210100.xhp
index 45a6cdc49c..02f9aeff10 100644
--- a/helpcontent2/source/text/shared/01/05210100.xhp
+++ b/helpcontent2/source/text/shared/01/05210100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210100.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,10 +63,10 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="CHG" oldref="55">List boxes on the <emph>Drawing Object Properties</emph> toolbar:</paragraph>
 <embed href="text/shared/00/00000004.xhp#syflaechenstil"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF" id="bm_id3152552" localize="false"/>
+<!-- removed HID SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF -->
 <paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="5">None</paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF">Does not apply a fill to the selected object. If the object contains a fill, the fill is removed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR" id="bm_id3159234" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR -->
 <paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="8">Color</paragraph>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR">Fills the selected object with the color that you click in the list.</ahelp></paragraph>
 <switch select="appl">
@@ -80,73 +77,73 @@
 <paragraph role="note" id="par_id9695730" xml-lang="en-US" l10n="NEW">To add a color to the list, choose <link href="text/shared/optionen/01010500.xhp" name="Format - Area"><emph>Format - Area</emph></link>, click the <emph>Colors</emph> tab, and then click <emph>Edit</emph>.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT" id="bm_id3153349" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT -->
 <paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="10">Gradient</paragraph>
 <paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT">Fills the selected object with the gradient that you click in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH" id="bm_id3148643" localize="false"/>
+<!-- removed HID SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH -->
 <paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Hatching</paragraph>
 <paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH">Fills the selected object with the hatching pattern that you click in the list. To apply a background color to the hatching pattern, select the <emph>Background color</emph> box, and then click a color in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP" id="bm_id3146848" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP -->
 <paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="14">Bitmap</paragraph>
 <paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP">Fills the selected object with the bitmap pattern that you click in the list. To add a bitmap to the list, open this dialog in %PRODUCTNAME Draw, click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_COLOR" id="bm_id3149244" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_GRADIENT" id="bm_id3145085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHING" id="bm_id3144510" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_BITMAP" id="bm_id3161458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR" id="bm_id3149244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT" id="bm_id3145085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING" id="bm_id3144510" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP" id="bm_id3161458" localize="false"/>
 <paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="3" l10n="U" oldref="16">Area Fill</paragraph>
 <paragraph role="paragraph" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_AREA:LB_BITMAP">Click the fill that you want to apply to the selected object.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="2" l10n="U" oldref="20">Increments (Gradients)</paragraph>
 <paragraph role="paragraph" id="par_id3144423" xml-lang="en-US" l10n="U" oldref="21">Set the number of steps for blending the two end colors of a gradient.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STEPCOUNT" id="bm_id3154923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT" id="bm_id3154923" localize="false"/>
 <paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="22">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STEPCOUNT">Automatically determines the number of steps for blending the two end colors of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT" id="bm_id3153525" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT" id="bm_id3153525" localize="false"/>
 <paragraph role="heading" id="hd_id3154388" xml-lang="en-US" level="3" l10n="U" oldref="24">Increment</paragraph>
 <paragraph role="paragraph" id="par_id3150360" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT">Enter the number of steps for blending the two end colors of the gradient.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="2" l10n="U" oldref="31">Size (Bitmaps)</paragraph>
 <paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="32">Specify the dimensions of the bitmap.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_SCALE" id="bm_id3154153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE" id="bm_id3154153" localize="false"/>
 <paragraph role="heading" id="hd_id3154068" xml-lang="en-US" level="3" l10n="U" oldref="33">Relative</paragraph>
 <paragraph role="paragraph" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_SCALE">Rescales the bitmap relative to the size of the selected object by the percentage values that you enter in the <emph>Width</emph> and <emph>Height</emph> boxes . Clear this checkbox to resize the selected object with the measurements that you enter in the <emph>Width</emph> and <emph>Height</emph> boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_ORIGINAL" id="bm_id3150740" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL" id="bm_id3150740" localize="false"/>
 <paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="35">Original</paragraph>
 <paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_ORIGINAL">Retains the original size of the bitmap when filling the selected object. To resize the bitmap, clear this checkbox, and then click <emph>Relative</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE" id="bm_id3157320" localize="false"/>
 <paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="3" l10n="U" oldref="37">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE">Enter a width for the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE" id="bm_id3150650" localize="false"/>
 <paragraph role="heading" id="hd_id3156281" xml-lang="en-US" level="3" l10n="U" oldref="39">Height</paragraph>
 <paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE">Enter a height for the bitmap.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148673" xml-lang="en-US" level="2" l10n="U" oldref="41">Position (Bitmaps)</paragraph>
 <paragraph role="paragraph" id="par_id3154821" xml-lang="en-US" l10n="U" oldref="42">Click in the position grid to specify the offset for tiling the bitmap.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET" id="bm_id3153367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET" id="bm_id3153367" localize="false"/>
 <paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="43">X Offset</paragraph>
 <paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET">Enter the horizontal offset for tiling the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET" id="bm_id3150439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET" id="bm_id3150439" localize="false"/>
 <paragraph role="heading" id="hd_id3149985" xml-lang="en-US" level="3" l10n="U" oldref="45">Y Offset</paragraph>
 <paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET">Enter the vertical offset for tiling the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_TILE" id="bm_id3147213" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE" id="bm_id3147213" localize="false"/>
 <paragraph role="heading" id="hd_id3156060" xml-lang="en-US" level="3" l10n="U" oldref="27">Tile</paragraph>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_TILE">Tiles the bitmap to fill the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STRETCH" id="bm_id3155746" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH" id="bm_id3155746" localize="false"/>
 <paragraph role="heading" id="hd_id3150334" xml-lang="en-US" level="3" l10n="U" oldref="29">AutoFit</paragraph>
 <paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STRETCH">Stretches the bitmap to fill the selected object. To use this feature, clear the <emph>Tile </emph>box.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148555" xml-lang="en-US" level="2" l10n="U" oldref="47">Offset</paragraph>
 <paragraph role="paragraph" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="48">Specify the offset for tiling the bitmap in terms of rows and columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_ROW" id="bm_id3150012" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW" id="bm_id3150012" localize="false"/>
 <paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="3" l10n="U" oldref="49">Row</paragraph>
 <paragraph role="paragraph" id="par_id3155369" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_ROW">Horizontally offsets the original bitmap relative to the bitmap tiles by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLUMN" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN" id="bm_id3147478" localize="false"/>
 <paragraph role="heading" id="hd_id3144442" xml-lang="en-US" level="3" l10n="U" oldref="51">Column</paragraph>
 <paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLUMN">Vertically offsets the original bitmap relative to the bitmap tiles by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_OFFSET" id="bm_id3156441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET" id="bm_id3156441" localize="false"/>
 <paragraph role="heading" id="hd_id3150684" xml-lang="en-US" level="3" l10n="U" oldref="53">Percent</paragraph>
 <paragraph role="paragraph" id="par_id3155314" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_OFFSET">Enter the percentage to offset the rows or columns.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152887" xml-lang="en-US" level="2" l10n="U" oldref="59">Background Color (Hatching)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_AREA:CB_HATCHBCKGRD" id="bm_id3163713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD" id="bm_id3163713" localize="false"/>
 <paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="61">Background color</paragraph>
 <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_AREA:CB_HATCHBCKGRD">Applies a background color to the hatching pattern. Select this checkbox, and then click a color in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR" id="bm_id3150103" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR" id="bm_id3150103" localize="false"/>
 <paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="63">List of colors</paragraph>
 <paragraph role="paragraph" id="par_id3157309" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR">Click the color that you want to use as a background for the selected hatching pattern.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210200.xhp b/helpcontent2/source/text/shared/01/05210200.xhp
index cf965a771b..957e420b52 100755
--- a/helpcontent2/source/text/shared/01/05210200.xhp
+++ b/helpcontent2/source/text/shared/01/05210200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
   <embed href="text/shared/00/00040502.xhp#farben"/>
 </section>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="Tools - Options - $[officename] - Colors">Tools - Options - $[officename] - Colors</link></paragraph>
+<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010500.xhp" name="$[officename] - Colors">$[officename] - Colors</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05210300.xhp b/helpcontent2/source/text/shared/01/05210300.xhp
index 4db7de5d5f..193cebb906 100755
--- a/helpcontent2/source/text/shared/01/05210300.xhp
+++ b/helpcontent2/source/text/shared/01/05210300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210300.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,61 +32,69 @@
  
 	
 <meta>
-<topic id="textshared0105210300xml" indexer="include">
-<title id="tit" xml-lang="en-US">Gradients</title>
-<filename>/text/shared/01/05210300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="farbverlaeufe">
+      <topic id="textshared0105210300xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Gradients</title>
+         <filename>/text/shared/01/05210300.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="farbverlaeufe">
 <bookmark xml-lang="en-US" branch="hid/HID_AREA_GRADIENT" id="bm_id3149991" localize="false"/>
-<paragraph role="heading" id="hd_id3145356" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05210300.xhp" name="Gradients">Gradients</link></paragraph>
-<paragraph role="paragraph" id="par_id3154812" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_GRADIENT">Set the properties of a gradient, or save and load gradient lists.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00040502.xhp#verlauf"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES" id="bm_id3153089" localize="false"/>
-<paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="3">Type</paragraph>
-<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES">Lists the available gradients. Click the gradient that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X" id="bm_id3154422" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="3" l10n="U" oldref="5">Center X</paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X">Enter the horizontal offset for the gradient, where 0% corresponds to the current horizontal location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y" id="bm_id3152801" localize="false"/>
-<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="3" l10n="U" oldref="7">Center Y</paragraph>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y">Enter the vertical offset for the gradient, where 0% corresponds to the current vertical location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE" id="bm_id3147089" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE">Enter a rotation angle for the selected gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER" id="bm_id3148621" localize="false"/>
-<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="11">Border</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER">Enter the amount by which you want to adjust the area of the endpoint color on the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="35">From</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM" id="bm_id3145383" localize="false"/>
-<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM">Select a color for the beginning point of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM" id="bm_id3163803" localize="false"/>
-<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM">Enter the intensity for the color in the <emph>From </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="36">To</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO" id="bm_id3150085" localize="false"/>
-<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO">Select a color for the endpoint of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO" id="bm_id3153127" localize="false"/>
-<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO">Enter the intensity for the color in the <emph>To </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS" id="bm_id3159116" localize="false"/>
-<paragraph role="heading" id="hd_id3155830" xml-lang="en-US" level="3" l10n="U" oldref="15">Gradients</paragraph>
-<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS">Select the type of gradient that you want to apply or create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD" id="bm_id3155180" localize="false"/>
-<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="17">Add</paragraph>
-<paragraph role="paragraph" id="par_id3145416" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD">Adds a custom gradient to the current list. Specify the properties of your gradient, and then click this button</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY" id="bm_id3153543" localize="false"/>
-<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="3" l10n="U" oldref="19">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY">Applies the current gradient properties to the selected gradient. If you want, you can save the gradient under a different name.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#loeschen"/>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD" id="bm_id3146848" localize="false"/>
-<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="31">Load Gradients List</paragraph>
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD">Load a different list of gradients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE" id="bm_id3145609" localize="false"/>
-<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="2" l10n="U" oldref="33">Save Gradients List</paragraph>
-<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE">Saves the current list of gradients, so that you can load it later.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145356" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05210300.xhp" name="Gradients">Gradients</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154812" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_AREA_GRADIENT">Set the properties of a gradient, or save and load gradient lists.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040502.xhp#verlauf"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES" id="bm_id3153089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148983" role="heading" level="2" l10n="U" oldref="3">Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES">Select the gradient that you want to apply.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X" id="bm_id3154422" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2" l10n="U" oldref="5">Center X</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153114" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X">Enter the horizontal offset for the gradient, where 0% corresponds to the current horizontal location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y" id="bm_id3152801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7">Center Y</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154751" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y">Enter the vertical offset for the gradient, where 0% corresponds to the current vertical location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE" id="bm_id3147089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U" oldref="9">Angle</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE">Enter a rotation angle for the selected gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER" id="bm_id3148621" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149827" role="heading" level="2" l10n="U"
+                 oldref="11">Border</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER">Enter the amount by which you want to adjust the area of the endpoint color on the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152551" role="heading" level="2" l10n="U"
+                 oldref="35">From</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM" id="bm_id3145383" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153527" role="paragraph" l10n="U" oldref="23"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM">Select a color for the beginning point of the gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM" id="bm_id3163803" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM">Enter the intensity for the color in the <emph>From </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149903" role="heading" level="2" l10n="U"
+                 oldref="36">To</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO" id="bm_id3150085" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159269" role="paragraph" l10n="U" oldref="27"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO">Select a color for the endpoint of the gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO" id="bm_id3153127" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO">Enter the intensity for the color in the <emph>To </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS" id="bm_id3159116" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155830" role="heading" level="2" l10n="U"
+                 oldref="15">Gradients</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157909" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS">Select the type of gradient that you want to apply or create.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD" id="bm_id3155180" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150669" role="heading" level="2" l10n="U"
+                 oldref="17">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145416" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD">Adds a custom gradient to the current list. Specify the properties of your gradient, and then click this button</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY" id="bm_id3153543" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150772" role="heading" level="2" l10n="U"
+                 oldref="19">Modify</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY">Applies the current gradient properties to the selected gradient. If you want, you can save the gradient under a different name.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#loeschen"/>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD" id="bm_id3146848" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155341" role="heading" level="2" l10n="U"
+                 oldref="31">Load Gradients List</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD">Load a different list of gradients.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE" id="bm_id3145609" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148943" role="heading" level="2" l10n="U"
+                 oldref="33">Save Gradients List</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3161459" role="paragraph" l10n="U" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE">Saves the current list of gradients, so that you can load it later.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05210400.xhp b/helpcontent2/source/text/shared/01/05210400.xhp
index e8401f946e..ca58813287 100755
--- a/helpcontent2/source/text/shared/01/05210400.xhp
+++ b/helpcontent2/source/text/shared/01/05210400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210400.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,38 +52,38 @@
 </section>
 <paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">Define or modify a hatching pattern.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE" id="bm_id3155392" localize="false"/>
 <paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="3" l10n="U" oldref="5">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE">Enter the amount of space that you want to have between the hatch lines.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE" id="bm_id3154289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE" id="bm_id3154289" localize="false"/>
 <paragraph role="heading" id="hd_id3155355" xml-lang="en-US" level="3" l10n="U" oldref="7">Angle</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE">Enter the rotation angle for the hatch lines, or click a position in the angle grid.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPHATCH_CTRL" id="bm_id3150355" localize="false"/>
 <paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle grid</paragraph>
 <paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPHATCH_CTRL">Click a position in the grid to define the rotation angle for the hatch lines.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_TYPE" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE" id="bm_id3154898" localize="false"/>
 <paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="21">Line type</paragraph>
 <paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_TYPE">Select the type of hatch lines that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_COLOR" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR" id="bm_id3154307" localize="false"/>
 <paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="23">Line color</paragraph>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_COLOR">Select the color of the hatch lines.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159147" xml-lang="en-US" level="2" l10n="U" oldref="11">Hatches List</paragraph>
 <paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="12">Lists the available hatching patterns. You can also modify or create your own hatching pattern. To save the list, click the <emph>Save Hatches List</emph> button. To display a different list, click the <emph>Load Hatches List</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_HATCHINGS" id="bm_id3153699" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS" id="bm_id3153699" localize="false"/>
 <paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="13">Hatches list</paragraph>
 <paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_HATCHINGS">Lists the available hatching patterns. Click the hatching pattern that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_ADD" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD" id="bm_id3155389" localize="false"/>
 <paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="3" l10n="U" oldref="15">Add</paragraph>
 <paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_ADD">Adds a custom hatching pattern to the current list. Specify the properties of your hatching pattern, and then click this button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY" id="bm_id3146848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY" id="bm_id3146848" localize="false"/>
 <paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="17">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY">Applies the current hatching properties to the selected hatching pattern. If you want, you can save the pattern under a different name.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_LOAD" id="bm_id3153896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD" id="bm_id3153896" localize="false"/>
 <paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="2" l10n="U" oldref="25">Load Hatches List</paragraph>
 <paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_LOAD">Loads a different list of hatching patterns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_SAVE" id="bm_id3156435" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE" id="bm_id3156435" localize="false"/>
 <paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="2" l10n="U" oldref="27">Save Hatches List</paragraph>
 <paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_SAVE">Saves the current list of hatching patterns, so that you can load it later.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05210500.xhp b/helpcontent2/source/text/shared/01/05210500.xhp
index ff9361dbaa..ce3cab0747 100755
--- a/helpcontent2/source/text/shared/01/05210500.xhp
+++ b/helpcontent2/source/text/shared/01/05210500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210500.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,30 +56,30 @@
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="4">Use this editor to create a simple, two-color, 8x8 pixel bitmap pattern.</paragraph>
 <paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Grid</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="6">To enable this editor, select the <emph>Blank</emph> bitmap in the bitmap list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_COLOR" id="bm_id3154824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR" id="bm_id3154824" localize="false"/>
 <paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="17">Foreground color</paragraph>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_COLOR">Select a foreground color, and then click in the grid to add a pixel to the pattern.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR" id="bm_id3156347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR" id="bm_id3156347" localize="false"/>
 <paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="19">Background color</paragraph>
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR">Select a background color for your bitmap pattern.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BITMAPS" id="bm_id3159256" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS" id="bm_id3159256" localize="false"/>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="7">Bitmap Pattern</paragraph>
 <paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BITMAPS">Select a bitmap in the list, and then click <emph>OK</emph> to apply the pattern to the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_ADD" id="bm_id3152910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD" id="bm_id3152910" localize="false"/>
 <paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="9">Add</paragraph>
 <paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_ADD">Adds a bitmap that you created in the <emph>Pattern Editor </emph>to the current list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_MODIFY" id="bm_id3148992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY" id="bm_id3148992" localize="false"/>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="11">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_MODIFY">Replaces a bitmap that you created in the <emph>Pattern Editor</emph> with the current bitmap pattern. If you want, you can save the pattern under a different name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT" id="bm_id3152945" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT" id="bm_id3152945" localize="false"/>
 <paragraph role="heading" id="hd_id3149516" xml-lang="en-US" level="2" l10n="U" oldref="13">Import</paragraph>
 <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT">Locate the bitmap that you want to import, and then click <emph>Open</emph>. The bitmap is added to the end of the list of available bitmaps.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_LOAD" id="bm_id3148925" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD" id="bm_id3148925" localize="false"/>
 <paragraph role="heading" id="hd_id3159166" xml-lang="en-US" level="2" l10n="U" oldref="21">Load Bitmap List</paragraph>
 <paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_LOAD">Loads a different list of bitmaps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_SAVE" id="bm_id3161458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE" id="bm_id3161458" localize="false"/>
 <paragraph role="heading" id="hd_id3151246" xml-lang="en-US" level="2" l10n="U" oldref="23">Save Bitmap List</paragraph>
 <paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_SAVE">Saves the current list of bitmaps, so that you can load it later.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05210600.xhp b/helpcontent2/source/text/shared/01/05210600.xhp
index cbc32f0b83..e8aa7cc8e1 100644
--- a/helpcontent2/source/text/shared/01/05210600.xhp
+++ b/helpcontent2/source/text/shared/01/05210600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210600.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,19 +55,19 @@
 </section>
 <paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="4">Set the properties of the shadow that you want to apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW" id="bm_id3166411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW" id="bm_id3166411" localize="false"/>
 <paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="5">Use shadow</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW">Adds a shadow to the selected drawing object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPSHADOW_CTRL" id="bm_id3145315" localize="false"/>
 <paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="3" l10n="U" oldref="7">Position</paragraph>
 <paragraph role="paragraph" id="par_id3146138" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_TPSHADOW_CTRL">Click where you want to cast the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE" id="bm_id3150085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE" id="bm_id3150085" localize="false"/>
 <paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="9">Distance</paragraph>
 <paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE">Enter the distance that you want the shadow to be offset from the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR" id="bm_id3155420" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR" id="bm_id3155420" localize="false"/>
 <paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="11">Color</paragraph>
 <paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR">Select a color for the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT" id="bm_id3155180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT" id="bm_id3155180" localize="false"/>
 <paragraph role="heading" id="hd_id3148992" xml-lang="en-US" level="3" l10n="U" oldref="13">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3148642" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT">Enter a percentage from 0% (opaque) to 100% (transparent) to specify the transparency of the shadow.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210700.xhp b/helpcontent2/source/text/shared/01/05210700.xhp
index a2f4a0a86a..b3270015fd 100755
--- a/helpcontent2/source/text/shared/01/05210700.xhp
+++ b/helpcontent2/source/text/shared/01/05210700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05210700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,37 +52,37 @@
 </section>
 <paragraph role="heading" id="hd_id3152363" xml-lang="en-US" level="2" l10n="U" oldref="30">Transparency mode</paragraph>
 <paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="U" oldref="3">Specify the type of transparency that you want to apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF" id="bm_id3093440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF" id="bm_id3093440" localize="false"/>
 <paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="3" l10n="U" oldref="4">No transparency</paragraph>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF">Turns off color transparency.</ahelp> This is the default setting.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR" id="bm_id3153049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR" id="bm_id3153049" localize="false"/>
 <paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="3" l10n="U" oldref="6">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR">Turns on color transparency. Select this option, and then enter a number in the box, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT" id="bm_id3143267" localize="false"/>
 <paragraph role="heading" id="hd_id3155941" xml-lang="en-US" level="3" l10n="U" oldref="14">Transparency spin button</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT">Adjusts the transparency of the current fill color. Enter a number between 0% (opaque) and 100% (transparent).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT" id="bm_id3149177" localize="false"/>
 <paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="11">Gradient</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT">Applies a transparency gradient to the current fill color. Select this option, and then set the gradient properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES" id="bm_id3109847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES" id="bm_id3109847" localize="false"/>
 <paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="17">Type</paragraph>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES">Select the type of transparency gradient that you want to apply.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X" id="bm_id3154514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X" id="bm_id3154514" localize="false"/>
 <paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="19">Center X</paragraph>
 <paragraph role="paragraph" id="par_id3155583" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X">Enter the horizontal offset for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y" id="bm_id3155628" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y" id="bm_id3155628" localize="false"/>
 <paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="21">Center Y</paragraph>
 <paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y">Enter the vertical offset for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE" id="bm_id3159115" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE" id="bm_id3159115" localize="false"/>
 <paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="23">Angle</paragraph>
 <paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE">Enter a rotation angle for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER" id="bm_id3159147" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER" id="bm_id3159147" localize="false"/>
 <paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="25">Border</paragraph>
 <paragraph role="paragraph" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER">Enter the amount by which you want to adjust the transparent area of the gradient. The default value is 0%.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE" id="bm_id3149763" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE" id="bm_id3149763" localize="false"/>
 <paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="26">Start value</paragraph>
 <paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE">Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE" id="bm_id3159157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE" id="bm_id3159157" localize="false"/>
 <paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="3" l10n="U" oldref="28">End value</paragraph>
 <paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE">Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="9">Preview</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05220000.xhp b/helpcontent2/source/text/shared/01/05220000.xhp
index 5c653382fa..85e54043b8 100644
--- a/helpcontent2/source/text/shared/01/05220000.xhp
+++ b/helpcontent2/source/text/shared/01/05220000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05220000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,74 +29,80 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105220000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Text</title>
-<filename>/text/shared/01/05220000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:00:57">UFI: some changes to fix #i32887#</lastedited>
-</history>
-</meta>
-<body>
-<section id="text">
+      <topic id="textshared0105220000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Text</title>
+         <filename>/text/shared/01/05220000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="text">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146856"><bookmark_value>text; text/draw objects</bookmark_value>
-<bookmark_value>draw objects; text in</bookmark_value>
-<bookmark_value>frames; text fitting to frames</bookmark_value>
+         <bookmark_value>draw objects; text in</bookmark_value>
+         <bookmark_value>frames; text fitting to frames</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_TEXTATTR_DLG" id="bm_id463689" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TextAttributes" id="bm_id3160463" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_TEXTATTR" id="bm_id3153514" localize="false"/>
-<paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05220000.xhp" name="Text">Text</link></paragraph>
-<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_PAGE_TEXTATTR">Sets the layout and anchoring properties for text in the selected drawing or text object.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040502.xhp#text"/>
-</section>
-<paragraph role="paragraph" id="par_id3154794" xml-lang="en-US" l10n="U" oldref="4">The text is positioned relative to the edges of the drawing or text object.</paragraph>
-<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="5">Text</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH" id="bm_id3154230" localize="false"/>
-<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="3" l10n="U" oldref="7">Fit width to text</paragraph>
-<paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH">Expands the width of the object to the width of the text, if the object is smaller than the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT" id="bm_id3146109" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="3" l10n="U" oldref="9">Fit height to text</paragraph>
-<paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT">Expands the height of the object to the height of the text, if the object is smaller than the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE" id="bm_id3150144" localize="false"/>
-<paragraph role="heading" id="hd_id3152867" xml-lang="en-US" level="3" l10n="U" oldref="11">Fit to frame</paragraph>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE">Resizes the text to fit the entire area of the drawing or text object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR" id="bm_id3155942" localize="false"/>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Adjust to contour</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR">Adapts the text flow so that it match the contours of the selected drawing object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_WORDWRAP_TEXT" id="bm_id8065736" localize="false"/>
-<paragraph role="heading" id="par_idN10705" xml-lang="en-US" level="3" l10n="NEW">Word wrap text in shape</paragraph>
-<paragraph role="paragraph" id="par_idN10709" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Wraps the text that you add after double-clicking a custom shape to fit inside the shape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_SIZE" id="bm_id8341929" localize="false"/>
-<paragraph role="heading" id="par_idN10720" xml-lang="en-US" level="3" l10n="NEW">Resize shape to fit text</paragraph>
-<paragraph role="paragraph" id="par_idN10724" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resizes a custom shape to fit the text that you enter after double-clicking the shape.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Spacing to borders</paragraph>
-<paragraph role="paragraph" id="par_id3151265" xml-lang="en-US" l10n="U" oldref="14">Specify the amount of space to leave between the edges of the drawing or text object and the borders of the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT" id="bm_id3149812" localize="false"/>
-<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="15">Left</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT">Enter the amount of space to leave between the left edge of the drawing or text object and the left border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT" id="bm_id3143271" localize="false"/>
-<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="3" l10n="U" oldref="17">Right</paragraph>
-<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT">Enter the amount of space to leave between the right edge of the drawing or text object and the right border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP" id="bm_id3145227" localize="false"/>
-<paragraph role="heading" id="hd_id3148926" xml-lang="en-US" level="3" l10n="U" oldref="19">Top</paragraph>
-<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP">Enter the amount of space to leave between the top edge of the drawing or text object and the upper border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM" id="bm_id3150130" localize="false"/>
-<paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="21">Bottom</paragraph>
-<paragraph role="paragraph" id="par_id3159342" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM">Enter the amount of space to leave between the bottom edge of the drawing or text object and the lower border of the text.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149192" xml-lang="en-US" level="2" l10n="U" oldref="23">Text anchor</paragraph>
-<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="24">Set the anchor type and the anchor position.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146856" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05220000.xhp" name="Text">Text</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150279" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_PAGE_TEXTATTR">Sets the layout and anchoring properties for text in the selected drawing or text object.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040502.xhp#text"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3154794" role="paragraph" l10n="U" oldref="4">The text is positioned relative to the edges of the drawing or text object.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149031" role="heading" level="2" l10n="U" oldref="5">Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH" id="bm_id3154230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="3" l10n="U" oldref="7">Fit width to text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145629" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH">Expands the width of the object to the width of the text, if the object is smaller than the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT" id="bm_id3146109" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="3" l10n="U" oldref="9">Fit height to text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149640" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT">Expands the height of the object to the height of the text, if the object is smaller than the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE" id="bm_id3150144" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152867" role="heading" level="3" l10n="U"
+                 oldref="11">Fit to frame</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE">Resizes the text to fit the entire area of the drawing or text object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR" id="bm_id3155942" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="3" l10n="CHG"
+                 oldref="29">Adjust to contour</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153577" role="paragraph" l10n="U" oldref="30"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR">Adapts the text flow so that it matches the contours of the selected drawing object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT" id="bm_id8065736" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10705" role="heading" level="3" l10n="NEW">Word wrap text in shape</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10709" role="paragraph" l10n="NEW"><ahelp hid=".">Wraps the text that you add after double-clicking a custom shape to fit inside the shape.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE" id="bm_id8341929" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10720" role="heading" level="3" l10n="NEW">Resize shape to fit text</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10724" role="paragraph" l10n="NEW"><ahelp hid=".">Resizes a custom shape to fit the text that you enter after double-clicking the shape.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154288" role="heading" level="2" l10n="CHG"
+                 oldref="13">Spacing to borders</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151265" role="paragraph" l10n="U" oldref="14">Specify the amount of space to leave between the edges of the drawing or text object and the borders of the text.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT" id="bm_id3149812" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150443" role="heading" level="3" l10n="U"
+                 oldref="15">Left</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT">Enter the amount of space to leave between the left edge of the drawing or text object and the left border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT" id="bm_id3143271" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155419" role="heading" level="3" l10n="U"
+                 oldref="17">Right</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155388" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT">Enter the amount of space to leave between the right edge of the drawing or text object and the right border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP" id="bm_id3145227" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148926" role="heading" level="3" l10n="U"
+                 oldref="19">Top</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157808" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP">Enter the amount of space to leave between the top edge of the drawing or text object and the upper border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM" id="bm_id3150130" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149237" role="heading" level="3" l10n="U"
+                 oldref="21">Bottom</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159342" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM">Enter the amount of space to leave between the bottom edge of the drawing or text object and the lower border of the text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149192" role="heading" level="2" l10n="U"
+                 oldref="23">Text anchor</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph" l10n="U" oldref="24">Set the anchor type and the anchor position.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TEXTATTR_CTL_POSITION" id="bm_id3149955" localize="false"/>
-<paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="25">Graphic field</paragraph>
-<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_TEXTATTR_CTL_POSITION">Click where you want to place the anchor for the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/>
-<paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="27">Full width</paragraph>
-<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154381" role="heading" level="3" l10n="U"
+                 oldref="25">Graphic field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155504" role="paragraph" l10n="U" oldref="26"><ahelp hid="HID_TEXTATTR_CTL_POSITION">Click where you want to place the anchor for the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155323" role="heading" level="3" l10n="U"
+                 oldref="27">Full width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05230000.xhp b/helpcontent2/source/text/shared/01/05230000.xhp
index cd68112345..dd8dce0fa6 100644
--- a/helpcontent2/source/text/shared/01/05230000.xhp
+++ b/helpcontent2/source/text/shared/01/05230000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05230000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05230100.xhp b/helpcontent2/source/text/shared/01/05230100.xhp
index f9864906d0..d7d0f270cf 100755
--- a/helpcontent2/source/text/shared/01/05230100.xhp
+++ b/helpcontent2/source/text/shared/01/05230100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05230100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,10 +58,10 @@
 </section>
 <paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
 <paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="4">Specify the location of the selected object on the page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_X" id="bm_id3154184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X" id="bm_id3154184" localize="false"/>
 <paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="3" l10n="U" oldref="5">Position X</paragraph>
 <paragraph role="paragraph" id="par_id3155616" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_X">Enter the horizontal distance that you want to move the object relative to the base point selected in the grid.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_Y" id="bm_id3155805" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y" id="bm_id3155805" localize="false"/>
 <paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="7">Position Y</paragraph>
 <paragraph role="paragraph" id="par_id3147373" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_Y">Enter the vertical distance that you want to move the object relative to the base point selected in the grid.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPPOSITION_CTRL" id="bm_id3155338" localize="false"/>
@@ -72,45 +69,45 @@
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPPOSITION_CTRL">Click a base point in the grid, and then enter the amount that you want to shift the object relative to the base point that you selected in the <emph>Position Y</emph> and <emph>Position X</emph> boxes. The base points correspond to the selection handles on an object.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="2" l10n="U" oldref="19">Size</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="20">Specify the amount by which you want to resize the selected object with respect to the selected base point .</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_WIDTH" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH" id="bm_id3150693" localize="false"/>
 <paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="21">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_WIDTH">Enter a width for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_HEIGHT" id="bm_id3166410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT" id="bm_id3166410" localize="false"/>
 <paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="23">Height</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_HEIGHT">Enter a height for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE" id="bm_id3156327" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE" id="bm_id3156327" localize="false"/>
 <paragraph role="heading" id="hd_id3149796" xml-lang="en-US" level="3" l10n="U" oldref="25">Keep ratio</paragraph>
 <paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE">Maintains proportions when you resize the selected object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPSIZE_CTRL" id="bm_id3153665" localize="false"/>
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="3" l10n="U" oldref="29">Base point</paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_TPSIZE_CTRL">Click a base point in the grid, and then enter the new size dimensions for the selected object in the <emph>Width</emph> and <emph>Height</emph> boxes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148990" xml-lang="en-US" level="2" l10n="U" oldref="17">Protect</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT" id="bm_id3153717" localize="false"/>
 <paragraph role="heading" id="hd_id3153698" xml-lang="en-US" level="3" l10n="U" oldref="37">Position</paragraph>
 <paragraph role="paragraph" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT">Prevents changes to the position or the size of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT" id="bm_id3155434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT" id="bm_id3155434" localize="false"/>
 <paragraph role="heading" id="hd_id3153254" xml-lang="en-US" level="3" l10n="U" oldref="27">Size</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT">Prevents you from resizing the object.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149275" xml-lang="en-US" level="2" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="WRITER">Anchoring 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">Set the anchoring options for the selected object. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR" id="bm_id3147303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR" id="bm_id3147303" localize="false"/>
 <paragraph role="heading" id="hd_id3151246" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Anchor 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR"><switchinline select="appl"><caseinline select="WRITER">Select the type of anchor for the selected object. 
 </caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT" id="bm_id3156434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT" id="bm_id3156434" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">Position 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT"><switchinline select="appl"><caseinline select="WRITER">Specifies the position of the anchor in relation to the character height. 
 </caseinline></switchinline></ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="2" l10n="U" oldref="31">Adapt</paragraph>
 <paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="32">Resizes text in a drawing object with respect to the borders of the selected object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH" id="bm_id3150290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH" id="bm_id3150290" localize="false"/>
 <paragraph role="heading" id="hd_id3151042" xml-lang="en-US" level="3" l10n="U" oldref="33">Fit width to text</paragraph>
 <paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH">Resizes the text to fit the width of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT" id="bm_id3154909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT" id="bm_id3154909" localize="false"/>
 <paragraph role="heading" id="hd_id3145746" xml-lang="en-US" level="3" l10n="U" oldref="35">Fit height to text</paragraph>
 <paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT">Resizes the text to fit the height of the selected object.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05230300.xhp b/helpcontent2/source/text/shared/01/05230300.xhp
index 0406863806..9e0ed30ba3 100644
--- a/helpcontent2/source/text/shared/01/05230300.xhp
+++ b/helpcontent2/source/text/shared/01/05230300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05230300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,10 +51,10 @@
 <paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="U" oldref="4">The selected object is rotated around a pivot point that you specify. The default pivot point is at the center of the object.</paragraph>
 <paragraph role="note" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="17">If you set a pivot point too far outside of the object boundaries, the object could be rotated off of the page.</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X" id="bm_id3109848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X" id="bm_id3109848" localize="false"/>
 <paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="5">X Position</paragraph>
 <paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X">Enter the horizontal distance from the left edge of the page to the pivot point.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y" id="bm_id3159158" localize="false"/>
 <paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="7">Y Position</paragraph>
 <paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y">Enter the vertical distance from the top edge of the page to the pivot point.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPROTATION_CTRL1" id="bm_id3148491" localize="false"/>
@@ -65,7 +62,7 @@
 <paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPROTATION_CTRL1">Click where you want to place the pivot point.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146847" xml-lang="en-US" level="2" l10n="U" oldref="11">Rotation angle</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="12">Specify the number of degrees that you want to rotate the selected object, or click in the rotation grid.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE" id="bm_id3149785" localize="false"/>
 <paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="3" l10n="U" oldref="13">Angle</paragraph>
 <paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE">Enter the number of degrees that you want to rotate the selected object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPROTATION_CTRL2" id="bm_id3154380" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05230400.xhp b/helpcontent2/source/text/shared/01/05230400.xhp
index 4bf3fab054..2beb827703 100755
--- a/helpcontent2/source/text/shared/01/05230400.xhp
+++ b/helpcontent2/source/text/shared/01/05230400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05230400.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,12 +55,12 @@
 </section>
 <paragraph role="heading" id="hd_id3154497" xml-lang="en-US" level="2" l10n="U" oldref="3">Corner Radius</paragraph>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="4">You can only round the corners of a rectangular object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS" id="bm_id3156042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS" id="bm_id3156042" localize="false"/>
 <paragraph role="heading" id="hd_id3153935" xml-lang="en-US" level="3" l10n="U" oldref="5">Radius</paragraph>
 <paragraph role="paragraph" id="par_id3147373" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS">Enter the radius of the circle that you want to use to round the corners.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="7">Slant</paragraph>
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="8">Slants the selected object along an axis that you specify.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE" id="bm_id3154318" localize="false"/>
 <paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle</paragraph>
 <paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE">Enter the angle of the slant axis.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05230500.xhp b/helpcontent2/source/text/shared/01/05230500.xhp
index 4a817f60ac..571d82c9bf 100644
--- a/helpcontent2/source/text/shared/01/05230500.xhp
+++ b/helpcontent2/source/text/shared/01/05230500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05230500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,23 +59,23 @@
 <paragraph role="note" id="par_id368358" xml-lang="en-US" l10n="NEW">These callouts are a legacy of the first versions of %PRODUCTNAME. You must customize a toolbar or menu to insert these callouts. The newer custom shape callouts offer more features, for example a Callouts toolbar 
 <image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image> where you can select the shape.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_WINKEL" id="bm_id3153551" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL" id="bm_id3153551" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_CAPTION_CTL_TYPE" id="bm_id3149999" localize="false"/>
 <paragraph role="heading" id="hd_id3151330" xml-lang="en-US" level="2" l10n="U" oldref="3">Callout Styles</paragraph>
 <paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_CAPTION_CTL_TYPE">Click the <emph>Callout</emph> style that you want to apply to the selected callout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND" id="bm_id3152425" localize="false"/>
 <paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="2" l10n="U" oldref="5">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND">Enter the amount of space that you want to leave between the end of the callout line, and the callout box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ" id="bm_id3147043" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ANSATZ" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL" id="bm_id3153527" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ" id="bm_id3147043" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ" id="bm_id3153394" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL" id="bm_id3153527" localize="false"/>
 <paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="7">Extension</paragraph>
 <paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL">Select where you want to extend the callout line from, in relation to the callout box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE" id="bm_id3146958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE" id="bm_id3146958" localize="false"/>
 <paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2" l10n="U" oldref="9">Length</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE">Enter the length of the callout line segment that extends from the callout box to the inflection point of the line.</ahelp></paragraph>
 <paragraph role="note" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="11">The <emph>Length </emph>box is only available if you select the <emph>Angled connector line</emph> callout style, and leave the <emph>Optimal </emph>checkbox cleared.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE" id="bm_id3153332" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE" id="bm_id3153332" localize="false"/>
 <paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="2" l10n="U" oldref="12">Optimal</paragraph>
 <paragraph role="paragraph" id="par_id3147210" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE">Click here to display a single-angled line in an optimal way.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05240000.xhp b/helpcontent2/source/text/shared/01/05240000.xhp
index 09418257f4..004887e564 100755
--- a/helpcontent2/source/text/shared/01/05240000.xhp
+++ b/helpcontent2/source/text/shared/01/05240000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05240000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05240100.xhp b/helpcontent2/source/text/shared/01/05240100.xhp
index 922d923565..75c8c82689 100644
--- a/helpcontent2/source/text/shared/01/05240100.xhp
+++ b/helpcontent2/source/text/shared/01/05240100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05240100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05240200.xhp b/helpcontent2/source/text/shared/01/05240200.xhp
index e36ef0b426..c942837ef2 100644
--- a/helpcontent2/source/text/shared/01/05240200.xhp
+++ b/helpcontent2/source/text/shared/01/05240200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05240200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250000.xhp b/helpcontent2/source/text/shared/01/05250000.xhp
index 7ddaebbf37..5a3d1ad0ef 100644
--- a/helpcontent2/source/text/shared/01/05250000.xhp
+++ b/helpcontent2/source/text/shared/01/05250000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250000.xhp,v $
- * $Revision: 1.14.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250100.xhp b/helpcontent2/source/text/shared/01/05250100.xhp
index 59f4307a90..1c47f86ede 100644
--- a/helpcontent2/source/text/shared/01/05250100.xhp
+++ b/helpcontent2/source/text/shared/01/05250100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250200.xhp b/helpcontent2/source/text/shared/01/05250200.xhp
index 0afbc37a22..b3647305de 100644
--- a/helpcontent2/source/text/shared/01/05250200.xhp
+++ b/helpcontent2/source/text/shared/01/05250200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250200.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250300.xhp b/helpcontent2/source/text/shared/01/05250300.xhp
index 5b047c24b5..02fe555c4e 100644
--- a/helpcontent2/source/text/shared/01/05250300.xhp
+++ b/helpcontent2/source/text/shared/01/05250300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250300.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250400.xhp b/helpcontent2/source/text/shared/01/05250400.xhp
index 53346b830f..523ad0a6fe 100644
--- a/helpcontent2/source/text/shared/01/05250400.xhp
+++ b/helpcontent2/source/text/shared/01/05250400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250500.xhp b/helpcontent2/source/text/shared/01/05250500.xhp
index 93adb88a0f..42753d4e5e 100644
--- a/helpcontent2/source/text/shared/01/05250500.xhp
+++ b/helpcontent2/source/text/shared/01/05250500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250500.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250600.xhp b/helpcontent2/source/text/shared/01/05250600.xhp
index ab7f9d1d8e..e36801fd18 100644
--- a/helpcontent2/source/text/shared/01/05250600.xhp
+++ b/helpcontent2/source/text/shared/01/05250600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250600.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260000.xhp b/helpcontent2/source/text/shared/01/05260000.xhp
index b8ac5f557c..c645d02155 100644
--- a/helpcontent2/source/text/shared/01/05260000.xhp
+++ b/helpcontent2/source/text/shared/01/05260000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260100.xhp b/helpcontent2/source/text/shared/01/05260100.xhp
index 153fe8a358..a60ec64928 100644
--- a/helpcontent2/source/text/shared/01/05260100.xhp
+++ b/helpcontent2/source/text/shared/01/05260100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260100.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260200.xhp b/helpcontent2/source/text/shared/01/05260200.xhp
index 41d868ce68..03f9a9fbf2 100644
--- a/helpcontent2/source/text/shared/01/05260200.xhp
+++ b/helpcontent2/source/text/shared/01/05260200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260300.xhp b/helpcontent2/source/text/shared/01/05260300.xhp
index dc6e8953ac..e6fc4bd8d5 100644
--- a/helpcontent2/source/text/shared/01/05260300.xhp
+++ b/helpcontent2/source/text/shared/01/05260300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260300.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260400.xhp b/helpcontent2/source/text/shared/01/05260400.xhp
index 295f7a8f23..f4c93e7be4 100644
--- a/helpcontent2/source/text/shared/01/05260400.xhp
+++ b/helpcontent2/source/text/shared/01/05260400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260500.xhp b/helpcontent2/source/text/shared/01/05260500.xhp
index 1517d5a868..df4e4b878d 100644
--- a/helpcontent2/source/text/shared/01/05260500.xhp
+++ b/helpcontent2/source/text/shared/01/05260500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260600.xhp b/helpcontent2/source/text/shared/01/05260600.xhp
index 09df8c907c..69cd76f7a1 100644
--- a/helpcontent2/source/text/shared/01/05260600.xhp
+++ b/helpcontent2/source/text/shared/01/05260600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05260600.xhp,v $
- * $Revision: 1.6.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05270000.xhp b/helpcontent2/source/text/shared/01/05270000.xhp
index 540c9e29c9..183f7aaac4 100644
--- a/helpcontent2/source/text/shared/01/05270000.xhp
+++ b/helpcontent2/source/text/shared/01/05270000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05270000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05280000.xhp b/helpcontent2/source/text/shared/01/05280000.xhp
index 9c3d9b361e..ebf48f9388 100644
--- a/helpcontent2/source/text/shared/01/05280000.xhp
+++ b/helpcontent2/source/text/shared/01/05280000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05280000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@ UFI: exclude from indexing</lastedited>
 <section id="fontwork">
 <bookmark xml-lang="en-US" branch="hid/SID_FONTWORK" id="bm_id8473091" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontWork" id="bm_id3155620" localize="false"/>
-<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></paragraph>
+<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><variable id="fntwrk"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></variable></paragraph>
 <paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid=".uno:FontWork">Edits Fontwork effects of the selected object that has been created with the previous Fontwork dialog.</ahelp><comment>UFI: this old dialog is still available to edit old docs containing old Fontwork objects. See "Fontwork_ui" spec doc.</comment></paragraph>
 <paragraph role="note" id="par_id3155934" xml-lang="en-US" l10n="CHG" oldref="53">This <emph>Fontwork</emph> dialog is only available for Fontwork in old Writer text documents that were created prior to %PRODUCTNAME %PRODUCTVERSION. You must first call <emph>Tools - Customize</emph> to add a menu command or an icon to open this dialog.<comment>UFI: the command is in Customize dialog at Format-Fontwork</comment></paragraph>
 </section>
@@ -208,7 +205,7 @@ UFI: exclude from indexing</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE" id="bm_id3155600" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE" id="bm_id3155600" localize="false"/>
 <paragraph role="paragraph" id="par_id3157844" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE">Enter the amount of space that you want to leave between the text baseline and the base of the individual characters.</ahelp></paragraph>
 <table id="tbl_id3156180">
 <tablerow>
@@ -223,7 +220,7 @@ UFI: exclude from indexing</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART" id="bm_id3148496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART" id="bm_id3148496" localize="false"/>
 <paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART">Enter the amount of space to leave between the beginning of the text baseline, and the beginning of the text.</ahelp></paragraph>
 <table id="tbl_id3156322">
 <tablerow>
@@ -313,7 +310,7 @@ UFI: exclude from indexing</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X" id="bm_id3150980" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X" id="bm_id3150980" localize="false"/>
 <paragraph role="heading" id="hd_id3156537" xml-lang="en-US" level="3" l10n="U" oldref="45">Horizontal Distance</paragraph>
 <paragraph role="paragraph" id="par_id3151049" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X">Enter the horizontal distance between the text characters and the edge of the shadow.</ahelp></paragraph>
 <table id="tbl_id3145764">
@@ -329,7 +326,7 @@ UFI: exclude from indexing</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y" id="bm_id3148873" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y" id="bm_id3148873" localize="false"/>
 <paragraph role="heading" id="hd_id3149450" xml-lang="en-US" level="3" l10n="U" oldref="47">Vertical Distance</paragraph>
 <paragraph role="paragraph" id="par_id3153704" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y">Enter the vertical distance between the text characters and the edge of the shadow.</ahelp></paragraph>
 <table id="tbl_id3149966">
@@ -345,7 +342,7 @@ UFI: exclude from indexing</lastedited>
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR" id="bm_id3155111" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR" id="bm_id3155111" localize="false"/>
 <paragraph role="heading" id="hd_id3149209" xml-lang="en-US" level="3" l10n="U" oldref="49">Shadow Color</paragraph>
 <paragraph role="paragraph" id="par_id3148681" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR">Select a color for the text shadow.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05290000.xhp b/helpcontent2/source/text/shared/01/05290000.xhp
index 48e221403f..89f235e2dd 100755
--- a/helpcontent2/source/text/shared/01/05290000.xhp
+++ b/helpcontent2/source/text/shared/01/05290000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05290000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05290100.xhp b/helpcontent2/source/text/shared/01/05290100.xhp
index a13e59e31f..8120205622 100644
--- a/helpcontent2/source/text/shared/01/05290100.xhp
+++ b/helpcontent2/source/text/shared/01/05290100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05290100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 <body>
   
   
-  <bookmark branch="hid/FN_TOOL_GROUP" xml-lang="en-US" id="bm_id3149987"/><bookmark xml-lang="en-US" branch="hid/SID_GROUP" id="bm_id9823810" localize="false"/><!-- HID added by script -->
+  <!-- removed HID FN_TOOL_GROUP --><bookmark xml-lang="en-US" branch="hid/SID_GROUP" id="bm_id9823810" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:FormatGroup" xml-lang="en-US" id="bm_id3150502"/><paragraph id="hd_id3152823" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/05290100.xhp" name="Group">Group</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154689" xml-lang="en-US" oldref="2"><variable id="gruppierentext"><ahelp hid=".uno:FormatGroup" visibility="visible">Groups the selected objects, so that they can be moved as a single object.</ahelp></variable></paragraph>
   <section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05290200.xhp b/helpcontent2/source/text/shared/01/05290200.xhp
index f21307882d..5fd4ee33d5 100644
--- a/helpcontent2/source/text/shared/01/05290200.xhp
+++ b/helpcontent2/source/text/shared/01/05290200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05290200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 <body>
   
   
-  <bookmark branch="hid/FN_TOOL_UNGROUP" xml-lang="en-US" id="bm_id3152952"/><bookmark xml-lang="en-US" branch="hid/SID_UNGROUP" id="bm_id2549758" localize="false"/><!-- HID added by script -->
+  <!-- removed HID FN_TOOL_UNGROUP --><bookmark xml-lang="en-US" branch="hid/SID_UNGROUP" id="bm_id2549758" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:FormatUngroup" xml-lang="en-US" id="bm_id3155577"/><paragraph id="hd_id3159217" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/05290200.xhp" name="Ungroup">Ungroup</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3156116" xml-lang="en-US" oldref="2"><variable id="aufhebentext"><ahelp hid=".uno:FormatUngroup" visibility="visible">Breaks apart the selected group into individual objects.</ahelp></variable></paragraph>
   <section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05290300.xhp b/helpcontent2/source/text/shared/01/05290300.xhp
index 2fd1ae72fa..fe40555c91 100644
--- a/helpcontent2/source/text/shared/01/05290300.xhp
+++ b/helpcontent2/source/text/shared/01/05290300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05290300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05290400.xhp b/helpcontent2/source/text/shared/01/05290400.xhp
index 87005edffc..8c1da71715 100644
--- a/helpcontent2/source/text/shared/01/05290400.xhp
+++ b/helpcontent2/source/text/shared/01/05290400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05290400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05320000.xhp b/helpcontent2/source/text/shared/01/05320000.xhp
index 5fa5f2a754..73b90bef08 100644
--- a/helpcontent2/source/text/shared/01/05320000.xhp
+++ b/helpcontent2/source/text/shared/01/05320000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05320000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="lauftext">
-<bookmark xml-lang="en-US" branch="hid/SVX:TABPAGE:RID_SVXPAGE_TEXTANIMATION" id="bm_id3147477" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05320000.xhp" name="Text Animation">Text Animation</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TabPage:RID_SVXPAGE_TEXTANIMATION" id="bm_id3147477" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05320000.xhp" name="Text Animation">Text Animation</link></paragraph>
 <paragraph role="paragraph" id="par_id3154788" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:TABPAGE:RID_SVXPAGE_TEXTANIMATION">Adds an animation effect to the text in the selected drawing object.</ahelp></paragraph>
 </section>
 <section id="howtoget">
@@ -52,9 +49,9 @@
 </section>
 <paragraph role="heading" id="hd_id3152821" xml-lang="en-US" level="2" l10n="U" oldref="4">Text animation effects</paragraph>
 <paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="15">Select the effect that you want to apply, and then set the properties of the effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="3" l10n="U" oldref="5">Effects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="3" l10n="U" oldref="5">Effects</paragraph>
 <paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT">Select the animation effect that you want to apply to the text in the selected drawing object. To remove an animation effect, select <emph>No Effect</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT" id="bm_id3152801" localize="false"/><paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="3" l10n="U" oldref="6">To the Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT" id="bm_id3152801" localize="false"/><paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="3" l10n="U" oldref="6">To the Left</paragraph>
 <paragraph role="paragraph" id="par_id3152867" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT">Scrolls text from right to left.</ahelp></paragraph>
 <table id="tbl_id3147291">
 <tablerow>
@@ -68,7 +65,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT" id="bm_id3145072" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="20">To the Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT" id="bm_id3145072" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="20">To the Right</paragraph>
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT">Scrolls text from left to right.</ahelp></paragraph>
 <table id="tbl_id3163802">
 <tablerow>
@@ -82,7 +79,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_UP" id="bm_id3146138" localize="false"/><paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="23">To the Top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP" id="bm_id3146138" localize="false"/><paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="23">To the Top</paragraph>
 <paragraph role="paragraph" id="par_id3145416" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_UP">Scrolls text from bottom to top.</ahelp></paragraph>
 <table id="tbl_id3147573">
 <tablerow>
@@ -96,7 +93,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN" id="bm_id3150944" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="26">To the Bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN" id="bm_id3150944" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="26">To the Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN">Scrolls text from top to bottom.</ahelp></paragraph>
 <table id="tbl_id3155583">
 <tablerow>
@@ -111,27 +108,27 @@
 </tablerow>
 </table>
 <paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="2" l10n="U" oldref="45">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="7">Start Inside</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="7">Start Inside</paragraph>
 <paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE">Text is visible and inside the drawing object when the effect is applied.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE" id="bm_id3151108" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Text visible when exiting<comment>i60202</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE" id="bm_id3151108" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Text visible when exiting<comment>i60202</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE">Text remains visible after the effect is applied.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155738" xml-lang="en-US" level="2" l10n="U" oldref="9">Animation effects</paragraph>
 <paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="33">Set the looping options for the animation effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS" id="bm_id3144434" localize="false"/><paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="10">Continuous</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS" id="bm_id3144434" localize="false"/><paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="10">Continuous</paragraph>
 <paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS">Plays the animation effect continuously. To specify the number of times to play the effect, clear this checkbox, and enter a number in the <emph>Continuous</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT" id="bm_id3154821" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="39">Continuous box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT" id="bm_id3154821" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="39">Continuous box</paragraph>
 <paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT">Enter the number of times that you want the animation effect to repeat.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="13">Increment</paragraph>
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="37">Specify the increment value for scrolling the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL" id="bm_id3152803" localize="false"/><paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="3" l10n="U" oldref="14">Pixels</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL" id="bm_id3152803" localize="false"/><paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="3" l10n="U" oldref="14">Pixels</paragraph>
 <paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL">Measures increment value in pixels.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT" id="bm_id3152936" localize="false"/><paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="43">Increment box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT" id="bm_id3152936" localize="false"/><paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="43">Increment box</paragraph>
 <paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT">Enter the number of increments by which to scroll the text.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="11">Delay</paragraph>
 <paragraph role="paragraph" id="par_id3148560" xml-lang="en-US" l10n="U" oldref="35">Specify the amount time to wait before repeating the effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO" id="bm_id3147352" localize="false"/><paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO" id="bm_id3147352" localize="false"/><paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO">$[officename] automatically determines the amount of time to wait before repeating the effect. To manually assign the delay period, clear this checkbox, and then enter a value in the<emph> Automatic</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY" id="bm_id3153952" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="41">Automatic box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY" id="bm_id3153952" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="41">Automatic box</paragraph>
 <paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY">Enter the amount of time to wait before repeating the effect.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340100.xhp b/helpcontent2/source/text/shared/01/05340100.xhp
index 4049929f3e..49b3dd622d 100644
--- a/helpcontent2/source/text/shared/01/05340100.xhp
+++ b/helpcontent2/source/text/shared/01/05340100.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,36 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row Height</title>
-<filename>/text/shared/01/05340100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:09:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/><!-- HID added by script -->
+      <topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Row Height</title>
+         <filename>/text/shared/01/05340100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RowHeight" id="bm_id3150146" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ROWHEIGHT" id="bm_id3149987" localize="false"/>
-<paragraph role="heading" id="hd_id3154400" xml-lang="en-US" level="1" l10n="U" oldref="1">Row Height</paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="2">
-<variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154400" role="heading" level="1" l10n="U" oldref="1">Row Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="U" oldref="2"><variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl">
-<caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
+      <paragraph xml-lang="en-US" id="par_id3150756" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider. 
 </caseinline></switchinline></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SC_METRICFIELD_RID_SCDLG_ROW_MAN_ED_VALUE" id="bm_id3146946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE" id="bm_id3083278" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
-<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_ROW_MAN_BTN_DEFVAL" id="bm_id3154840" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD" id="bm_id3150445" localize="false"/>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="5"><switchinline select="appl">
-<caseinline select="CALC">Default value
-</caseinline><defaultinline>Automatic</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Automatically adjusts the row height based on the current font.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCDLG_ROW_MAN:ED_VALUE" id="bm_id3146946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE" id="bm_id3083278" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149962" role="heading" level="2" l10n="U" oldref="3">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144750" role="paragraph" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL" id="bm_id3154840" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD" id="bm_id3150445" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="2" l10n="CHG"
+                 oldref="5">Default value</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Adjusts the row height to the size based on the default template. Existing contents may be shown vertically cropped. The height no longer increases automatically when you enter larger contents.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05340200.xhp b/helpcontent2/source/text/shared/01/05340200.xhp
index 2e9896040a..cffac33e67 100644
--- a/helpcontent2/source/text/shared/01/05340200.xhp
+++ b/helpcontent2/source/text/shared/01/05340200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
   <embed href="text/shared/00/00040503.xhp#fosb"/>
 </section>
   <paragraph l10n="U" role="paragraph" id="par_id3152821" xml-lang="en-US" oldref="7">You can also change the width of a column by dragging the divider beside the column header.<switchinline select="appl"> <caseinline select="CALC"> To fit the column width to the cell contents, double-click the divider.</caseinline> </switchinline></paragraph>
-  <bookmark branch="hid/SC:METRICFIELD:RID_SCDLG_COL_MAN:ED_VALUE" xml-lang="en-US" id="bm_id3154984"/><bookmark branch="hid/DBACCESS_METRICFIELD_DLG_COLWIDTH_MF_VALUE" xml-lang="en-US" id="bm_id3153346"/><paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="3">Width</paragraph>
+  <bookmark branch="hid/sc:MetricField:RID_SCDLG_COL_MAN:ED_VALUE" xml-lang="en-US" id="bm_id3154984"/><bookmark branch="hid/dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE" xml-lang="en-US" id="bm_id3153346"/><paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="3">Width</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147576" xml-lang="en-US" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_COLWIDTH_MF_VALUE" visibility="visible">Enter the column width that you want to use.</ahelp></paragraph>
-  <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_COL_MAN:BTN_DEFVAL" xml-lang="en-US" id="bm_id3155392"/><bookmark branch="hid/DBACCESS_CHECKBOX_DLG_COLWIDTH_CB_STANDARD" xml-lang="en-US" id="bm_id3157959"/><paragraph id="hd_id3148621" role="heading" level="2" oldref="5" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="CALC">Default value</caseinline> <defaultinline>Automatic</defaultinline> </switchinline></paragraph>
+  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_COL_MAN:BTN_DEFVAL" xml-lang="en-US" id="bm_id3155392"/><bookmark branch="hid/dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD" xml-lang="en-US" id="bm_id3157959"/><paragraph id="hd_id3148621" role="heading" level="2" oldref="5" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="CALC">Default value</caseinline> <defaultinline>Automatic</defaultinline> </switchinline></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147008" xml-lang="en-US" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_COLWIDTH_CB_STANDARD" visibility="visible">Automatically adjusts the column width based on the current font.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index d5988cb0a3..1e2980f14c 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340300.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00040503.xhp#fozelaus"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN" id="bm_id3152821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
 <paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="54">Horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
@@ -80,10 +77,10 @@
 <embed href="text/shared/00/00040502.xhp#syblocksatz"/>
 <paragraph role="heading" id="par_idN1079C" xml-lang="en-US" level="3" l10n="NEW">Filled</paragraph>
 <paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="3" l10n="U" oldref="41">Indent</paragraph>
 <paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN" id="bm_id3153332" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
 <paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="66">Vertical</paragraph>
 <paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
@@ -116,7 +113,7 @@
 </switch>
 <bookmark xml-lang="en-US" branch="hid/HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
 <paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES" id="bm_id3155742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
 <paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="U" oldref="45">Angle</paragraph>
 <paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
@@ -136,24 +133,24 @@
 <emph>Text Extension Inside Cells:</emph> Writes the rotated text only within the cell.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_TXTSTACKED" id="bm_id080420080320333" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED" id="bm_id080420080320333" localize="false"/>
 <paragraph role="heading" id="par_idN109F4" xml-lang="en-US" level="3" l10n="NEW">Vertically stacked</paragraph>
 <paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns text vertically.</ahelp><comment>UFI: see spec "Shrink to fit"</comment></paragraph>
 <embed href="text/shared/00/00000007.xhp#asiahinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
 <paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="U" oldref="43">Text flow</paragraph>
 <paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
 <paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
 <paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_ALIGNMENT:BTN_WRAP">Wraps text onto another line at the cell border. The number of lines depends on the width of the cell.</ahelp> To enter a manual line break, press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter in the cell.<comment>conditional switches inside AVIS do not work</comment></paragraph>
 <embed href="text/shared/guide/breaking_lines.xhp#breaking_lines"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH" id="bm_id3155415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH" id="bm_id3155415" localize="false"/>
 <paragraph role="heading" id="hd_id3147380" xml-lang="en-US" level="3" l10n="U" oldref="81">Hyphenation active</paragraph>
 <paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH">Enables word hyphenation for text wrapping to the next line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK" id="bm_id080420080321345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK" id="bm_id080420080321345" localize="false"/>
 <paragraph role="heading" id="par_idN10AD3" xml-lang="en-US" level="3" l10n="NEW">Shrink to fit cell size</paragraph>
 <paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05340400.xhp b/helpcontent2/source/text/shared/01/05340400.xhp
index a581e64c5c..09b643ac0d 100644
--- a/helpcontent2/source/text/shared/01/05340400.xhp
+++ b/helpcontent2/source/text/shared/01/05340400.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05340400.xhp,v $
- * $Revision: 1.12.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -56,9 +53,10 @@
 <embed href="text/shared/guide/database_main.xhp#database_main"/>
 <paragraph role="note" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="51">You cannot use the data source browser on a database table that is open in Design view.</paragraph>
 <paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="8">Data source browser</paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_TLB_TREELISTBOX">The commands for the data source browser are found on the <link href="text/shared/01/05340400.xhp" name="Database Bar">Table Data bar</link> and in <link href="text/shared/01/05340400.xhp" name="context menus">context menus</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">The commands for the data source browser are found on the <link href="text/shared/01/05340400.xhp" name="Database Bar">Table Data bar</link> and in <link href="text/shared/01/05340400.xhp" name="context menus">context menus</link>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="3" l10n="U" oldref="12">Selecting records</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="34">To select a record in a database table, click the row header, or click a row header, and then use the Up or Down arrow keys.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433001" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="13">The following table describes how to select individual elements in the data source browser:</paragraph>
 <table id="tbl_id3149795">
 <tablerow>
@@ -139,7 +137,8 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151173" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_TLB_TREELISTBOX">Go to the first record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3152821005" localize="false"/>
+<paragraph role="paragraph" id="par_id3151173" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the first record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
@@ -152,12 +151,14 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153280" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_TLB_TREELISTBOX">Go to the previous record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152821002" localize="false"/>
+<paragraph role="paragraph" id="par_id3153280" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".">Go to the previous record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
 <paragraph role="heading" id="hd_id3153053" xml-lang="en-US" level="3" l10n="U" oldref="39">Record number</paragraph>
-<paragraph role="paragraph" id="par_id3155851" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_TLB_TREELISTBOX">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3152821001" localize="false"/>
+<paragraph role="paragraph" id="par_id3155851" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid=".">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3157876" xml-lang="en-US" level="3" l10n="U" oldref="41">Next record</paragraph>
 <table id="tbl_id3148880">
 <tablerow>
@@ -167,7 +168,8 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3166414" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="HID_TLB_TREELISTBOX">Go to the next record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3152821003" localize="false"/>
+<paragraph role="paragraph" id="par_id3166414" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid=".">Go to the next record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
@@ -180,7 +182,8 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_TLB_TREELISTBOX">Go to the last record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3152821004" localize="false"/>
+<paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid=".">Go to the last record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
@@ -193,12 +196,14 @@
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146913" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="HID_TLB_TREELISTBOX">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3152821006" localize="false"/>
+<paragraph role="paragraph" id="par_id3146913" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".">Inserts a new record into the current table.</ahelp> To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
 </tablecell>
 </tablerow>
 </table>
 <paragraph role="heading" id="hd_id3150656" xml-lang="en-US" level="3" l10n="U" oldref="47">Number of records</paragraph>
-<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="U" oldref="48">The Form Navigation bar also displays information about the number of records in the current table. For example, "Record 7 of 9(2)" indicates that two records (2) are selected in a table containing 9 records, and that the cursor is in record number 7.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_NUMBEROFRECORDS" id="bm_id3152821013" localize="false"/>
+<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid=".">Displays the number of records. For example, "Record 7 of 9(2)" indicates that two records (2) are selected in a table containing 9 records, and that the cursor is in record number 7.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3151357" xml-lang="en-US" level="3" l10n="U" oldref="26">Organizing tables</paragraph>
 <paragraph role="paragraph" id="par_id3153357" xml-lang="en-US" l10n="U" oldref="28">To access the commands for formatting the table, right-click a column header, or a row header.</paragraph>
 <paragraph role="heading" id="hd_id3148405" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/05340402.xhp" name="Table Format">Table Format</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05340402.xhp b/helpcontent2/source/text/shared/01/05340402.xhp
index 2974e9f606..bb53f596cd 100755
--- a/helpcontent2/source/text/shared/01/05340402.xhp
+++ b/helpcontent2/source/text/shared/01/05340402.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340402.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340404.xhp b/helpcontent2/source/text/shared/01/05340404.xhp
index 5159716369..c350dd6909 100755
--- a/helpcontent2/source/text/shared/01/05340404.xhp
+++ b/helpcontent2/source/text/shared/01/05340404.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340404.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340405.xhp b/helpcontent2/source/text/shared/01/05340405.xhp
index 8c1f6b452e..69cccabe46 100755
--- a/helpcontent2/source/text/shared/01/05340405.xhp
+++ b/helpcontent2/source/text/shared/01/05340405.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340405.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340500.xhp b/helpcontent2/source/text/shared/01/05340500.xhp
index 25fa4514c2..4b1d3394f0 100755
--- a/helpcontent2/source/text/shared/01/05340500.xhp
+++ b/helpcontent2/source/text/shared/01/05340500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340600.xhp b/helpcontent2/source/text/shared/01/05340600.xhp
index fc27a4975e..bba3c9745e 100755
--- a/helpcontent2/source/text/shared/01/05340600.xhp
+++ b/helpcontent2/source/text/shared/01/05340600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05340600.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05350000.xhp b/helpcontent2/source/text/shared/01/05350000.xhp
index 513c390133..575dd4999a 100644
--- a/helpcontent2/source/text/shared/01/05350000.xhp
+++ b/helpcontent2/source/text/shared/01/05350000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05350200.xhp b/helpcontent2/source/text/shared/01/05350200.xhp
index a3944cef26..930c3e5a8f 100644
--- a/helpcontent2/source/text/shared/01/05350200.xhp
+++ b/helpcontent2/source/text/shared/01/05350200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="geometrie">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO" id="bm_id3149783" localize="false"/><paragraph role="heading" id="hd_id3149551" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350200.xhp" name="Geometry">Geometry</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO" id="bm_id3149783" localize="false"/><paragraph role="heading" id="hd_id3149551" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350200.xhp" name="Geometry">Geometry</link></paragraph>
 <paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO">Adjusts the shape of the selected 3D object. You can only modify the shape of a 3D object that was created by converting a 2D object. To convert a 2D object to 3D, select the object, right-click, and then choose <emph>Convert - To 3D</emph>, or <emph>Convert - To 3D Rotation Object</emph>.</ahelp></paragraph>
 </section>
 <section id="howtoget">
@@ -52,23 +49,23 @@
 </section>
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="4">Geometry</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">Define the shape properties for the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL" id="bm_id3151111" localize="false"/><paragraph role="heading" id="hd_id3149812" xml-lang="en-US" level="3" l10n="U" oldref="12">Rounded edges</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL" id="bm_id3151111" localize="false"/><paragraph role="heading" id="hd_id3149812" xml-lang="en-US" level="3" l10n="U" oldref="12">Rounded edges</paragraph>
 <paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL">Enter the amount by which you want to round the corners of the selected 3D object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_BACKSCALE" id="bm_id3154381" localize="false"/><paragraph role="heading" id="hd_id3155585" xml-lang="en-US" level="3" l10n="U" oldref="14">Scaled depth</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE" id="bm_id3154381" localize="false"/><paragraph role="heading" id="hd_id3155585" xml-lang="en-US" level="3" l10n="U" oldref="14">Scaled depth</paragraph>
 <paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_BACKSCALE">Enter the amount by which to increase or decrease the area of the front side of the selected 3D object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_END_ANGLE" id="bm_id3153127" localize="false"/><paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="3" l10n="U" oldref="16">Rotation angle</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE" id="bm_id3153127" localize="false"/><paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="3" l10n="U" oldref="16">Rotation angle</paragraph>
 <paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_END_ANGLE">Enter the angle in degrees to rotate the selected 3D rotation object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DEPTH" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="18">Depth</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="18">Depth</paragraph>
 <paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DEPTH">Enter the extrusion depth for the selected 3D object. This option is not valid for 3D rotation objects.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159343" xml-lang="en-US" level="2" l10n="U" oldref="6">Segments</paragraph>
 <paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="7">You can change the number of segments that are used to draw a 3D rotation object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL" id="bm_id3159167" localize="false"/><paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="8">Horizontal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL" id="bm_id3159167" localize="false"/><paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="8">Horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL">Enter the number of horizontal segments to use in the selected 3D rotation object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL" id="bm_id3150977" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="10">Vertical</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL" id="bm_id3150977" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="10">Vertical</paragraph>
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL">Enter the number of vertical segments to use in the selected 3D rotation object</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153626" xml-lang="en-US" level="2" l10n="U" oldref="20">Normals</paragraph>
 <paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="21">Allows you to modify the rendering style of the 3D surface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ" id="bm_id3154280" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="22">Object-Specific</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ" id="bm_id3154280" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="22">Object-Specific</paragraph>
 <paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ">Renders the 3D surface according to the shape of the object. For example, a circular shape is rendered with a spherical surface.</ahelp></paragraph>
 <table id="tbl_id3145068">
 <tablerow>
@@ -82,7 +79,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT" id="bm_id3158408" localize="false"/><paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="3" l10n="U" oldref="25">Flat</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT" id="bm_id3158408" localize="false"/><paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="3" l10n="U" oldref="25">Flat</paragraph>
 <paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT">Renders the 3D surface as polygons.</ahelp></paragraph>
 <table id="tbl_id3149169">
 <tablerow>
@@ -96,7 +93,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="28">Spherical</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="28">Spherical</paragraph>
 <paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE">Renders a smooth 3D surface.</ahelp></paragraph>
 <table id="tbl_id3148744">
 <tablerow>
@@ -110,7 +107,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT" id="bm_id3147354" localize="false"/><paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="31">Invert Normals</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT" id="bm_id3147354" localize="false"/><paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="31">Invert Normals</paragraph>
 <paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT">Inverts the light source.</ahelp></paragraph>
 <table id="tbl_id3154149">
 <tablerow>
@@ -124,7 +121,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING" id="bm_id3147295" localize="false"/><paragraph role="heading" id="hd_id3152417" xml-lang="en-US" level="3" l10n="U" oldref="34">Double-sided Illumination</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING" id="bm_id3147295" localize="false"/><paragraph role="heading" id="hd_id3152417" xml-lang="en-US" level="3" l10n="U" oldref="34">Double-sided Illumination</paragraph>
 <paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING">Lights the object from the outside and the inside. To use an ambient light source, click this button, and then click the <emph>Invert Normals</emph> button.</ahelp></paragraph>
 <table id="tbl_id3145261">
 <tablerow>
@@ -138,7 +135,7 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED" id="bm_id3153516" localize="false"/><paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="37">Double-Sided</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED" id="bm_id3153516" localize="false"/><paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="37">Double-Sided</paragraph>
 <paragraph role="paragraph" id="par_id3154692" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED">Closes the shape of a 3D object that was created by extruding a freeform line (<emph>Convert - To 3D</emph>).</ahelp></paragraph>
 <table id="tbl_id3147441">
 <tablerow>
diff --git a/helpcontent2/source/text/shared/01/05350300.xhp b/helpcontent2/source/text/shared/01/05350300.xhp
index c2a03aca2c..596e98e028 100644
--- a/helpcontent2/source/text/shared/01/05350300.xhp
+++ b/helpcontent2/source/text/shared/01/05350300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="darstellung">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION" id="bm_id3156053" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION" id="bm_id3156053" localize="false"/>
 <paragraph role="heading" id="hd_id3148919" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350300.xhp" name="Shading">Shading</link></paragraph>
 <paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION">Sets the shading and shadow options for the selected 3D object.</ahelp></paragraph>
 </section>
@@ -53,10 +50,10 @@
 </section>
 <paragraph role="heading" id="hd_id3109847" xml-lang="en-US" level="2" l10n="U" oldref="4">Shading</paragraph>
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="5">Specify the type of shading to apply to the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_SHADEMODE" id="bm_id3150772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE" id="bm_id3150772" localize="false"/>
 <paragraph role="heading" id="hd_id3147276" xml-lang="en-US" level="3" l10n="U" oldref="6">Mode</paragraph>
 <paragraph role="paragraph" id="par_id3155583" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_SHADEMODE">Select the shading method that you want to use. Flat shading assigns a single color to a single polygon on the surface of the object. Gouraud shading blends colors across the polygons. Phong shading averages the color of each pixel based on the pixels that surround it, and requires the most processing power.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SHADOW_3D" id="bm_id3149820" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D" id="bm_id3149820" localize="false"/>
 <paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="2" l10n="U" oldref="8">Shadow</paragraph>
 <paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SHADOW_3D">Adds or removes a shadow from the selected 3D object.</ahelp></paragraph>
 <table id="tbl_id3159399">
@@ -72,15 +69,15 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_SLANT" id="bm_id3149165" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT" id="bm_id3149165" localize="false"/>
 <paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="11">Surface angle</paragraph>
 <paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_SLANT">Enter an angle from 0 to 90 degrees for casting the shadow.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154905" xml-lang="en-US" level="2" l10n="U" oldref="13">Camera</paragraph>
 <paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="14">Set the camera options for the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DISTANCE" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE" id="bm_id3154758" localize="false"/>
 <paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="3" l10n="U" oldref="15">Distance</paragraph>
 <paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DISTANCE">Enter the distance to leave between the camera and the center of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH" id="bm_id3145068" localize="false"/>
 <paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="3" l10n="U" oldref="17">Focal length</paragraph>
 <paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH">Enter the focal length of the camera, where a small value corresponds to a "fisheye" lens, and a large value to a telephoto lens.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05350400.xhp b/helpcontent2/source/text/shared/01/05350400.xhp
index d395f6d91a..9688a07b1c 100644
--- a/helpcontent2/source/text/shared/01/05350400.xhp
+++ b/helpcontent2/source/text/shared/01/05350400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350400.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="beleuchtung">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT" id="bm_id3147273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT" id="bm_id3147273" localize="false"/>
 <paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350400.xhp" name="Illumination">Illumination</link></paragraph>
 <paragraph role="paragraph" id="par_id3149741" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT">Define the light source for the selected 3D object.</ahelp></paragraph>
 </section>
@@ -53,14 +50,14 @@
 </section>
 <paragraph role="heading" id="hd_id3154984" xml-lang="en-US" level="2" l10n="U" oldref="4">Illumination</paragraph>
 <paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="5">Specify the light source for the object, as well as the color of the light source and of the ambient light. You can define up to eight different light sources.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_1" id="bm_id3149177" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_2" id="bm_id3143267" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_3" id="bm_id3145071" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_4" id="bm_id3155355" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_5" id="bm_id3147088" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_6" id="bm_id3149095" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_7" id="bm_id3150506" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_8" id="bm_id3149182" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3" id="bm_id3145071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4" id="bm_id3155355" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5" id="bm_id3147088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7" id="bm_id3150506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8" id="bm_id3149182" localize="false"/>
 <paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="6">Light source</paragraph>
 <paragraph role="paragraph" id="par_id3149149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_8">Click twice to turn the light source on, and then select a color for the light from the list. If you want, you can also set the color of the surrounding light, by selecting a color from the <emph>Ambient light</emph> box.</ahelp> You can also press the Spacebar to turn the light source on or off. </paragraph>
 <table id="tbl_id3150355">
@@ -89,18 +86,18 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_LIGHT_1" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1" id="bm_id3159400" localize="false"/>
 <paragraph role="heading" id="hd_id3159166" xml-lang="en-US" level="3" l10n="U" oldref="10">Color Selection</paragraph>
 <paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_LIGHT_1">Select a color for the current light source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR" id="bm_id3153349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR" id="bm_id3153349" localize="false"/>
 <paragraph role="heading" id="hd_id3149955" xml-lang="en-US" level="3" l10n="U" oldref="12"><link href="text/shared/optionen/01010501.xhp" name="Select Color in the color dialog">Select Color in the color dialog</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000406.xhp#farbdial"/>
 <paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="13">Ambient light</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT" id="bm_id3149655" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT" id="bm_id3149655" localize="false"/>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="15">Color Selection</paragraph>
 <paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT">Select a color for the ambient light.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR" id="bm_id3154923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR" id="bm_id3154923" localize="false"/>
 <paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="3" l10n="U" oldref="17"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000406.xhp#farbdial"/>
diff --git a/helpcontent2/source/text/shared/01/05350500.xhp b/helpcontent2/source/text/shared/01/05350500.xhp
index d539b1b29b..268686c0a5 100644
--- a/helpcontent2/source/text/shared/01/05350500.xhp
+++ b/helpcontent2/source/text/shared/01/05350500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350500.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="texturen">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE" id="bm_id3148410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE" id="bm_id3148410" localize="false"/>
 <paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350500.xhp" name="Textures">Textures</link></paragraph>
 <paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE">Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the <emph>Gallery</emph>, hold down Shift+Ctrl (Mac: Shift+Command), and then drag an image onto the selected 3D object.</ahelp></paragraph>
 </section>
@@ -55,7 +52,7 @@
 <paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="5">Sets the texture properties.</paragraph>
 <paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="6">Type</paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="7">Set the color properties of the texture.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE" id="bm_id3166461" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE" id="bm_id3166461" localize="false"/>
 <paragraph role="heading" id="hd_id3150775" xml-lang="en-US" level="3" l10n="U" oldref="8">Black &amp; White</paragraph>
 <paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE">Converts the texture to black and white.</ahelp></paragraph>
 <table id="tbl_id3149149">
@@ -71,7 +68,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_COLOR" id="bm_id3150130" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR" id="bm_id3150130" localize="false"/>
 <paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="11">Color</paragraph>
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_COLOR">Converts the texture to color.</ahelp></paragraph>
 <table id="tbl_id3155261">
@@ -89,7 +86,7 @@
 
 <paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="3" l10n="U" oldref="14">Mode</paragraph>
 <paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="15">Show or hide shading.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_REPLACE" id="bm_id3154905" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE" id="bm_id3154905" localize="false"/>
 <paragraph role="heading" id="hd_id3149191" xml-lang="en-US" level="3" l10n="U" oldref="16">Only Texture</paragraph>
 <paragraph role="paragraph" id="par_id3148564" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_REPLACE">Applies the texture without shading.</ahelp></paragraph>
 <table id="tbl_id3147532">
@@ -105,7 +102,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_MODULATE" id="bm_id3151106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE" id="bm_id3151106" localize="false"/>
 <paragraph role="heading" id="hd_id3150541" xml-lang="en-US" level="3" l10n="U" oldref="19">Texture and Shading</paragraph>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_MODULATE">Applies the texture with shading. To define the shading options for the texture, click the <emph>Shading</emph> button in this dialog.</ahelp></paragraph>
 <table id="tbl_id3151210">
@@ -123,7 +120,7 @@
 
 <paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="3" l10n="U" oldref="22">Projection X</paragraph>
 <paragraph role="paragraph" id="par_id3148677" xml-lang="en-US" l10n="U" oldref="23">Set the options for displaying the texture.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X" id="bm_id3151041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X" id="bm_id3151041" localize="false"/>
 <paragraph role="heading" id="hd_id3148453" xml-lang="en-US" level="3" l10n="U" oldref="24">Object-specific</paragraph>
 <paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X">Automatically adjusts the texture based on the shape and size of the object.</ahelp></paragraph>
 <table id="tbl_id3143231">
@@ -139,7 +136,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X" id="bm_id3149560" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X" id="bm_id3149560" localize="false"/>
 <paragraph role="heading" id="hd_id3147300" xml-lang="en-US" level="3" l10n="U" oldref="27">Parallel</paragraph>
 <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X">Applies the texture parallel to the horizontal axis.</ahelp></paragraph>
 <table id="tbl_id3154145">
@@ -155,7 +152,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X" id="bm_id3144440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X" id="bm_id3144440" localize="false"/>
 <paragraph role="heading" id="hd_id3148577" xml-lang="en-US" level="3" l10n="U" oldref="30">Circular</paragraph>
 <paragraph role="paragraph" id="par_id3152418" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X">Wraps the horizontal axis of the texture pattern around a sphere.</ahelp></paragraph>
 <table id="tbl_id3159196">
@@ -173,7 +170,7 @@
 
 <paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="3" l10n="U" oldref="33">Projection Y</paragraph>
 <paragraph role="paragraph" id="par_id3152878" xml-lang="en-US" l10n="U" oldref="34">Click the respective buttons to define the texture for the object Y axis.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y" id="bm_id3145113" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y" id="bm_id3145113" localize="false"/>
 <paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="U" oldref="35">Object-specific</paragraph>
 <paragraph role="paragraph" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y">Automatically adjusts the texture based on the shape and size of the object.</ahelp></paragraph>
 <table id="tbl_id3150684">
@@ -189,7 +186,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y" id="bm_id3145799" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y" id="bm_id3145799" localize="false"/>
 <paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="3" l10n="U" oldref="38">Parallel</paragraph>
 <paragraph role="paragraph" id="par_id3145730" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y">Applies the texture parallel to the vertical axis.</ahelp></paragraph>
 <table id="tbl_id3149909">
@@ -205,7 +202,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y" id="bm_id3154096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y" id="bm_id3154096" localize="false"/>
 <paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="41">Circular</paragraph>
 <paragraph role="paragraph" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y">Wraps the vertical axis of the texture pattern around a sphere.</ahelp></paragraph>
 <table id="tbl_id3144764">
@@ -223,7 +220,7 @@
 
 <paragraph role="heading" id="hd_id3149581" xml-lang="en-US" level="3" l10n="U" oldref="44">Filter</paragraph>
 <paragraph role="paragraph" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="45">Filters out some of the 'noise' that can occur when you apply a texture to a 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_FILTER" id="bm_id3155085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER" id="bm_id3155085" localize="false"/>
 <paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="46">Filtering On/Off</paragraph>
 <paragraph role="paragraph" id="par_id3151038" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_FILTER">Blurs the texture slightly to remove unwanted speckles.</ahelp></paragraph>
 <table id="tbl_id3148833">
diff --git a/helpcontent2/source/text/shared/01/05350600.xhp b/helpcontent2/source/text/shared/01/05350600.xhp
index 6c302c874b..7f959d161a 100644
--- a/helpcontent2/source/text/shared/01/05350600.xhp
+++ b/helpcontent2/source/text/shared/01/05350600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05350600.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="material">
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MATERIAL" id="bm_id3155182" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL" id="bm_id3155182" localize="false"/>
 <paragraph role="heading" id="hd_id3154349" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350600.xhp" name="Material">Material</link></paragraph>
 <paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MATERIAL">Changes the coloring of the selected 3D object.</ahelp></paragraph>
 </section>
@@ -53,33 +50,33 @@
 </section>
 <paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="4">Material</paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="29">Assigns a predefined color scheme or lets you create your own color scheme.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_FAVORITES" id="bm_id3149205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES" id="bm_id3149205" localize="false"/>
 <paragraph role="heading" id="hd_id3154497" xml-lang="en-US" level="3" l10n="U" oldref="9">Favorites</paragraph>
 <paragraph role="paragraph" id="par_id3153303" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_FAVORITES">Select a predefined color scheme, or select <emph>User-defined</emph> to define a custom color scheme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_COLOR" id="bm_id3150710" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR" id="bm_id3150710" localize="false"/>
 <paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="3" l10n="U" oldref="16">Object color</paragraph>
 <paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_COLOR">Select the color that you want to apply to the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MAT_COLOR" id="bm_id3151226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR" id="bm_id3151226" localize="false"/>
 <paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="18"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000406.xhp#farbdial"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_EMISSION" id="bm_id3157864" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION" id="bm_id3157864" localize="false"/>
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="19">Illumination color</paragraph>
 <paragraph role="paragraph" id="par_id3159234" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_EMISSION">Select the color to illuminate the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_EMISSION_COLOR" id="bm_id3143268" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR" id="bm_id3143268" localize="false"/>
 <paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="21"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000406.xhp#farbdial"/>
 <paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="2" l10n="U" oldref="22">Specular</paragraph>
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="23">Sets the light reflection properties for the selected object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_SPECULAR" id="bm_id3145383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR" id="bm_id3145383" localize="false"/>
 <paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="24">Color</paragraph>
 <paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_SPECULAR">Select the color that you want the object to reflect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_SPECULAR_COLOR" id="bm_id3147243" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR" id="bm_id3147243" localize="false"/>
 <paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="3" l10n="U" oldref="26"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000406.xhp#farbdial"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY" id="bm_id3149276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY" id="bm_id3149276" localize="false"/>
 <paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="27">Intensity</paragraph>
 <paragraph role="paragraph" id="par_id3159256" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY">Enter the intensity of the specular effect.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05360000.xhp b/helpcontent2/source/text/shared/01/05360000.xhp
index 8c21260d0a..6bab74b31a 100644
--- a/helpcontent2/source/text/shared/01/05360000.xhp
+++ b/helpcontent2/source/text/shared/01/05360000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05360000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,36 +52,36 @@
 <paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="3">Objects are distributed with respect to the outermost objects in the selection.</paragraph>
 <paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2" l10n="U" oldref="4">Horizontally</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="5">Specify the horizontal distribution for the selected objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE" id="bm_id3154381" localize="false"/>
 <paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="6">None</paragraph>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE">Does not distribute the objects horizontally.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT" id="bm_id3156156" localize="false"/>
 <paragraph role="heading" id="hd_id3148990" xml-lang="en-US" level="3" l10n="U" oldref="8">Left</paragraph>
 <paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT">Distributes the selected objects, so that the left edges of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER" id="bm_id3149903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER" id="bm_id3149903" localize="false"/>
 <paragraph role="heading" id="hd_id3150130" xml-lang="en-US" level="3" l10n="U" oldref="10">Center</paragraph>
 <paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER">Distributes the selected objects, so that the horizontal centers of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE" id="bm_id3149235" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE" id="bm_id3149235" localize="false"/>
 <paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="3" l10n="U" oldref="12">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE">Distributes the selected objects horizontally, so that the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT" id="bm_id3156152" localize="false"/>
 <paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="14">Right</paragraph>
 <paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT">Distributes the selected objects, so that the right edges of the objects are evenly spaced from one another.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="2" l10n="U" oldref="16">Vertically</paragraph>
 <paragraph role="paragraph" id="par_id3155321" xml-lang="en-US" l10n="U" oldref="17">Specify the vertical distribution for the selected objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE" id="bm_id3151384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE" id="bm_id3151384" localize="false"/>
 <paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="3" l10n="U" oldref="18">None</paragraph>
 <paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE">Does not distribute the objects vertically.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP" id="bm_id3145068" localize="false"/>
 <paragraph role="heading" id="hd_id3153626" xml-lang="en-US" level="3" l10n="U" oldref="20">Top</paragraph>
 <paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP">Distributes the selected objects, so that the top edges of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER" id="bm_id3154758" localize="false"/>
 <paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="22">Center</paragraph>
 <paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER">Distributes the selected objects, so that the vertical centers of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE" id="bm_id3152772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE" id="bm_id3152772" localize="false"/>
 <paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="24">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE">Distributes the selected objects vertically, so that the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM" id="bm_id3153778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM" id="bm_id3153778" localize="false"/>
 <paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="26">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM">Distributes the selected objects, so that the bottom edges of the objects are evenly spaced from one another.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/05990000.xhp b/helpcontent2/source/text/shared/01/05990000.xhp
index 897a4b0acb..468829f762 100644
--- a/helpcontent2/source/text/shared/01/05990000.xhp
+++ b/helpcontent2/source/text/shared/01/05990000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05990000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010000.xhp b/helpcontent2/source/text/shared/01/06010000.xhp
index e0f179ee50..9554adb5df 100644
--- a/helpcontent2/source/text/shared/01/06010000.xhp
+++ b/helpcontent2/source/text/shared/01/06010000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06010000.xhp,v $
- * $Revision: 1.13.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,85 +29,95 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spelling and Grammar</title>
-<filename>/text/shared/01/06010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="rechtschreibung">
+      <topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Spelling and Grammar</title>
+         <filename>/text/shared/01/06010000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="rechtschreibung">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149047"><bookmark_value>dictionaries; spellcheck</bookmark_value>
-<bookmark_value>spellcheck; dialog</bookmark_value>
-<bookmark_value>languages; spellcheck</bookmark_value>
+         <bookmark_value>spellcheck; dialog</bookmark_value>
+         <bookmark_value>languages; spellcheck</bookmark_value>
 </bookmark><comment>mw changes "spellcheck;languages"</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:Spelling" id="bm_id3150702" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SpellingAndGrammarDialog" id="bm_id1022200801253693" localize="false"/>
-<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
-<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3153882" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154682" role="paragraph" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
-</section>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
-<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_id1022200801300654" xml-lang="en-US" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
-<paragraph role="paragraph" id="par_id1022200801354366" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD" id="bm_id756859" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Not in dictionary</paragraph>
-<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD" id="bm_id3149416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION" id="bm_id9300210" localize="false"/>
-<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="10">Suggestions</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE" id="bm_id3150822" localize="false"/>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
-<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
-<embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR" id="bm_id3148798" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR" id="bm_id9182103" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect 
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
+      </section>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+      <paragraph xml-lang="en-US" id="par_idN1064B" role="paragraph" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166445" role="paragraph" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1022200801300654" role="paragraph" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200801354366" role="paragraph" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD" id="bm_id756859" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2" l10n="CHG"
+                 oldref="6">Not in dictionary</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
+<!-- removed HID SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION" id="bm_id9300210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149885" role="heading" level="2" l10n="U"
+                 oldref="10">Suggestions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="2" l10n="CHG"
+                 oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144422" role="paragraph" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
+      <embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR" id="bm_id9182103" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U"
+                 oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3153798" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS" id="bm_id3157960" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS" id="bm_id9094821" localize="false"/>
-<paragraph role="heading" id="hd_id3151382" xml-lang="en-US" level="2" l10n="U" oldref="56">Options</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD" id="bm_id3150767" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT" id="bm_id5068819" localize="false"/>
-<paragraph role="heading" id="hd_id3153353" xml-lang="en-US" level="2" l10n="U" oldref="24">Add</paragraph>
-<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE" id="bm_id3147228" localize="false"/>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS" id="bm_id9094821" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151382" role="heading" level="2" l10n="U"
+                 oldref="56">Options</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD -->
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT" id="bm_id5068819" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153353" role="heading" level="2" l10n="U"
+                 oldref="24">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE -->
 <bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNORE" id="bm_id7157811" localize="false"/>
-<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Ignore Once</paragraph>
-<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
-<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
-<bookmark xml-lang="en-US" branch="hid/40076" id="bm_id1024200804072166" localize="false"/>
-<paragraph role="paragraph" id="par_id1024200804091149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL" id="bm_id3145171" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155994" role="heading" level="2" l10n="CHG"
+                 oldref="22">Ignore Once</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148920" role="paragraph" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107CB" role="note" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNORERULE" id="bm_id1024200804072166" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1024200804091149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL -->
 <bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNOREALL" id="bm_id4155705" localize="false"/>
-<paragraph role="heading" id="hd_id3150740" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Ignore All</paragraph>
-<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE" id="bm_id3152884" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150740" role="heading" level="2" l10n="CHG"
+                 oldref="20">Ignore All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145318" role="paragraph" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE -->
 <bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGE" id="bm_id2069765" localize="false"/>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Change</paragraph>
-<paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL" id="bm_id3157895" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="CHG"
+                 oldref="18">Change</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148559" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL -->
 <bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGEALL" id="bm_id9187902" localize="false"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Change All</paragraph>
-<paragraph role="paragraph" id="par_id3144446" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_UNDO" id="bm_id9617297" localize="false"/>
-<paragraph role="heading" id="par_idN10850" xml-lang="en-US" level="2" l10n="NEW">Undo</paragraph>
-<paragraph role="paragraph" id="par_idN10854" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to undo the last step of your spellcheck session. Click again to undo the previous step, and so on.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="CHG"
+                 oldref="16">Change All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144446" role="paragraph" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO" id="bm_id9617297" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10850" role="heading" level="2" l10n="NEW">Undo</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10854" role="paragraph" l10n="CHG"><ahelp hid=".">Click to undo the last change in the current sentence. Click again to undo the previous change in the same sentence.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+         <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06010101.xhp b/helpcontent2/source/text/shared/01/06010101.xhp
index 0176de2df2..564704e5e1 100755
--- a/helpcontent2/source/text/shared/01/06010101.xhp
+++ b/helpcontent2/source/text/shared/01/06010101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010101.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010500.xhp b/helpcontent2/source/text/shared/01/06010500.xhp
index 1d423b3c6b..4fe28d170b 100755
--- a/helpcontent2/source/text/shared/01/06010500.xhp
+++ b/helpcontent2/source/text/shared/01/06010500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010500.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010600.xhp b/helpcontent2/source/text/shared/01/06010600.xhp
index ecb63b58b6..e07b9fd5a6 100755
--- a/helpcontent2/source/text/shared/01/06010600.xhp
+++ b/helpcontent2/source/text/shared/01/06010600.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06010600.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,43 +27,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chinese Translation</title>
+<title id="tit" xml-lang="en-US">Chinese Conversion</title>
 <filename>/text/shared/01/06010600.xhp</filename>
 </topic>
 <history>
-<created date="2004-07-21T12:24:22">UFI: Chinese Translation dialog</created>
+<created date="2004-07-21T12:24:22">UFI: former Chinese Translation dialog, issue 58212</created>
 <lastedited date="2004-12-16T12:54:32">DEDR: reviewed</lastedited>
 </history>
 </meta>
 <body>
 <section id="chinese">
 <bookmark xml-lang="en-US" branch="index" id="bm_id49745"><bookmark_value>Chinese writing systems</bookmark_value>
-<bookmark_value>simplified Chinese;translating to traditional Chinese</bookmark_value>
-<bookmark_value>traditional Chinese;translating to simplified chinese</bookmark_value>
+<bookmark_value>simplified Chinese;conversion to traditional Chinese</bookmark_value>
+<bookmark_value>traditional Chinese;conversion to simplified Chinese</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_CHINESE_CONVERSION" id="bm_id9033860" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ChineseConversion" id="bm_id2549516" localize="false"/>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Translation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Conversion</link></paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is converted.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#chinese"/>
 </section>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Translation direction</paragraph>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the translation direction.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Conversion direction</paragraph>
+<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the conversion direction.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="3" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Common terms</paragraph>
 <paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Common terms are words that have the same meaning in traditional and simplified Chinese but are written with different characters.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Translate Common Terms</paragraph>
-<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is translated character by character.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Convert Common Terms</paragraph>
+<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is converted character by character.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Edit terms</paragraph>
-<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of translation terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of conversion terms.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06010601.xhp b/helpcontent2/source/text/shared/01/06010601.xhp
index 941ac96e9a..c550a1ccb0 100755
--- a/helpcontent2/source/text/shared/01/06010601.xhp
+++ b/helpcontent2/source/text/shared/01/06010601.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010601.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,15 +44,15 @@
 <bookmark_value>dictionaries;common terms in simplified and traditional chinese</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW">Edit Dictionary</paragraph>
-<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese translation</link> terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese conversion</link> terms.</ahelp></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#chineseedit"/>
 </section>
-<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the translation dictionary. The file path name for the translation dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
+<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the conversion dictionary. The file path name for the conversion dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
 <paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese to simplified Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese to simplified Chinese.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10570" xml-lang="en-US" level="2" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese to traditional Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese to traditional Chinese.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10577" xml-lang="en-US" level="2" l10n="NEW">Reverse Mapping</paragraph>
 <paragraph role="paragraph" id="par_idN1057B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Automatically adds the reverse mapping direction to the list for each modification that you enter.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Term</paragraph>
@@ -65,7 +62,7 @@
 <paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Property</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines the class of the selected term.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the translation dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the conversion dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the modified entry to the database file.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06020000.xhp b/helpcontent2/source/text/shared/01/06020000.xhp
index 691850e5e4..ba393a72b6 100644
--- a/helpcontent2/source/text/shared/01/06020000.xhp
+++ b/helpcontent2/source/text/shared/01/06020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06020000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0106020000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Thesaurus</title>
@@ -48,32 +44,36 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:ThesaurusDialog" id="bm_id3085157" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_THESAURUS" id="bm_id1644684" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Thesaurus" id="bm_id3152427" localize="false"/><paragraph role="heading" id="hd_id3146946" xml-lang="en-US" level="1" l10n="U" oldref="1">Thesaurus</paragraph>
-<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Replaces the current word with a synonym, or a related term.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Opens a dialog box to replace the current word with a synonym, or a related term.</ahelp></variable></paragraph>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#thesaurus"/>
+<embed href="text/shared/00/00000406.xhp#thesaurus"/>
 </section>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
 </case>
 </switch>
 <paragraph role="warning" id="par_id3154184" xml-lang="en-US" l10n="U" oldref="19">Thesaurus support is not available for all languages.</paragraph>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="3">Variations</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Lists the current word and the suggested replacement word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_WORD" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Word</paragraph>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_WORD">Displays the current selection, or the word that contains the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_MEAN" id="bm_id3153346" localize="false"/><paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Meaning</paragraph>
-<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_MEAN">Select the meaning that matches the context of the current word, and then select a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SVXDLG_THESAURUS:ED_REPL">Displays a suggested replacement for the current word. You can also type a new word in this box, or click a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_SYNON" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="11">Synonym</paragraph>
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_SYNON">Lists the words associated with the category that you selected in the <emph>Meaning</emph> list. Select the word that you want to use as a replacement, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LOOKUP" id="bm_id3153700" localize="false"/><paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="13">Search</paragraph>
-<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LOOKUP">Searches the thesaurus for the best match of the word selected in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LANGUAGE" id="bm_id3149763" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LANGUAGE">Specifies the language to use for the thesaurus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE" id="bm_id3154578" localize="false"/><paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="17">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE">Select the language that you want to use for the thesaurus, and then click <emph>OK</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD" id="bm_id3155552" localize="false"/>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Current word</paragraph>
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Displays the current word, or the related term that you selected by double-clicking a line in the Alternatives list. You can also type text directly in this box to look up your text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT" id="bm_id315752" localize="false"/>
+<paragraph role="heading" id="hd_id3647571" xml-lang="en-US" level="3" l10n="U" oldref="5">Arrow left</paragraph>
+<paragraph role="paragraph" id="par_id369233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Recalls the previous contents of the "Current word" text box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_CT_THES_ALTERNATIVES" id="bm_id3153346" localize="false"/>
+<paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Alternatives</paragraph>
+<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">Click an entry in the Alternatives list to copy the related term to the "Replace with" text box. Double-click an entry to copy the related term to the "Current word" text box and to look up that term.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/>
+<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace with</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">The word or words in the "Replace with" text box will replace the original word in the document when you click the Replace button. You can also type text directly in this box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE" id="bm_id3149763" localize="false"/>
+<paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06030000.xhp b/helpcontent2/source/text/shared/01/06030000.xhp
index dbeeb6230f..30631b8252 100644
--- a/helpcontent2/source/text/shared/01/06030000.xhp
+++ b/helpcontent2/source/text/shared/01/06030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -77,36 +74,36 @@
 <bookmark xml-lang="en-US" branch="hid/HID_BMPMASK_CTL_PIPETTE" id="bm_id3147010" localize="false"/>
 <paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="5">Eyedropper color</paragraph>
 <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_BMPMASK_CTL_PIPETTE">Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the eyedropper tool is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_BMPMASK:BTN_EXEC" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC" id="bm_id3155942" localize="false"/>
 <paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="2" l10n="U" oldref="7">Replace</paragraph>
 <paragraph role="paragraph" id="par_id3154983" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_BMPMASK:BTN_EXEC">Replaces the selected source colors in the current image with the colors that you specify in the <emph>Replace with </emph>boxes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="9">Colors</paragraph>
 <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="10">Lists the source colors and the replacement colors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_1" id="bm_id3150977" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_2" id="bm_id3153253" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_3" id="bm_id3146138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_4" id="bm_id3153321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1" id="bm_id3150977" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2" id="bm_id3153253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3" id="bm_id3146138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4" id="bm_id3153321" localize="false"/>
 <paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="11">Source color checkbox</paragraph>
 <paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_4">Select this checkbox to replace the current <emph>Source color</emph> with the color that you specify in the <emph>Replace with </emph>box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BMPMASK_CTL_QCOL_1" id="bm_id3157909" localize="false"/>
 <paragraph role="heading" id="hd_id3159116" xml-lang="en-US" level="3" l10n="U" oldref="13">Source color</paragraph>
 <paragraph role="paragraph" id="par_id3149903" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_BMPMASK_CTL_QCOL_1">Displays the color in the selected image that you want to replace. To set the source color, click here, click the eyedropper, and then click a color in the selected image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_1" id="bm_id3158431" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_2" id="bm_id3146848" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_3" id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_4" id="bm_id3147620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_1" id="bm_id3158431" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_2" id="bm_id3146848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_3" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_4" id="bm_id3147620" localize="false"/>
 <paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="15">Tolerance</paragraph>
 <paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_4">Set the tolerance for replacing a source color in the source image. To replace colors that are similar to the color that you selected, enter a low value. To replace a wider range of colors, enter a higher value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_1" id="bm_id3159256" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_2" id="bm_id3155831" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_3" id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_4" id="bm_id3152350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_1" id="bm_id3159256" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_2" id="bm_id3155831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_3" id="bm_id3156326" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_4" id="bm_id3152350" localize="false"/>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="17">Replace with</paragraph>
 <paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_4">Lists the available replacement colors. To modify the current list of colors, deselect the image, choose <emph>Format - Area</emph>, and then click the <emph>Colors</emph> tab.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_TRANS" id="bm_id3149244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS" id="bm_id3149244" localize="false"/>
 <paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="3" l10n="U" oldref="19">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3154905" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_TRANS">Replaces transparent areas in the current image with the color that you select.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_TRANS" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS" id="bm_id3153061" localize="false"/>
 <paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="3" l10n="U" oldref="21">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_TRANS">Select the color to replace the transparent areas in the current image.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp
index 24853ba211..04399a3c8f 100644
--- a/helpcontent2/source/text/shared/01/06040000.xhp
+++ b/helpcontent2/source/text/shared/01/06040000.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,23 +35,22 @@
  
 	
 <meta>
-<topic id="textshared0106040000xml" indexer="include">
-<title id="tit" xml-lang="en-US">AutoCorrect</title>
-<filename>/text/shared/01/06040000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function; switching on and off in Calc</bookmark_value>
-<bookmark_value>AutoFormat function; switching on and off</bookmark_value>
+      <topic id="textshared0106040000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">AutoCorrect</title>
+         <filename>/text/shared/01/06040000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function;switching on and off</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_AUTO_CORRECT_DLG" id="bm_id1521736" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/>
-<paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153391" role="heading" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150838" role="paragraph" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#autokorr"/>
-</section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#autokorr"/>
+      </section>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
 </case>
@@ -60,24 +59,23 @@
 <case select="CALC"><embed href="text/scalc/guide/auto_off.xhp#auto_off"/>
 </case>
 </switch>
-<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-<embed href="text/shared/01/06040200.xhp#ersetzung"/>
-<embed href="text/shared/01/06040300.xhp#ausnahmen"/>
-<embed href="text/shared/01/06040100.xhp#optionen"/>
-<embed href="text/shared/01/06040400.xhp#typanf"/>
+<paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+      <embed href="text/shared/01/06040200.xhp#ersetzung"/>
+      <embed href="text/shared/01/06040300.xhp#ausnahmen"/>
+      <embed href="text/shared/01/06040100.xhp#optionen"/>
+      <embed href="text/shared/01/06040400.xhp#typanf"/>
 <switch select="appl">
 <case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/>
-<embed href="text/shared/01/06040700.xhp#smarttags"/>
+      <embed href="text/shared/01/06040700.xhp#smarttags"/>
 </case>
-</switch>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
+</switch><embed href="text/shared/00/00000001.xhp#zurueck"/>
 <switch select="appl">
 <case select="WRITER">
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
-</section>
+         <paragraph xml-lang="en-US" id="par_id3146137" role="paragraph" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+      </section>
 </case>
 </switch>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp
index 00059a9cc2..699df58428 100644
--- a/helpcontent2/source/text/shared/01/06040100.xhp
+++ b/helpcontent2/source/text/shared/01/06040100.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,255 +29,261 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0106040100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/01/06040100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="optionen">
+      <topic id="textshared0106040100xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Options</title>
+         <filename>/text/shared/01/06040100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="optionen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155620"><bookmark_value>AutoCorrect function; options</bookmark_value>
-<bookmark_value>replacement options</bookmark_value>
-<bookmark_value>words; automatically replacing</bookmark_value>
-<bookmark_value>abbreviation replacement</bookmark_value>
-<bookmark_value>capital letters; AutoCorrect function</bookmark_value>
-<bookmark_value>bold; AutoFormat function</bookmark_value>
-<bookmark_value>underlining; AutoFormat function</bookmark_value>
-<bookmark_value>1/2 replacement</bookmark_value>
-<bookmark_value>spaces; ignoring double</bookmark_value>
-<bookmark_value>numbering; using automatically</bookmark_value>
-<bookmark_value>paragraphs; numbering automatically</bookmark_value>
-<bookmark_value>numbering;paragraphs</bookmark_value>
-<bookmark_value>tables in text; creating automatically</bookmark_value>
-<bookmark_value>titles; formatting automatically</bookmark_value>
-<bookmark_value>empty paragraph removal</bookmark_value>
-<bookmark_value>paragraphs; removing blank ones</bookmark_value>
-<bookmark_value>styles; replacing automatically</bookmark_value>
-<bookmark_value>user-defined styles; automatically replacing</bookmark_value>
-<bookmark_value>bullets; replacing</bookmark_value>
-<bookmark_value>quotation marks; replacing</bookmark_value>
-<bookmark_value>typographical quotes in $[officename] Writer</bookmark_value>
-<bookmark_value>paragraphs; joining</bookmark_value>
-<bookmark_value>joining; paragraphs</bookmark_value>
-</bookmark><comment>removed two bookmarks "automatic..."</comment>
+         <bookmark_value>replacement options</bookmark_value>
+         <bookmark_value>words; automatically replacing</bookmark_value>
+         <bookmark_value>abbreviation replacement</bookmark_value>
+         <bookmark_value>capital letters; AutoCorrect function</bookmark_value>
+         <bookmark_value>bold; AutoFormat function</bookmark_value>
+         <bookmark_value>underlining; AutoFormat function</bookmark_value>
+         <bookmark_value>spaces; ignoring double</bookmark_value>
+         <bookmark_value>numbering; using automatically</bookmark_value>
+         <bookmark_value>paragraphs; numbering automatically</bookmark_value>
+         <bookmark_value>tables in text; creating automatically</bookmark_value>
+         <bookmark_value>titles; formatting automatically</bookmark_value>
+         <bookmark_value>empty paragraph removal</bookmark_value>
+         <bookmark_value>paragraphs; removing blank ones</bookmark_value>
+         <bookmark_value>styles; replacing automatically</bookmark_value>
+         <bookmark_value>user-defined styles; automatically replacing</bookmark_value>
+         <bookmark_value>bullets; replacing</bookmark_value>
+         <bookmark_value>paragraphs; joining</bookmark_value>
+         <bookmark_value>joining; paragraphs</bookmark_value>
+</bookmark><comment>removed two bookmarks "automatic..." and two more entries about quotes and 1/2 replacement</comment><comment>MW removed "numbering;paragraphs"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_CLB" id="bm_id3148765" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_OPTIONS" id="bm_id3147527" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFMT_OPTIONS" id="bm_id3149962" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFORMAT_CLB" id="bm_id3150999" localize="false"/>
-<paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
+      </section>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-<paragraph role="note" id="par_id7547227" xml-lang="en-US" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7547227" role="note" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3154398" xml-lang="en-US" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
-<paragraph role="heading" id="hd_id3150144" xml-lang="en-US" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
-<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
-<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154398" role="heading" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150144" role="heading" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156426" role="heading" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155339" role="paragraph" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="note" id="par_id5240028" xml-lang="en-US" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id5240028" role="note" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="24">Automatic *bold* and _underline_</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
-<paragraph role="note" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="3" l10n="U" oldref="17">URL Recognition</paragraph>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
-<paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="15">Replace 1/2 ... with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
-<paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="25">Replace 1st ... with 1^st ...</paragraph>
-<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
-<paragraph role="heading" id="hd_id3148473" xml-lang="en-US" level="3" l10n="U" oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
-<paragraph role="paragraph" id="par_id3144439" xml-lang="en-US" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
-<paragraph role="paragraph" id="par_id87282" xml-lang="en-US" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
-<table id="tbl_id2444227">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3408612" xml-lang="en-US" l10n="NEW">Text that you type:</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id4362010" xml-lang="en-US" l10n="NEW">Result that you get:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1432844" xml-lang="en-US" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7553941" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1421246" xml-lang="en-US" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2305673" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id8703573" xml-lang="en-US" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id6049684" xml-lang="en-US" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2219916" xml-lang="en-US" l10n="NEW">A-B (A, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1868037" xml-lang="en-US" l10n="NEW">A-B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id714438" xml-lang="en-US" l10n="NEW">A -B (A, space, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3924985" xml-lang="en-US" l10n="NEW">A -B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1486861" xml-lang="en-US" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id844141" xml-lang="en-US" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3145072" role="heading" level="3" l10n="U"
+                 oldref="24">Automatic *bold* and _underline_</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153577" role="paragraph" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153127" role="note" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150275" role="heading" level="3" l10n="U"
+                 oldref="17">URL Recognition</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
+<comment>UFI: moved "replace 1st" to Localized Options tab page, cws cbosdo01</comment>
+      <paragraph xml-lang="en-US" id="hd_id3148473" role="heading" level="3" l10n="U"
+                 oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
+<paragraph xml-lang="en-US" id="par_id3144439" role="paragraph" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id87282" role="paragraph" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
+      <table id="tbl_id2444227">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3408612" role="tablehead" l10n="NEW">Text that you type:</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4362010" role="tablehead" l10n="NEW">Result that you get:</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1432844" role="tablecontent" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7553941" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1421246" role="tablecontent" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2305673" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8703573" role="tablecontent" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6049684" role="tablecontent" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2219916" role="tablecontent" l10n="NEW">A-B (A, minus, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1868037" role="tablecontent" l10n="NEW">A-B (unchanged)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id714438" role="tablecontent" l10n="NEW">A -B (A, space, minus, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3924985" role="tablecontent" l10n="NEW">A -B (unchanged)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1486861" role="tablecontent" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id844141" role="tablecontent" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id1416974" xml-lang="en-US" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
-<paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="3" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph 
+      <paragraph xml-lang="en-US" id="par_id1416974" role="note" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152472" role="heading" level="3" l10n="U"
+                 oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected. 
+      <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines 
+      <paragraph xml-lang="en-US" id="hd_id3147303" role="heading" level="3" l10n="U"
+                 oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected. 
+      <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="28">Ignore double spaces</paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
-<paragraph role="heading" id="hd_id3145116" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol 
+      <paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="3" l10n="U"
+                 oldref="28">Ignore double spaces</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145116" role="heading" level="3" l10n="U"
+                 oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter. 
+      <paragraph xml-lang="en-US" id="par_id3150870" role="paragraph" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again. 
+      <paragraph xml-lang="en-US" id="par_id3146874" role="paragraph" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="tip" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145606" role="tip" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
 </case>
 </switch>
 <switch select="appl">
 <case select="WRITER">
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="35">Apply border</paragraph>
-<paragraph role="paragraph" id="par_id3144445" xml-lang="en-US" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
-<paragraph role="paragraph" id="par_idN10C2E" xml-lang="en-US" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
-<paragraph role="paragraph" id="par_idN10C35" xml-lang="en-US" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
-<table id="tbl_id3149985">
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="37">---</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154690" xml-lang="en-US" l10n="U" oldref="38">0.5pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">___</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="40">1.0pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147580" xml-lang="en-US" l10n="U" oldref="41">===</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="42">1.1pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="43">***</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="44">4.5pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="45">~~~</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="46">6.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="47">###</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="48">9.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/guide/line_intext.xhp#line_intext"/>
-<embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+                 oldref="35">Apply border</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144445" role="paragraph" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10C2E" role="paragraph" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10C35" role="paragraph" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
+      <table id="tbl_id3149985">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148576" role="tablecontent" l10n="U" oldref="37">---</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154690" role="tablecontent" l10n="U" oldref="38">0.5pt single underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154472" role="tablecontent" l10n="U" oldref="39">___</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149266" role="tablecontent" l10n="U" oldref="40">1.0pt single underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147580" role="tablecontent" l10n="U" oldref="41">===</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145364" role="tablecontent" l10n="U" oldref="42">1.1pt double underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148647" role="tablecontent" l10n="U" oldref="43">***</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152791" role="tablecontent" l10n="U" oldref="44">4.5pt double underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146975" role="tablecontent" l10n="U" oldref="45">~~~</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152885" role="tablecontent" l10n="U" oldref="46">6.0pt double underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145591" role="tablecontent" l10n="U" oldref="47">###</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153188" role="tablecontent" l10n="U" oldref="48">9.0pt double underline</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/guide/line_intext.xhp#line_intext"/>
+      <embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3149064" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column. 
+<paragraph xml-lang="en-US" id="hd_id3149064" role="heading" level="3" l10n="U"
+                 oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+ 
+      <paragraph xml-lang="en-US" id="par_id3146119" role="paragraph" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3153334" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles 
+      <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter. 
+      <paragraph xml-lang="en-US" id="hd_id3153334" role="heading" level="3" l10n="U"
+                 oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="3" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs 
-</caseinline></switchinline></paragraph><comment>UFI: test if this also only applies to Default, body and body indented, or to all para styles</comment>
-<paragraph role="paragraph" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>. 
+      <paragraph xml-lang="en-US" id="par_id3147396" role="paragraph" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3152375" xml-lang="en-US" level="3" l10n="U" oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles 
+      <paragraph xml-lang="en-US" id="hd_id3151075" role="heading" level="3" l10n="U"
+                 oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156299" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style. 
+<paragraph xml-lang="en-US" id="par_id3145728" role="paragraph" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147045" xml-lang="en-US" level="3" l10n="U" oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with 
+      <paragraph xml-lang="en-US" id="hd_id3152375" role="heading" level="3" l10n="U"
+                 oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>. 
+      <paragraph xml-lang="en-US" id="par_id3156299" role="paragraph" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3154792" xml-lang="en-US" level="3" l10n="U" oldref="64"><switchinline select="appl"><caseinline select="WRITER">Replace standard quotes with custom quotes 
+      <paragraph xml-lang="en-US" id="hd_id3147045" role="heading" level="3" l10n="U"
+                 oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="WRITER">Changes quotation marks in the text to the quotation marks that you specify in the <link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link> tab of this dialog. 
+      <paragraph xml-lang="en-US" id="par_id3150420" role="paragraph" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>.
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151019" xml-lang="en-US" level="3" l10n="U" oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ... 
+<comment>removed "replace standard quotes..." cws cbosdo01</comment>
+<paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="3" l10n="U"
+                 oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ...
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>. 
+      <paragraph xml-lang="en-US" id="par_id3154162" role="paragraph" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id3156334" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/>
-<paragraph role="heading" id="hd_id3144749" xml-lang="en-US" level="2" l10n="U" oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit 
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id9193700" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1218200910244459" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Modifies the selected AutoCorrect option.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3144749" role="heading" level="2" l10n="U"
+                 oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153841" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3153841" role="paragraph" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
 </caseinline></switchinline></paragraph>
-</body>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp
index c69588c9e2..c47de3f07a 100644
--- a/helpcontent2/source/text/shared/01/06040200.xhp
+++ b/helpcontent2/source/text/shared/01/06040200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040200.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,20 +63,20 @@
 <paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="14">You can use the AutoCorrect feature to apply a specific character format to a word or abbreviation. Select the formatted text in your document, open this dialog, clear the <emph>Text only</emph> box, and then enter the text that you want to replace in the<emph> Replace</emph> box.</paragraph>
 <paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="WRITER">You can also include frames, graphics, and OLE objects in an AutoCorrect entry, so long as they are anchored <emph>as characters</emph> in the text. Select the frame, graphic or OLE object and at least one text character in front of and behind the object. Open this dialog, type a name for this AutoCorrect entry in the <emph>Replace </emph>box, and then click <emph>New</emph>. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT" id="bm_id3156343" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_REPLACE_ED_SHORT" id="bm_id1574449" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT" id="bm_id1574449" localize="false"/>
 <paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="3" l10n="U" oldref="5">Replace</paragraph>
 <paragraph role="paragraph" id="par_id3147560" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT">Enter the word or abbreviation that you want to replace while you type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE" id="bm_id3154389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_REPLACE_ED_REPLACE" id="bm_id6447340" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE" id="bm_id6447340" localize="false"/>
 <paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="7">With:</paragraph>
 <paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE">Enter the replacement text, graphic, frame, or OLE object that you want to replace the text in the<emph> Replace</emph> box. If you have selected text, a graphic, a frame, or an OLE object in your document, the relevant information is already entered here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY" id="bm_id3150359" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_REPLACE_CB_TEXT_ONLY" id="bm_id8239997" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY" id="bm_id8239997" localize="false"/>
 <paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="9">Text only</paragraph>
 <paragraph role="paragraph" id="par_id3153379" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY">Saves the entry in the <emph>With</emph> box without formatting. When the replacement is made, the text uses the same format as the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE" id="bm_id3147085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_NEW_REPLACE" id="bm_id8823511" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE" id="bm_id8823511" localize="false"/>
 <paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="2" l10n="U" oldref="11">New</paragraph>
 <paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE">Adds or replaces an entry in the replacement table.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/01/06040300.xhp b/helpcontent2/source/text/shared/01/06040300.xhp
index 694f729484..8424338076 100644
--- a/helpcontent2/source/text/shared/01/06040300.xhp
+++ b/helpcontent2/source/text/shared/01/06040300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040300.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,31 +52,31 @@
 <paragraph role="heading" id="hd_id3149205" xml-lang="en-US" level="2" l10n="U" oldref="15">Replacements and exceptions for language:</paragraph>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_AUTOCORR_LANGUAGE">Select the language for which you want to create or edit the replacement rules.</ahelp> $[officename] first searches for exceptions that are defined for the language at the current cursor position in the document, and then searches the remaining languages.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV" id="bm_id3157959" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_ABBREV" id="bm_id9220557" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV" id="bm_id9220557" localize="false"/>
 <paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="3">Abbreviations (no subsequent capital)</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV">Type an abbreviation followed by a period, and then click <emph>New</emph>. This prevents $[officename] from automatically capitalizing the first letter of the word that comes after the period at the end of the abbreviation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV" id="bm_id3150444" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCORR_EXCEPT_LB_ABBREV" id="bm_id1217383" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV" id="bm_id1217383" localize="false"/>
 <paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV">Lists the abbreviations that are not automatically corrected.</ahelp> To remove an item from the list, select the item, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS" id="bm_id3166410" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_DOUBLE_CAPS" id="bm_id4391613" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS" id="bm_id4391613" localize="false"/>
 <paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="6">Words with TWo INitial CApitals</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS">Type the word or abbreviation that starts with two capital letters that you do not want $[officename] to change to one initial capital. For example, enter PC to prevent $[officename] from changing PC to Pc.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS" id="bm_id3153827" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCORR_EXCEPT_LB_DOUBLE_CAPS" id="bm_id8192083" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS" id="bm_id8192083" localize="false"/>
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS">Lists the words or abbreviations that start with two initial capitals that are not automatically corrected. All words which start with two capital letters are listed in the field.</ahelp> To remove an item from the list, select the item, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV" id="bm_id3157909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS" id="bm_id3153717" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWABBREV" id="bm_id7159031" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWDOUBLECAPS" id="bm_id2211066" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV" id="bm_id7159031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS" id="bm_id2211066" localize="false"/>
 <paragraph role="heading" id="hd_id3155503" xml-lang="en-US" level="3" l10n="U" oldref="8">New</paragraph>
 <paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS">Adds the current entry to the list of exceptions.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV" id="bm_id3152909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS" id="bm_id3155179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOABBREV" id="bm_id8066347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOCAPS" id="bm_id6384777" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV -->
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV" id="bm_id8066347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS" id="bm_id6384777" localize="false"/>
 <paragraph role="heading" id="hd_id3149762" xml-lang="en-US" level="3" l10n="U" oldref="10">AutoInclude</paragraph>
 <paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS">Automatically adds abbreviations or words that start with two capital letters to the corresponding list of exceptions. This feature only works if the <emph>Correct TWo INitial CApitals</emph> option or the Capitalize<emph> first letter of every sentence</emph> option are selected in the <emph>[T]</emph> column on<link href="text/shared/01/06040100.xhp" name="Options"><emph>Options</emph></link> tab of this dialog. </ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp
index 33db44e9c7..f1009ca3b6 100755
--- a/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/helpcontent2/source/text/shared/01/06040400.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,11 +29,11 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106040400xml" indexer="include">
-<title id="tit" xml-lang="en-US">Custom Quotes</title>
+<title id="tit" xml-lang="en-US">Localized Options</title>
 <filename>/text/shared/01/06040400.xhp</filename>
 </topic>
 </meta>
@@ -45,37 +42,52 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153899"><bookmark_value>quotes; custom</bookmark_value>
 <bookmark_value>custom quotes</bookmark_value>
 <bookmark_value>AutoCorrect function; quotes</bookmark_value>
+<bookmark_value>replacing;ordinal numbers</bookmark_value>
+<bookmark_value>ordinal numbers;replacing</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks in your document.</paragraph>
+<comment>renamed tab page from Custom Quotes to Localized Options, cws cbosdo01</comment>
+<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Localized Options">Localized Options</link></paragraph>
+<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks and for options that are specific to the language of the text.</paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_QUOTE_SW_CLB" id="bm_id59906552" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id31537173" role="paragraph" l10n="NEW"><ahelp hid=".">Select to apply the replacements while you type [T], or when you modify existing text [M].</ahelp></paragraph>
+
+<comment>new feature, cws cbosdo01. http://wiki.services.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)</comment>
+<paragraph xml-lang="en-US" id="hd_id3159300" role="heading" level="2" l10n="U" oldref="25">Add non breaking space before specific punctuation marks in French text</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U" oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada).</paragraph>
+
+<comment>moved two paras from 06040100.xhp, cws cbosdo01</comment>
+<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="2" l10n="U" oldref="25">Format ordinal number suffixes (1st ... 1^st)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1^st.</paragraph>
+
+
 <paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="17">Single quotes / Double quotes</paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="18">Specify the replacement characters to use for single or double quotation marks.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO" id="bm_id3159194" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Checkbox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_SGL_TYPO" id="bm_id5906552" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_TYPO" id="bm_id4584795" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO -->
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO -->
+<bookmark xml-lang="en-US" branch="hid/cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO" id="bm_id5906552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO" id="bm_id4584795" localize="false"/>
 <paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="22">Replace</paragraph>
 <paragraph role="paragraph" id="par_id3155616" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO">Automatically replaces the default system symbol for single quotation marks with the special character that you specify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE" id="bm_id3147250" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE" id="bm_id3147043" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STARTQUOTE" id="bm_id6259651" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_STARTQUOTE" id="bm_id7007354" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE" id="bm_id6259651" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE" id="bm_id7007354" localize="false"/>
 <paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="3" l10n="U" oldref="11">Start quote</paragraph>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current opening quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE" id="bm_id3147576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE" id="bm_id3155942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_ENDQUOTE" id="bm_id6449476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_ENDQUOTE" id="bm_id6838282" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE" id="bm_id6449476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE" id="bm_id6838282" localize="false"/>
 <paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="3" l10n="U" oldref="13">End quote</paragraph>
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current closing quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD" id="bm_id3157863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD" id="bm_id3153682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STD" id="bm_id4603106" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_DBL_STD" id="bm_id3145542" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD" id="bm_id4603106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD" id="bm_id3145542" localize="false"/>
 <paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="19">Default</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD">Resets the quotation marks to the default symbols.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06040500.xhp b/helpcontent2/source/text/shared/01/06040500.xhp
index 4f94b681ce..69a3c7681a 100755
--- a/helpcontent2/source/text/shared/01/06040500.xhp
+++ b/helpcontent2/source/text/shared/01/06040500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06040600.xhp b/helpcontent2/source/text/shared/01/06040600.xhp
index e1276232b7..3c3141cc9e 100644
--- a/helpcontent2/source/text/shared/01/06040600.xhp
+++ b/helpcontent2/source/text/shared/01/06040600.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06040600.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,61 +31,84 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0106040600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Word Completion</title>
-<filename>/text/shared/01/06040600.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="worterg">
-<paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="92"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
-<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U" oldref="93">Set the options for completing frequently occurring words while you type.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#autokoworterg"/>
-</section>
+      <topic id="textshared0106040600xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Word Completion</title>
+         <filename>/text/shared/01/06040600.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="worterg">
+         <paragraph xml-lang="en-US" id="hd_id3148882" role="heading" level="1" l10n="U"
+                    oldref="92"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153624" role="paragraph" l10n="U" oldref="93">Set the options for completing frequently occurring words while you type.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#autokoworterg"/>
+      </section>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV" id="bm_id3147620" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_ACTIV" id="bm_id4897915" localize="false"/><paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="3" l10n="U" oldref="94">Enable word completion</paragraph>
-<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV">Stores frequently used words, and automatically completes a word after you type three letters that match the first three letters of a stored word.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE" id="bm_id3153258" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE" id="bm_id6168401" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="100">Append space</paragraph>
-<paragraph role="paragraph" id="par_id3153700" xml-lang="en-US" l10n="U" oldref="101"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE">If you do not add punctuation after the word, $[officename] adds a space.</ahelp> The space is added as soon as you begin typing the next word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP" id="bm_id3159256" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_AS_TIP" id="bm_id668355" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="102">Show as tip</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="103"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP">Displays the completed word as a Help Tip.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT" id="bm_id3150244" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_COLLECT" id="bm_id2998138" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="96">Collect words</paragraph>
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="97"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT">Adds the frequently used words to a list. To remove a word from the Word Completion list, select the word, and then click<emph> Delete Entry</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST" id="bm_id3159344" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST" id="bm_id9715262" localize="false"/><paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="98">When closing a document, save the list for later use in other documents</paragraph>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="CHG" oldref="99"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST">Makes the current Word Completion list available to other documents after you close the current document. The list remains available until you exit %PRODUCTNAME.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY" id="bm_id3152349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY" id="bm_id3945738" localize="false"/><paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="3" l10n="U" oldref="104">Accept with</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY">Select the key that you want to use to accept the automatic word completion.</ahelp></paragraph>
-<paragraph role="tip" id="par_idN106F8" xml-lang="en-US" l10n="NEW">Press Esc to decline the word completion.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN" id="bm_id3155922" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN" id="bm_id7839594" localize="false"/><paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="84">Min. word length</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="CHG" oldref="85"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN">Enter the minimum word length for a word to become eligible for the word completion feature.</ahelp><comment>UFI: changed due to BH phone call.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES" id="bm_id3145069" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES" id="bm_id3337199" localize="false"/><paragraph role="heading" id="hd_id3154758" xml-lang="en-US" level="3" l10n="U" oldref="86">Max. entries</paragraph>
-<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES">Enter the maximum number of words that you want to store in the Word Completion list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES" id="bm_id3148756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES" id="bm_id6878566" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="106">Word Completion list</paragraph>
-<paragraph role="paragraph" id="par_id3152773" xml-lang="en-US" l10n="CHG" oldref="107"><ahelp hid="OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES">Lists the collected words. The list is valid until you close the current document. To make the list available to other documents in the current session, select "<emph>When closing a document, save the list for later use in other documents</emph>".</ahelp></paragraph>
-<paragraph role="note" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="112">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_PB_ENTRIES" id="bm_id6572161" localize="false"/><paragraph role="heading" id="hd_id3144434" xml-lang="en-US" level="3" l10n="U" oldref="110">Delete Entry</paragraph>
-<paragraph role="paragraph" id="par_id3153351" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES">Removes the selected word or words from the Word Completion list.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV" id="bm_id4897915" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="2" l10n="U"
+                 oldref="94">Enable word completion</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="95"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV">Stores frequently used words, and automatically completes a word after you type three letters that match the first three letters of a stored word.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE" id="bm_id6168401" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150978" role="heading" level="2" l10n="U"
+                 oldref="100">Append space</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153700" role="paragraph" l10n="U" oldref="101"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE">If you do not add punctuation after the word, $[officename] adds a space.</ahelp> The space is added as soon as you begin typing the next word.</paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP" id="bm_id668355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U"
+                 oldref="102">Show as tip</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="U" oldref="103"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP">Displays the completed word as a Help Tip.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT" id="bm_id2998138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+                 oldref="96">Collect words</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="U" oldref="97"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT">Adds the frequently used words to a list. To remove a word from the Word Completion list, select the word, and then click<emph> Delete Entry</emph>.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST -->
+<!-- removed HID svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST" id="bm_id29981338" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156193" role="heading" level="2" l10n="CHG"
+                 oldref="98">When closing a document, remove the words collected from it from the list</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="CHG" oldref="99"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST">When enabled, the list gets cleared when closing the current document. When disabled, makes the current Word Completion list available to other documents after you close the current document. The list remains available until you exit %PRODUCTNAME.</ahelp></paragraph>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY" id="bm_id3945738" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149580" role="heading" level="2" l10n="U"
+                 oldref="104">Accept with</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153061" role="paragraph" l10n="U" oldref="105"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY">Select the key that you want to use to accept the automatic word completion.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106F8" role="tip" l10n="NEW">Press Esc to decline the word completion.</paragraph>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN" id="bm_id7839594" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="2" l10n="U"
+                 oldref="84">Min. word length</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145609" role="paragraph" l10n="CHG" oldref="85"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN">Enter the minimum word length for a word to become eligible for the word completion feature.</ahelp><comment>UFI: changed due to BH phone call.</comment></paragraph>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES" id="bm_id3337199" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154758" role="heading" level="2" l10n="U"
+                 oldref="86">Max. entries</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159414" role="paragraph" l10n="U" oldref="87"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES">Enter the maximum number of words that you want to store in the Word Completion list.</ahelp></paragraph>
+<!-- removed HID OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES" id="bm_id6878566" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147265" role="heading" level="2" l10n="U"
+                 oldref="106">Word Completion list</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152773" role="paragraph" l10n="CHG" oldref="107"><ahelp hid="OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES">Lists the collected words. The list is valid until you close the current document. To make the list available to other documents in the current session, disable "When closing a document, remove the words collected from it from the list".</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156423" role="note" l10n="U" oldref="112">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES" id="bm_id6572161" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144434" role="heading" level="2" l10n="U"
+                 oldref="110">Delete Entry</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153351" role="paragraph" l10n="U" oldref="111"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES">Removes the selected word or words from the Word Completion list.</ahelp></paragraph>
 <switch select="appl">
-<case select="WRITER"><section id="relatedtopics">
-<embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
-</section>
+<case select="WRITER">
+<section id="relatedtopics">
+         <embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
+      </section>
 </case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06040700.xhp b/helpcontent2/source/text/shared/01/06040700.xhp
index 38793efe2d..f9810b9dfd 100644
--- a/helpcontent2/source/text/shared/01/06040700.xhp
+++ b/helpcontent2/source/text/shared/01/06040700.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040700.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,11 +49,11 @@
   <embed href="text/shared/00/00000406.xhp#autokosmarttags"/>
 </section>
 <embed href="text/swriter/guide/smarttags.xhp#smarttags"/>
-<bookmark xml-lang="en-US" branch="hid/809256156" id="bm_id8832056" localize="false"/><paragraph role="heading" id="hd_id686666" xml-lang="en-US" level="2" l10n="NEW">Label text with smart tags</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS" id="bm_id8832056" localize="false"/><paragraph role="heading" id="hd_id686666" xml-lang="en-US" level="2" l10n="NEW">Label text with smart tags</paragraph>
 <paragraph role="paragraph" id="par_id3259376" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables Smart Tags to be evaluated and shown in your text document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id4024170" xml-lang="en-US" level="2" l10n="NEW">Currently installed smart tags</paragraph>
 <paragraph role="paragraph" id="par_id2847071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all installed Smart Tags. To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809259743" id="bm_id9547410" localize="false"/><paragraph role="heading" id="hd_id8424329" xml-lang="en-US" level="2" l10n="NEW">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS" id="bm_id9547410" localize="false"/><paragraph role="heading" id="hd_id8424329" xml-lang="en-US" level="2" l10n="NEW">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3912167" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06050000.xhp b/helpcontent2/source/text/shared/01/06050000.xhp
index 93cb1e7957..b7c04f9bcf 100644
--- a/helpcontent2/source/text/shared/01/06050000.xhp
+++ b/helpcontent2/source/text/shared/01/06050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,8 @@
 <embed href="text/shared/01/06050100.xhp#bullets"/>
 <embed href="text/shared/01/06050200.xhp#numerierungsart"/>
 <embed href="text/shared/01/06050300.xhp#numerierung"/>
-<embed href="text/shared/01/06050600.xhp#position"/>
+<embed href="text/shared/01/06050400.xhp#graphics"/>
+<embed href="text/shared/01/06050600.xhp#position_s"/>
 <embed href="text/shared/01/06050500.xhp#optionen"/>
 <bookmark xml-lang="en-US" branch="hid/HID_NUM_RESET" id="bm_id3152996" localize="false"/>
 <paragraph role="heading" id="hd_id3154984" xml-lang="en-US" level="2" l10n="U" oldref="27"><switchinline select="appl"><caseinline select="WRITER">Remove 
diff --git a/helpcontent2/source/text/shared/01/06050100.xhp b/helpcontent2/source/text/shared/01/06050100.xhp
index 8f757e2af4..dafe85e4ec 100755
--- a/helpcontent2/source/text/shared/01/06050100.xhp
+++ b/helpcontent2/source/text/shared/01/06050100.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,35 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Bullets</title>
-<filename>/text/shared/01/06050100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-22T10:38:33">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="bullets">
+      <topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Bullets</title>
+         <filename>/text/shared/01/06050100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="bullets">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>bullets;paragraphs</bookmark_value>
-<bookmark_value>paragraphs; inserting bullets</bookmark_value>
-<bookmark_value>inserting; paragraph bullets</bookmark_value>
+         <bookmark_value>paragraphs; inserting bullets</bookmark_value>
+         <bookmark_value>inserting; paragraph bullets</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
-<paragraph role="paragraph" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#numbullets"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150502" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0202200910514673" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#numbullets"/>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_VALUESET_BULLET" id="bm_id3145629" localize="false"/>
-<paragraph role="heading" id="hd_id3153255" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153255" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050200.xhp b/helpcontent2/source/text/shared/01/06050200.xhp
index 1b0d268cd4..2269e78fe0 100755
--- a/helpcontent2/source/text/shared/01/06050200.xhp
+++ b/helpcontent2/source/text/shared/01/06050200.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,38 +27,31 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Numbering Style</title>
-<filename>/text/shared/01/06050200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-24T14:40:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="numerierungsart">
-<paragraph role="heading" id="hd_id3146807" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
-</section>
+      <topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Numbering Style</title>
+         <filename>/text/shared/01/06050200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="numerierungsart">
+         <paragraph xml-lang="en-US" id="hd_id3146807" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148765" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_VALUESET_SINGLENUM" id="bm_id3153255" localize="false"/>
-<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147000" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152918" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050300.xhp b/helpcontent2/source/text/shared/01/06050300.xhp
index 7a6219b3ca..6d0205ff62 100755
--- a/helpcontent2/source/text/shared/01/06050300.xhp
+++ b/helpcontent2/source/text/shared/01/06050300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06050400.xhp b/helpcontent2/source/text/shared/01/06050400.xhp
new file mode 100755
index 0000000000..3c71a2e8b8
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/06050400.xhp
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+ 
+	
+<meta>
+      <topic id="textshared0106050400xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Graphics</title>
+         <filename>/text/shared/01/06050400.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="graphics">
+         <paragraph xml-lang="en-US" id="hd_id0611200904373284" role="heading" level="1" l10n="NEW"><link href="text/shared/01/06050400.xhp" name="Graphics">Graphics</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0611200904373226" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the different graphics that you can use as bullets in a bulleted list.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#graphics"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_NUMBMP" id="bm_id0611200904382857" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0611200904361573" role="heading" level="2" l10n="NEW">Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id061120090436150" role="paragraph" l10n="NEW"><ahelp hid=".">Click the graphics that you want to use as bullets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED" id="bm_id0611200904355924" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id061120090436157" role="heading" level="2" l10n="NEW">Link graphics</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0611200904361575" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the graphics are inserted as links. If not enabled, the graphics are embedded into the document.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id061120090437338" role="paragraph" l10n="NEW"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0611200904373391" role="paragraph" l10n="NEW"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050500.xhp b/helpcontent2/source/text/shared/01/06050500.xhp
index 2389b2ff12..9a7f86c7b1 100755
--- a/helpcontent2/source/text/shared/01/06050500.xhp
+++ b/helpcontent2/source/text/shared/01/06050500.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050500.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,205 +27,215 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0106050500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/01/06050500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T15:01:58">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+      <topic id="textshared0106050500xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Options</title>
+         <filename>/text/shared/01/06050500.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="optionen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id4096499"><bookmark_value>numbering;options</bookmark_value>
-<bookmark_value>bullet lists; formatting options</bookmark_value>
-<bookmark_value>font sizes;bullets</bookmark_value>
+         <bookmark_value>bullet lists; formatting options</bookmark_value>
+         <bookmark_value>font sizes;bullets</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147240" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050500.xhp" name="Options">Options</link><comment>UFI: new name Customize Bullets and Numbering, tab page Options</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="2">Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#numoptionen"/>
-</section>
-<paragraph role="heading" id="hd_id3155069" xml-lang="en-US" level="2" l10n="U" oldref="6">Format</paragraph>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="U" oldref="61">Select the level(s) that you want to modify, and then specify the formatting that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL" id="bm_id3150040" localize="false"/>
-<paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="2" l10n="U" oldref="4">Level</paragraph>
-<paragraph role="paragraph" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL">Select the level(s) that you want to define the formatting options for.</ahelp> The selected level is highlighted in the preview.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT" id="bm_id3150789" localize="false"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="3" l10n="U" oldref="9">Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT">Select a numbering style for the selected levels.</ahelp></paragraph>
-<table id="tbl_id3145090">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="62">Selection</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="63">Description</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="72">1, 2, 3, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="73">Arabic numerals</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="64">A, B, C, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="65">Capital letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="66">a, b, c, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="67">Lowercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="68">I, II, III, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="69">Roman numerals (uppercase)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="70">i, ii, iii, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159344" xml-lang="en-US" l10n="U" oldref="71">Roman numerals (lowercase)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="100">A,... AA,... AAA,...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154579" xml-lang="en-US" l10n="U" oldref="101">Alphabetical numbering with uppercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="102">a,... aa,... aaa,...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159167" xml-lang="en-US" l10n="U" oldref="103">Alphabetical numbering with lowercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153062" xml-lang="en-US" l10n="U" oldref="76">Bullet</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="U" oldref="77">Adds a bullet to the beginning of a line. Select this option, and then click the <emph>Character</emph> button to choose a bullet style.</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="appl"><caseinline select="WRITER">Bullets are resized to fit the current line height. If you want, you can define a Character Style that uses a different font size for bullets. 
+<paragraph xml-lang="en-US" id="hd_id3147240" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050500.xhp" name="Options">Options</link><comment>UFI: new name Customize Bullets and Numbering, tab page Options</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147212" role="paragraph" l10n="U" oldref="2">Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#numoptionen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3155069" role="heading" level="2" l10n="U" oldref="6">Format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153255" role="paragraph" l10n="U" oldref="61">Select the level(s) that you want to modify, and then specify the formatting that you want to use.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL" id="bm_id3150040" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153089" role="heading" level="2" l10n="U" oldref="4">Level</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153935" role="paragraph" l10n="U" oldref="5"><ahelp hid="SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL">Select the level(s) that you want to define the formatting options for.</ahelp> The selected level is highlighted in the preview.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT" id="bm_id3150789" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="3" l10n="U" oldref="9">Numbering</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT">Select a numbering style for the selected levels.</ahelp></paragraph>
+      <table id="tbl_id3145090">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148548" role="paragraph" l10n="U" oldref="62">Selection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155391" role="paragraph" l10n="U" oldref="63">Description</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" l10n="U" oldref="72">1, 2, 3, ...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="73">Arabic numerals</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150693" role="paragraph" l10n="U" oldref="64">A, B, C, ...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156347" role="paragraph" l10n="U" oldref="65">Capital letters</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="66">a, b, c, ...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156327" role="paragraph" l10n="U" oldref="67">Lowercase letters</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="68">I, II, III, ...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154143" role="paragraph" l10n="U" oldref="69">Roman numerals (uppercase)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148474" role="paragraph" l10n="U" oldref="70">i, ii, iii, ...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159344" role="paragraph" l10n="U" oldref="71">Roman numerals (lowercase)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="100">A,... AA,... AAA,...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154579" role="paragraph" l10n="U" oldref="101">Alphabetical numbering with uppercase letters</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147620" role="paragraph" l10n="U" oldref="102">a,... aa,... aaa,...</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159167" role="paragraph" l10n="U" oldref="103">Alphabetical numbering with lowercase letters</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153062" role="paragraph" l10n="U" oldref="76">Bullet</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="U" oldref="77">Adds a bullet to the beginning of a line. Select this option, and then click the <emph>Character</emph> button to choose a bullet style.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="94"><switchinline select="appl"><caseinline select="WRITER">Bullets are resized to fit the current line height. If you want, you can define a Character Style that uses a different font size for bullets. 
 </caseinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="79">Graphics</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157817" xml-lang="en-US" l10n="U" oldref="80">Displays an image for the bullet. Select this options, and then click <emph>Select</emph> to locate the image file that you want to use.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="U" oldref="110">Linked graphics</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="111">Links the image to the current file. To embed the image in the current file, clear this checkbox.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148452" xml-lang="en-US" l10n="U" oldref="74">None</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="75">Does not apply a numbering style.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="U" oldref="79">Graphics</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157817" role="paragraph" l10n="U" oldref="80">Displays an image for the bullet. Select this option, and then click <emph>Select</emph> to locate the image file that you want to use. The image gets embedded into the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149649" role="paragraph" l10n="U" oldref="110">Linked graphics</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151210" role="paragraph" l10n="U" oldref="111">Displays an image for the bullet. Select this option, and then click <emph>Select</emph> to locate the image file that you want to use. The image gets inserted as a link to the image file.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148452" role="paragraph" l10n="U" oldref="74">None</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149167" role="paragraph" l10n="U" oldref="75">Does not apply a numbering style.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3145746" xml-lang="en-US" l10n="U" oldref="95">The availability of the following fields depends on the style that you select in the <emph>Numbering </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX" id="bm_id3145318" localize="false"/>
-<paragraph role="heading" id="hd_id3156293" xml-lang="en-US" level="3" l10n="U" oldref="7">Before</paragraph>
-<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX">Enter a character or the text to display in front of the number in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX" id="bm_id3152933" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="78">After</paragraph>
-<paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX">Enter a character or the text to display behind the number in the list. If you want to create a numbered list that uses the style "1.)", enter ".)" in this box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT" id="bm_id3151380" localize="false"/>
-<paragraph role="heading" id="hd_id3156423" xml-lang="en-US" level="3" l10n="U" oldref="29"><switchinline select="appl"><caseinline select="WRITER">Character Styles 
+      <paragraph xml-lang="en-US" id="par_id3145746" role="paragraph" l10n="U" oldref="95">The availability of the following fields depends on the style that you select in the <emph>Numbering </emph>box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX" id="bm_id3145318" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156293" role="heading" level="3" l10n="U" oldref="7">Before</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150393" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX">Enter a character or the text to display in front of the number in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX" id="bm_id3152933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="U"
+                 oldref="78">After</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150288" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX">Enter a character or the text to display behind the number in the list. If you want to create a numbered list that uses the style "1.)", enter ".)" in this box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156423" role="heading" level="3" l10n="U"
+                 oldref="29"><switchinline select="appl"><caseinline select="WRITER">Character Styles 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT">Select the Character Style that you want to use in the numbered list.</ahelp> To create or edit a <link href="text/swriter/01/05130002.xhp" name="Character Style">Character Style</link>, open the <emph>Styles and Formatting</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>. 
+      <paragraph xml-lang="en-US" id="par_id3150495" role="paragraph" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT">Select the Character Style that you want to use in the numbered list.</ahelp> To create or edit a <link href="text/swriter/01/05130002.xhp" name="Character Style">Character Style</link>, open the <emph>Styles and Formatting</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL" id="bm_id3153768" localize="false"/>
-<paragraph role="heading" id="hd_id3147299" xml-lang="en-US" level="3" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">Show sublevels 
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL" id="bm_id3153768" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147299" role="heading" level="3" l10n="U"
+                 oldref="31"><switchinline select="appl"><caseinline select="WRITER">Show sublevels 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152881" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL">Enter the number of previous levels to include in the numbering style. For example, if you enter "2" and the previous level uses the "A, B, C..." numbering style, the numbering scheme for the current level becomes: "A.1".</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3152881" role="paragraph" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL">Enter the number of previous levels to include in the numbering style. For example, if you enter "2" and the previous level uses the "A, B, C..." numbering style, the numbering scheme for the current level becomes: "A.1".</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START" id="bm_id3157895" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="33">Start at</paragraph>
-<paragraph role="paragraph" id="par_id3146903" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START">Enter a new starting number for the current level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR" id="bm_id3153726" localize="false"/>
-<paragraph role="heading" id="hd_id3145114" xml-lang="en-US" level="3" l10n="U" oldref="104"><switchinline select="appl"><caseinline select="IMPRESS">Color 
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START" id="bm_id3157895" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155429" role="heading" level="3" l10n="U"
+                 oldref="33">Start at</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146903" role="paragraph" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START">Enter a new starting number for the current level.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR" id="bm_id3153726" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145114" role="heading" level="3" l10n="U"
+                 oldref="104"><switchinline select="appl"><caseinline select="IMPRESS">Color 
 </caseinline><caseinline select="DRAW">Color 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="appl"><caseinline select="WRITER">
+      <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="105"><switchinline select="appl"><caseinline select="WRITER">
 </caseinline><caseinline select="CALC">
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR">Select a color for the current numbering style.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE" id="bm_id3161659" localize="false"/>
-<paragraph role="heading" id="hd_id3159180" xml-lang="en-US" level="3" l10n="U" oldref="107"><switchinline select="appl"><caseinline select="IMPRESS">Relative size 
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE" id="bm_id3161659" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159180" role="heading" level="3" l10n="U"
+                 oldref="107"><switchinline select="appl"><caseinline select="IMPRESS">Relative size 
 </caseinline><caseinline select="DRAW">Relative size 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="108"><switchinline select="appl"><caseinline select="WRITER">
+      <paragraph xml-lang="en-US" id="par_id3145364" role="paragraph" l10n="U" oldref="108"><switchinline select="appl"><caseinline select="WRITER">
 </caseinline><caseinline select="CALC">
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE">Enter the amount by which you want to resize the bullet character with respect to the font height of the current paragraph.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET" id="bm_id3153363" localize="false"/>
-<paragraph role="heading" id="hd_id3147444" xml-lang="en-US" level="3" l10n="U" oldref="81">Character</paragraph>
-<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET">Opens the <link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link> dialog, where you can select a bullet symbol.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147327" xml-lang="en-US" level="3" l10n="U" oldref="83">Options for graphics:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP" id="bm_id3153954" localize="false"/>
-<paragraph role="heading" id="hd_id3149934" xml-lang="en-US" level="3" l10n="U" oldref="84">Select...</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP">Select the graphic, or locate the graphic file that you want to use as a bullet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH" id="bm_id3147426" localize="false"/>
-<paragraph role="heading" id="hd_id3155746" xml-lang="en-US" level="3" l10n="U" oldref="86">Width</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH">Enter a width for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT" id="bm_id3146986" localize="false"/>
-<paragraph role="heading" id="hd_id3150487" xml-lang="en-US" level="3" l10n="U" oldref="88">Height</paragraph>
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT">Enter a height for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO" id="bm_id3152880" localize="false"/>
-<paragraph role="heading" id="hd_id3153740" xml-lang="en-US" level="3" l10n="U" oldref="92">Keep ratio</paragraph>
-<paragraph role="paragraph" id="par_id3153097" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO">Maintains the size proportions of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT" id="bm_id3149410" localize="false"/>
-<paragraph role="heading" id="hd_id3147382" xml-lang="en-US" level="3" l10n="U" oldref="90">Alignment</paragraph>
-<paragraph role="paragraph" id="par_id3147127" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT">Select the alignment option for the graphic.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145596" xml-lang="en-US" level="2" l10n="U" oldref="96"><switchinline select="appl"><caseinline select="WRITER">All levels 
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET" id="bm_id3153363" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147444" role="heading" level="3" l10n="U"
+                 oldref="81">Character</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153144" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET">Opens the <link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link> dialog, where you can select a bullet symbol.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147327" role="heading" level="3" l10n="U"
+                 oldref="83">Options for graphics:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149934" role="heading" level="3" l10n="U"
+                 oldref="84">Select...</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152417" role="paragraph" l10n="U" oldref="85"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP">Select the graphic, or locate the graphic file that you want to use as a bullet.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH" id="bm_id3147426" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155746" role="heading" level="3" l10n="U"
+                 oldref="86">Width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="87"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH">Enter a width for the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT" id="bm_id3146986" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150487" role="heading" level="3" l10n="U"
+                 oldref="88">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154640" role="paragraph" l10n="U" oldref="89"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT">Enter a height for the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO" id="bm_id3152880" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153740" role="heading" level="3" l10n="U"
+                 oldref="92">Keep ratio</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153097" role="paragraph" l10n="U" oldref="93"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO">Maintains the size proportions of the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT" id="bm_id3149410" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147382" role="heading" level="3" l10n="U"
+                 oldref="90">Alignment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147127" role="paragraph" l10n="U" oldref="91"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT">Select the alignment option for the graphic.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145596" role="heading" level="2" l10n="U"
+                 oldref="96"><switchinline select="appl"><caseinline select="WRITER">All levels 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="97"><switchinline select="appl"><caseinline select="WRITER">Set the numbering options for all of the levels. 
+      <paragraph xml-lang="en-US" id="par_id3148455" role="paragraph" l10n="U" oldref="97"><switchinline select="appl"><caseinline select="WRITER">Set the numbering options for all of the levels. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL" id="bm_id3153052" localize="false"/>
-<paragraph role="heading" id="hd_id3155852" xml-lang="en-US" level="3" l10n="U" oldref="98"><switchinline select="appl"><caseinline select="WRITER">Consecutive numbering 
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL" id="bm_id3153052" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155852" role="heading" level="3" l10n="U"
+                 oldref="98"><switchinline select="appl"><caseinline select="WRITER">Consecutive numbering 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148880" xml-lang="en-US" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL">Increases the numbering by one as you go down each level in the list hierarchy.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3148880" role="paragraph" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL">Increases the numbering by one as you go down each level in the list hierarchy.</ahelp>
 </caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050600.xhp b/helpcontent2/source/text/shared/01/06050600.xhp
index 5d50012a57..cbc5ef6106 100644
--- a/helpcontent2/source/text/shared/01/06050600.xhp
+++ b/helpcontent2/source/text/shared/01/06050600.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06050600.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106050600xml" indexer="include">
 <title id="tit" xml-lang="en-US">Position</title>
@@ -41,7 +38,7 @@
 </topic>
 </meta>
 <body>
-<section id="position">
+<section id="position_s">
 <paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
 <paragraph role="paragraph" id="par_id3158397" xml-lang="en-US" l10n="U" oldref="2">Sets the indent, spacing, and alignment options for the numbered or bulleted list.</paragraph>
 </section><comment>do we have a how-to for numbering/bullets/outlines with/without styles? seems we really need one</comment>
@@ -49,49 +46,49 @@
 <embed href="text/shared/00/00040500.xhp#numposition"/>
 </section>
 <paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".<comment>see http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
 <paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
 <paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL">Select the level(s) that you want to modify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_LABEL_FOLLOWED_BY" id="bm_id7650990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY" id="bm_id7650990" localize="false"/>
 <paragraph role="heading" id="hd_id6561784" xml-lang="en-US" level="2" l10n="NEW">Numbering followed by</paragraph>
 <paragraph role="paragraph" id="par_id423291" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the element that will follow the numbering: a tab stop, a space, or nothing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_LISTTAB" id="bm_id3496810" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB" id="bm_id3496810" localize="false"/>
 <paragraph role="heading" id="hd_id7809686" xml-lang="en-US" level="3" l10n="NEW">at</paragraph>
 <paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN" id="bm_id3151246" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN" id="bm_id3151245" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN_2" id="bm_id5262611" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN" id="bm_id3151246" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUM_POSITION:LB_ALIGN" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2" id="bm_id5262611" localize="false"/>
 <paragraph role="heading" id="hd_id3155583" xml-lang="en-US" level="2" l10n="U" oldref="5">Numbering alignment</paragraph>
 <paragraph role="paragraph" id="par_id3153063" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</ahelp></paragraph>
 <paragraph role="note" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="22">The <emph>Numbering alignment</emph> option does not set the alignment of the paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_ALIGNED_AT" id="bm_id8847621" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT" id="bm_id8847621" localize="false"/>
 <paragraph role="heading" id="hd_id1619617" xml-lang="en-US" level="2" l10n="NEW">Aligned at</paragraph>
 <paragraph role="paragraph" id="par_id1015655" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the distance from the left page margin at which the numbering symbol will be aligned.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_INDENT_AT" id="bm_id1841792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT" id="bm_id1841792" localize="false"/>
 <paragraph role="heading" id="hd_id2336191" xml-lang="en-US" level="2" l10n="NEW">Indent at</paragraph>
 <paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the distance from the left page margin to the start of all lines in the numbered paragraph that follow the first line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST" id="bm_id3153032" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST" id="bm_id3155830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST" id="bm_id3153032" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST" id="bm_id3155830" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id1336405" localize="false"/>
 <paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="2" l10n="U" oldref="9">Indent</paragraph>
 <paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering symbol. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE" id="bm_id3149166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE" id="bm_id3149164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE" id="bm_id3149166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE" id="bm_id3149164" localize="false"/>
 <paragraph role="heading" id="hd_id3155179" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
 <paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE">Indents the current level relative to the previous level in the list hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_INDENT" id="bm_id3153349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT" id="bm_id3153348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT" id="bm_id3153349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id3153348" localize="false"/>
 <paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="2" l10n="CHG" oldref="28">Width of numbering<comment>i85347</comment></paragraph>
 <paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT">Enter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
-<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text 
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
+<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147574" xml-lang="en-US" l10n="CHG" oldref="18"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST">Enter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text.</ahelp>
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD" id="bm_id3154138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_NUM_POSITION:PB_STANDARD" id="bm_id3151211" localize="false"/>
 <paragraph role="heading" id="hd_id3154367" xml-lang="en-US" level="2" l10n="U" oldref="10">Default</paragraph>
 <paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD">Resets the indent and the spacing values to the default values.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/06130000.xhp b/helpcontent2/source/text/shared/01/06130000.xhp
index 41b0bbfc52..2ae3be4b65 100644
--- a/helpcontent2/source/text/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/shared/01/06130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 <embed href="text/shared/00/00000406.xhp#makro"/>
 </section>
 <embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME" id="bm_id3155351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME" id="bm_id3155351" localize="false"/>
 <paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
 <paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME">Displays the name of the selected macro. To create or to change the name of a macro, enter a name here.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/>
@@ -59,28 +56,28 @@
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/>
 <paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_BASICIDE_LIBS">Lists the libraries and the modules where you can open or save your macros. To save a macro with a particular document, open the document, and then open this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN" id="bm_id3147577" localize="false"/>
 <paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN">Runs or saves the current macro.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN" id="bm_id3150694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN" id="bm_id3150694" localize="false"/>
 <paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
 <paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN">Opens the <link href="text/shared/01/06140000.xhp" name="Customize">Customize</link> dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT" id="bm_id3147276" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT" id="bm_id5118869" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT" id="bm_id3147276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT" id="bm_id5118869" localize="false"/>
 <paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT">Starts the $[officename] Basic editor and opens the selected macro or dialog for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL" id="bm_id3155390" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL" id="bm_id3155390" localize="false"/>
 <paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="CHG" oldref="20">To create a new macro, select the "Standard" module in the <emph>Macro from</emph> list, and then click <emph>New</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="21">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB" id="bm_id3152910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB" id="bm_id3152910" localize="false"/>
 <paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB">Saves the recorded macro in a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD" id="bm_id3155262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD" id="bm_id3155262" localize="false"/>
 <paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
 <paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD">Saves the recorded macro in a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG" id="bm_id3150118" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG" id="bm_id3150118" localize="false"/>
 <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Module/Dialog tab page</paragraph>
@@ -88,40 +85,40 @@
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/>
 <paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
 <paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT" id="bm_id3153779" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT" id="bm_id3153779" localize="false"/>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT">Opens the selected macro or dialog for editing.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD" id="bm_id3156080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD" id="bm_id3156080" localize="false"/>
 <paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New<comment>UFI: i40875</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD">Opens the editor and creates a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG" id="bm_id3150496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG" id="bm_id5659047" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG" id="bm_id3150496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG" id="bm_id5659047" localize="false"/>
 <paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="3" l10n="CHG" oldref="39">New</paragraph>
 <paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="CHG" oldref="40"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG">Opens the editor and creates a new dialog.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
 <paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="3" l10n="U" oldref="42">Libraries tab page</paragraph><comment>the three tab pages have no Help button, so no need to have three help pages</comment>
 <paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS" id="bm_id3150650" localize="false"/>
 <paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="CHG" oldref="44">Location</paragraph>
 <paragraph role="paragraph" id="par_id3150290" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS">Select the application or the document containing the macro libraries that you want to organize.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS_TREE" id="bm_id3154910" localize="false"/>
 <paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="46">Library</paragraph>
 <paragraph role="paragraph" id="par_id3147500" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_BASICIDE_LIBS_TREE">Lists the existing macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT" id="bm_id3156212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT" id="bm_id3156212" localize="false"/>
 <paragraph role="heading" id="hd_id3157320" xml-lang="en-US" level="3" l10n="U" oldref="48">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT">Opens the $[officename] Basic editor so that you can modify the selected library.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD" id="bm_id3148561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD" id="bm_id3148561" localize="false"/>
 <paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="50">Password</paragraph>
 <paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD">Assigns or edits the <link href="text/shared/01/06130100.xhp" name="password">password</link> for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB" id="bm_id3153056" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB" id="bm_id3153056" localize="false"/>
 <paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="3" l10n="U" oldref="52">New</paragraph>
 <paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB">Creates a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME" id="bm_id3154985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME" id="bm_id3154985" localize="false"/>
 <paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="56">Name</paragraph>
 <paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME">Enter a name for the new library or module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND" id="bm_id3153951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND" id="bm_id3153951" localize="false"/>
 <paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="CHG" oldref="54">Import<comment>changed in #i64102</comment></paragraph>
 <paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND">Locate that $[officename] Basic library that you want to add to the current list, and then click Open.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
@@ -133,21 +130,21 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SCRIPTSBOX" id="bm_id7982421" localize="false"/>
 <paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Macros</paragraph>
 <paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a macro or script from "user", "share", or an open document. To view the available macros or scripts, double-click an entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/>
 <paragraph role="heading" id="par_idN109CD" xml-lang="en-US" level="3" l10n="NEW">Run</paragraph>
 <paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731587">To run a script, select a script in the list, and then click Run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/>
 <paragraph role="heading" id="par_idN109E8" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
 <paragraph role="paragraph" id="par_idN109EC" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731589">Creates a new script.</ahelp> The default script editor opens after you enter a name for the script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:DLG_NEWLIB:ED_LIBNAME" id="bm_id5546128" localize="false"/>
+<!-- removed HID svx:Edit:DLG_NEWLIB:ED_LIBNAME -->
 <paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:DLG_NEWLIB:ED_LIBNAME">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/>
 <paragraph role="heading" id="par_idN10A2F" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN10A33" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731590">Opens the default script editor for your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10A4B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
 <paragraph role="paragraph" id="par_idN10A4F" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731591">Opens a dialog where you can change the name of the selected script.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/>
 <paragraph role="heading" id="par_idN10A66" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10A6A" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731592">Prompts you to delete the selected script.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10AE5" xml-lang="en-US" l10n="NEW">The Macro Selector dialog contains two list boxes, namely the Library list box and the Macro name list box.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06130001.xhp b/helpcontent2/source/text/shared/01/06130001.xhp
index a2abf262b0..6c5702bae0 100755
--- a/helpcontent2/source/text/shared/01/06130001.xhp
+++ b/helpcontent2/source/text/shared/01/06130001.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130001.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130010.xhp b/helpcontent2/source/text/shared/01/06130010.xhp
index cdf1b17810..db408ba5ad 100644
--- a/helpcontent2/source/text/shared/01/06130010.xhp
+++ b/helpcontent2/source/text/shared/01/06130010.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130010.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130100.xhp b/helpcontent2/source/text/shared/01/06130100.xhp
index 7aa02c46ee..0dac12c2f3 100755
--- a/helpcontent2/source/text/shared/01/06130100.xhp
+++ b/helpcontent2/source/text/shared/01/06130100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,14 +49,14 @@
   <embed href="text/shared/00/00000406.xhp#passwort"/>
 </section>
 <paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="2" l10n="U" oldref="3">Old password</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD" id="bm_id3152895" localize="false"/>
 <paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="4">Password</paragraph>
 <paragraph role="paragraph" id="par_id3144415" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD">Enter the current password for the selected library.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145160" xml-lang="en-US" level="2" l10n="U" oldref="6">New password</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD" id="bm_id3144436" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD" id="bm_id3144436" localize="false"/>
 <paragraph role="heading" id="hd_id3149525" xml-lang="en-US" level="3" l10n="U" oldref="7">Password</paragraph>
 <paragraph role="paragraph" id="par_id3159194" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD">Enter a new password for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD" id="bm_id3156302" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD" id="bm_id3156302" localize="false"/>
 <paragraph role="heading" id="hd_id3166445" xml-lang="en-US" level="3" l10n="U" oldref="9">Confirm</paragraph>
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD">Reenter the new password for the selected library.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06130200.xhp b/helpcontent2/source/text/shared/01/06130200.xhp
index 423db717b3..0159a6889a 100755
--- a/helpcontent2/source/text/shared/01/06130200.xhp
+++ b/helpcontent2/source/text/shared/01/06130200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130500.xhp b/helpcontent2/source/text/shared/01/06130500.xhp
index 36910cf9e0..e1434e4504 100755
--- a/helpcontent2/source/text/shared/01/06130500.xhp
+++ b/helpcontent2/source/text/shared/01/06130500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,10 +48,10 @@
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="3">File name:</paragraph>
 <paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_BASICIDE_LIBSDLG_TREE">Enter a name or the path to the library that you want to append. You can also select a library from the list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REF" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF" id="bm_id3147090" localize="false"/>
 <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="3" l10n="U" oldref="7">Insert as reference (read-only)</paragraph>
 <paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REF">Adds the selected library as a read-only file. The library is reloaded each time you start <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REPL" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL" id="bm_id3152895" localize="false"/>
 <paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace existing libraries</paragraph>
 <paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REPL">Replaces a library that has the same name with the current library.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06140000.xhp b/helpcontent2/source/text/shared/01/06140000.xhp
index e471c3fea3..42f2575894 100644
--- a/helpcontent2/source/text/shared/01/06140000.xhp
+++ b/helpcontent2/source/text/shared/01/06140000.xhp
@@ -6,14 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 06140000.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,7 +35,7 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Configuration</title>
+<title id="tit" xml-lang="en-US">Customize</title>
 <filename>/text/shared/01/06140000.xhp</filename>
 </topic>
 </meta>
diff --git a/helpcontent2/source/text/shared/01/06140100.xhp b/helpcontent2/source/text/shared/01/06140100.xhp
index d4efd296a6..2032ce7110 100644
--- a/helpcontent2/source/text/shared/01/06140100.xhp
+++ b/helpcontent2/source/text/shared/01/06140100.xhp
@@ -6,14 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 06140100.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,18 +45,18 @@
 <bookmark_value>customizing;menus</bookmark_value>
 <bookmark_value>menus;customizing</bookmark_value>
 </bookmark><comment>mw deleted "modifying;..." entry</comment><comment>Mw deleted "changing;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_MENU" id="bm_id3149962" localize="false"/><paragraph role="heading" id="hd_id3153008" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140100.xhp" name="Menu">Menu</link></paragraph>
+<!-- removed HID HID_CONFIG_MENU --><paragraph role="heading" id="hd_id3153008" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140100.xhp" name="Menu">Menu</link></paragraph>
 <paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_MENU">Customizes and saves current menu layouts as well as creates new menus. You cannot customize context menus.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3146873" xml-lang="en-US" l10n="U" oldref="72">You can add new commands, modify existing commands, or rearrange the menu items.</paragraph>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#menue"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS" id="bm_id1940061" localize="false"/><paragraph role="heading" id="par_idN1069B" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS" id="bm_id1940061" localize="false"/><paragraph role="heading" id="par_idN1069B" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
 <paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="NEW"><ahelp hid="705498935">Select the menu and submenu that you want to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW" id="bm_id6241340" localize="false"/><paragraph role="heading" id="par_idN106B0" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW" id="bm_id6241340" localize="false"/><paragraph role="heading" id="par_idN106B0" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN106B4" xml-lang="en-US" l10n="NEW"><ahelp hid="705499960">Opens the <link href="text/shared/01/06140101.xhp">New Menu</link> dialog where you can enter the name of a new menu as well as select the location for the menu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE" id="bm_id1544541" localize="false"/><paragraph role="heading" id="par_idN106B7" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE" id="bm_id1544541" localize="false"/><paragraph role="heading" id="par_idN106B7" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
 <paragraph role="paragraph" id="par_idN106BB" xml-lang="en-US" l10n="NEW"><ahelp hid="705507642">Opens a submenu with additional commands.</ahelp></paragraph>
 <list type="unordered">
 <listitem>
@@ -90,11 +86,15 @@
 <paragraph role="heading" id="par_idN106F9" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN106FD" xml-lang="en-US" l10n="NEW">Deletes the selected menu or menu entry.</paragraph>
 <paragraph role="note" id="par_idN10910" xml-lang="en-US" l10n="NEW">You can only delete custom menus and custom menu entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MENUCONFIG_LISTBOX" id="bm_id3148410" localize="false"/><paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
+<!-- removed HID HID_MENUCONFIG_LISTBOX -->
+<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
 <paragraph role="paragraph" id="par_id3150999" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_MENUCONFIG_LISTBOX">Displays a list of the available menu commands for the selected menu in the current application or document.</ahelp></paragraph>
 <section id="updown">
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="39">To rearrange the order of menu entries, select an entry, and then click the up or down arrow button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP" id="bm_id3153822" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP" id="bm_id16574620" localize="false"/>
+
+<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
 <paragraph role="paragraph" id="par_id3153585" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP">Moves the selected item up one position.</ahelp></paragraph>
 <table id="tbl_id3154897">
 <tablerow>
@@ -108,7 +108,9 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN" id="bm_id3150130" localize="false"/><paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN" id="bm_id16574640" localize="false"/>
+<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
 <paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN">Moves the selected item down one position.</ahelp></paragraph>
 <table id="tbl_id3149795">
 <tablerow>
@@ -123,9 +125,15 @@
 </tablerow>
 </table>
 </section>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
-<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid="705499974">Opens the Add Commands dialog. Select the command that you want to add to the menu, and then click <emph>Add</emph>. You can also drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
+<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_CATEGORIES" id="bm_id1657465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_COMMANDS" id="bm_id1657467" localize="false"/>
+<paragraph role="paragraph" id="par_idN40723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
 <paragraph role="paragraph" id="par_idN107FD" xml-lang="en-US" l10n="NEW"><ahelp hid="705507646">Opens a menu that contains additional commands.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10800" xml-lang="en-US" level="3" l10n="NEW">Add Submenu</paragraph>
 <paragraph role="paragraph" id="par_idN10804" xml-lang="en-US" l10n="NEW">Opens the Add Submenu dialog, where you enter the name of a submenu.</paragraph>
@@ -137,7 +145,7 @@
 <paragraph role="paragraph" id="par_idN108CD" xml-lang="en-US" l10n="NEW">Enter the new name for the selected command.</paragraph>
 <paragraph role="heading" id="par_idN10824" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10828" xml-lang="en-US" l10n="NEW">Deletes the selected command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN" id="bm_id3804132" localize="false"/><paragraph role="heading" id="par_idN10918" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN" id="bm_id3804132" localize="false"/><paragraph role="heading" id="par_idN10918" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
 <paragraph role="paragraph" id="par_idN107BF" xml-lang="en-US" l10n="NEW"><comment>UFI: Load and Save did not make it into SO8. There seems to be no work-around!!!</comment></paragraph>
 <paragraph role="paragraph" id="par_idN1091C" xml-lang="en-US" l10n="NEW"><ahelp hid="705498948">Select the application or open document where you want to add the menu.</ahelp> A separate menu configuration is saved for the item that you select.</paragraph>
 <paragraph role="paragraph" id="par_idN10AFB" xml-lang="en-US" l10n="NEW">To edit a menu configuration that is associated with an item in the list, select the item, make the changes that you want, and then click the <emph>OK</emph> button.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140101.xhp b/helpcontent2/source/text/shared/01/06140101.xhp
index a1481027e4..152085979a 100755
--- a/helpcontent2/source/text/shared/01/06140101.xhp
+++ b/helpcontent2/source/text/shared/01/06140101.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06140101.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,25 +27,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140101xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">New Menu</title>
 <filename>/text/shared/01/06140101.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-12T14:32:22">UFI: New Menu dialog of Customize dialog</created>
-<lastedited date="2004-09-21T09:40:43">dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">New Menu</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#menuenew"/>
 </section>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME" id="bm_id1657461" localize="false"/>
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu name</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</ahelp></paragraph>
+
 <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
 <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
 <embed href="text/shared/01/06140100.xhp#updown"/>
diff --git a/helpcontent2/source/text/shared/01/06140102.xhp b/helpcontent2/source/text/shared/01/06140102.xhp
index 491f4d2bd6..f861cf4362 100755
--- a/helpcontent2/source/text/shared/01/06140102.xhp
+++ b/helpcontent2/source/text/shared/01/06140102.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06140102.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,25 +27,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140102xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Move Menu</title>
 <filename>/text/shared/01/06140102.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-12T14:47:43">UFI: Move Menu dialog from Customize dialog</created>
-<lastedited date="2004-09-21T09:40:29">dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">Move Menu</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#menuemove"/>
 </section>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CONFIG_MENU_LISTBOX" id="bm_id16574660" localize="false"/>
+
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the selected menu entry up one position or down one position in the menu when you click an arrow button.</ahelp></paragraph>
 <embed href="text/shared/01/06140100.xhp#updown"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 37776201ef..d9f093175d 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06140200.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106140200xml" indexer="include">
 <title id="tit" xml-lang="en-US">Keyboard</title>
@@ -58,15 +55,17 @@
 <section id="operatinghint">
 <paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="29">Avoid assigning shortcut keys that are currently used by your operating system.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE" id="bm_id3151226" localize="false"/>
+<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" id="bm_id393425" localize="false"/>
 <paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE">Displays shortcut keys that are common to all $[officename] applications.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE" id="bm_id3145345" localize="false"/>
-<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer 
-</caseinline><caseinline select="CALC">Calc 
-</caseinline><caseinline select="IMPRESS">Impress 
-</caseinline><caseinline select="DRAW">Draw 
-</caseinline><caseinline select="MATH">Math 
+<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" id="bm_id315425" localize="false"/>
+<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
+</caseinline><caseinline select="CALC">Calc
+</caseinline><caseinline select="IMPRESS">Impress
+</caseinline><caseinline select="DRAW">Draw
+</caseinline><caseinline select="MATH">Math
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE">Displays shortcut keys for the current $[officename] application.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/>
@@ -80,21 +79,27 @@
 <bookmark xml-lang="en-US" branch="hid/HID_CONFIGFUNCTION_ACC_LISTBOX" id="bm_id3159342" localize="false"/>
 <paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
 <paragraph role="paragraph" id="par_id3159148" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CONFIGFUNCTION_ACC_LISTBOX">Select a function that you want to assign a shortcut key to, click a key combination in the <emph>Shortcut keys</emph> list, and then click <emph>Modify</emph>. If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY" id="bm_id3153666" localize="false"/>
+<!-- removed HID SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY -->
+
 <paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
 <paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY">Displays the shortcut keys that are assigned to the selected function.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE" id="bm_id3156153" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" id="bm_id31593425" localize="false"/>
 <paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE">Assigns the key combination selected in the <emph>Shortcut keys</emph> list to the command selected in the <emph>Function </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE" id="bm_id3149578" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" id="bm_id31593424" localize="false"/>
 <paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD" id="bm_id3151245" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" id="bm_id31593423" localize="false"/>
 <paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD">Replaces the shortcut key configuration with one that was previously saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE" id="bm_id3148943" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" id="bm_id31593422" localize="false"/>
 <paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
 <paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET" id="bm_id0904200812484017" localize="false"/>
+<!-- removed HID sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" id="bm_id31593421" localize="false"/>
 <paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
 <section id="relatedtopics">
 <embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
diff --git a/helpcontent2/source/text/shared/01/06140400.xhp b/helpcontent2/source/text/shared/01/06140400.xhp
index 110971a23a..a0041ebb6d 100755
--- a/helpcontent2/source/text/shared/01/06140400.xhp
+++ b/helpcontent2/source/text/shared/01/06140400.xhp
@@ -6,14 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 06140400.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,9 +49,15 @@
 </section>
 <paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW">Select the toolbar you want to edit.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
-<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the <link href="text/shared/01/06140101.xhp">Name</link> dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/><paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
+
+<paragraph role="paragraph" id="par_idN106011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name of a new toolbar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the location of the new toolbar.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/>
+<paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
 <paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Toolbar button opens a submenu</ahelp> with the following commands:</paragraph>
 <paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
 <paragraph role="paragraph" id="par_idN10624" xml-lang="en-US" l10n="NEW">Opens the <emph>Name</emph> dialog, where you enter a new name for the selected toolbar.</paragraph>
@@ -71,10 +73,18 @@
 <paragraph role="paragraph" id="par_idN10658" xml-lang="en-US" l10n="NEW">Shows text only.</paragraph>
 <paragraph role="heading" id="par_idN1065B" xml-lang="en-US" level="3" l10n="NEW">Icons &amp; Text</paragraph>
 <paragraph role="paragraph" id="par_idN1065E" xml-lang="en-US" l10n="NEW">Shows icons and text.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP" id="bm_id714743411" localize="false"/>
+<paragraph role="paragraph" id="par_idN1069AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item up in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN" id="bm_id714743412" localize="false"/>
+<paragraph role="paragraph" id="par_idN1068AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item down in the list.</ahelp></paragraph>
+
+
 <paragraph role="heading" id="par_idN10661" xml-lang="en-US" level="2" l10n="NEW">Commands</paragraph>
 <paragraph role="paragraph" id="par_idN10664" xml-lang="en-US" l10n="NEW">Displays a list of commands for the selected toolbar of the current application or document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/><paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/>
+<paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR_ITEM" id="bm_id3650929" localize="false"/><paragraph role="heading" id="par_idN10675" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
 <paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Modify button opens a submenu</ahelp> with the following commands:</paragraph>
 <paragraph role="heading" id="par_idN1067B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140402.xhp b/helpcontent2/source/text/shared/01/06140402.xhp
index f1204f71df..125e85ebdb 100755
--- a/helpcontent2/source/text/shared/01/06140402.xhp
+++ b/helpcontent2/source/text/shared/01/06140402.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06140402.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,11 +41,13 @@
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW">Change Icon</paragraph>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="NEW">Buttons</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="CHG">Icons</paragraph>
 <paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">Displays the available icons in %PRODUCTNAME. To replace the icon that you selected in the <link href="text/shared/01/06140400.xhp">Customize</link> dialog, click an icon, then click the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT" id="bm_id1383709" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="note" id="par_idN10575" xml-lang="en-US" l10n="NEW">You can only import icons that are in the PNG file format and that are 16x16 or 26x26 pixels in size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_ICONSELECTOR_BTN_REMOVE" id="bm_id8980986" localize="false"/><comment>just guessing the help id</comment><paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE" id="bm_id1383799" localize="false"/>
+<paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp
index 3da6538571..6482e27d28 100644
--- a/helpcontent2/source/text/shared/01/06140500.xhp
+++ b/helpcontent2/source/text/shared/01/06140500.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06140500.xhp,v $
- *
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,21 +44,21 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152427"><bookmark_value>customizing; events</bookmark_value>
 <bookmark_value>events; customizing</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_EVENT" id="bm_id3152952" localize="false"/><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
+<!-- removed HID HID_CONFIG_EVENT --><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
 <paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_EVENT">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#events"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
 <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="705547787">Select first where to save the event binding, in the current document or in %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SVX_MACRO_LB_EVENT" id="bm_id1800286" localize="false"/><paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid="40000">The big list box lists the events and the assigned macros. After you selected the location in the <emph>Save In</emph> list box, select an event in the big list box. Then click <emph>Assign Macro</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN" id="bm_id3159167" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_EVENTS_PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
 <paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN">Opens the <link href="text/shared/01/06130000.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE" id="bm_id3152910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_EVENTS_PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE">Deletes the macro assignment for the selected event.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/05060700.xhp" name="List of events">List of events</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/06150000.xhp b/helpcontent2/source/text/shared/01/06150000.xhp
index c404e46a37..56a4783509 100644
--- a/helpcontent2/source/text/shared/01/06150000.xhp
+++ b/helpcontent2/source/text/shared/01/06150000.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150000.xhp,v $
- *
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150100.xhp b/helpcontent2/source/text/shared/01/06150100.xhp
index daeec5d287..44e981115e 100755
--- a/helpcontent2/source/text/shared/01/06150100.xhp
+++ b/helpcontent2/source/text/shared/01/06150100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150110.xhp b/helpcontent2/source/text/shared/01/06150110.xhp
index d5fec7f2f9..7f1d40c910 100755
--- a/helpcontent2/source/text/shared/01/06150110.xhp
+++ b/helpcontent2/source/text/shared/01/06150110.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150110.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150120.xhp b/helpcontent2/source/text/shared/01/06150120.xhp
index 5dcbc78cba..d4883845fa 100755
--- a/helpcontent2/source/text/shared/01/06150120.xhp
+++ b/helpcontent2/source/text/shared/01/06150120.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150120.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,6 +69,6 @@
   <paragraph l10n="U" role="paragraph" id="par_id3147653" xml-lang="en-US" oldref="16"><ahelp hid="HID_XML_FILTER_IMPORT_XSLT" visibility="visible">If this is an import filter, enter the file name of the XSLT stylesheet that you want to use for importing.</ahelp></paragraph>
   <bookmark branch="hid/HID_XML_FILTER_IMPORT_TEMPLATE" xml-lang="en-US" id="bm_id3155831"/><paragraph role="heading" level="2" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="17">Template for import</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153320" xml-lang="en-US" oldref="18"><ahelp hid="HID_XML_FILTER_IMPORT_TEMPLATE" visibility="visible">Enter the name of the template that you want to use for importing. In the template, styles are defined to display XML tags.</ahelp></paragraph>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph>Tools - Options - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
+  <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06150200.xhp b/helpcontent2/source/text/shared/01/06150200.xhp
index 0ffbdf8e0a..a1eebe77cf 100755
--- a/helpcontent2/source/text/shared/01/06150200.xhp
+++ b/helpcontent2/source/text/shared/01/06150200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150210.xhp b/helpcontent2/source/text/shared/01/06150210.xhp
index df32f52a67..daf334bd02 100755
--- a/helpcontent2/source/text/shared/01/06150210.xhp
+++ b/helpcontent2/source/text/shared/01/06150210.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06150210.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06200000.xhp b/helpcontent2/source/text/shared/01/06200000.xhp
index 1e694fea5a..4b8c67646d 100644
--- a/helpcontent2/source/text/shared/01/06200000.xhp
+++ b/helpcontent2/source/text/shared/01/06200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06200000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_HANGUL_HANJA_CONVERSION" id="bm_id7305797" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:HangulHanjaConversion" id="bm_id3150702" localize="false"/>
 <paragraph role="heading" id="hd_id3155757" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06200000.xhp" name="Hangul/Hanja Conversion">Hangul/Hanja Conversion</link></paragraph>
-<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
+<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#hangul"/>
@@ -61,7 +58,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_EDIT_NEWWORD" id="bm_id3166445" localize="false"/>
 <paragraph role="heading" id="hd_id3154230" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace with<comment>name according to spec, current implementation displays "Word" here</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_HANGULDLG_EDIT_NEWWORD">Displays the first replacement suggestion from the dictionary.</ahelp> You can edit the suggested word or enter another word. Click the <emph>Find</emph> button to replace your original word with the corresponding replacement word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVX_MDLG_HANGULHANJA_PB_FIND" id="bm_id3156136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND" id="bm_id3156136" localize="false"/>
 <paragraph role="heading" id="hd_id3154673" xml-lang="en-US" level="2" l10n="U" oldref="7">Find</paragraph>
 <paragraph role="paragraph" id="par_id3156560" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_PUSHBUTTON_RID_SVX_MDLG_HANGULHANJA_PB_FIND">Finds your Hangul input in the dictionary and replaces it with the corresponding Hanja.</ahelp> Click <emph>Ignore</emph> to cancel the find function.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_SUGGESTIONS" id="bm_id3149182" localize="false"/>
@@ -71,33 +68,33 @@
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVX_MDLG_HANGULHANJA_LB_SUGGESTIONS">Displays all available replacements in the dictionary.</ahelp> If the <emph>Replace by character</emph> box is enabled, you see a grid of characters. If the <emph>Replace by character</emph> box is not checked, you see a list of words.</paragraph>
 <paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
 <paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12">Click the format to display the replacements.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION" id="bm_id3154317" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION" id="bm_id3154317" localize="false"/>
 <paragraph role="heading" id="hd_id3153749" xml-lang="en-US" level="3" l10n="U" oldref="13">Hangul/Hanja</paragraph>
 <paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION">The original characters are replaced by the suggested characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED" id="bm_id3153031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED" id="bm_id3153031" localize="false"/>
 <paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="U" oldref="15">Hanja (Hangul)</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED">The Hangul part will be displayed in brackets after the Hanja part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BRACKETED" id="bm_id3145227" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED" id="bm_id3145227" localize="false"/>
 <paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="17">Hangul (Hanja)</paragraph>
 <paragraph role="paragraph" id="par_id3149192" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BRACKETED">The Hanja part will be displayed in brackets after the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_ABOVE" id="bm_id3158432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE" id="bm_id3158432" localize="false"/>
 <paragraph role="heading" id="hd_id3150119" xml-lang="en-US" level="3" l10n="U" oldref="19">Hanja as ruby text above<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_ABOVE">The Hanja part will be displayed as ruby text above the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BELOW" id="bm_id3149902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW" id="bm_id3149902" localize="false"/>
 <paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="21">Hanja as ruby text below<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BELOW">The Hanja part will be displayed as ruby text below the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_ABOVE" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE" id="bm_id3153698" localize="false"/>
 <paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="23">Hangul as ruby text above<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_ABOVE">The Hangul part will be displayed as ruby text above the Hanja part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW" id="bm_id3153348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW" id="bm_id3153348" localize="false"/>
 <paragraph role="heading" id="hd_id3155831" xml-lang="en-US" level="3" l10n="U" oldref="25">Hangul as ruby text below<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW">The Hangul part will be displayed as ruby text below the Hanja part.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148826" xml-lang="en-US" level="2" l10n="U" oldref="27">Conversion</paragraph>
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="28">Normally in a mixed text selection made of Hangul and Hanja characters, all Hangul characters will be converted to Hanja and all Hanja characters will be converted to Hangul. If you want to convert a mixed text selection only in one direction, use the following conversion options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY" id="bm_id3154381" localize="false"/>
 <paragraph role="heading" id="hd_id3153585" xml-lang="en-US" level="3" l10n="U" oldref="29">Hangul only</paragraph>
 <paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY">Check to convert only Hangul. Do not convert Hanja.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY" id="bm_id3147530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY" id="bm_id3147530" localize="false"/>
 <paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="3" l10n="U" oldref="31">Hanja only</paragraph>
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY">Check to convert only Hanja. Do not convert Hangul.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_IGNORE" id="bm_id3149670" localize="false"/>
@@ -112,7 +109,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_CHANGEALL" id="bm_id3159084" localize="false"/>
 <paragraph role="heading" id="hd_id3153360" xml-lang="en-US" level="2" l10n="U" oldref="39">Always Replace</paragraph>
 <paragraph role="paragraph" id="par_id3153338" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_HANGULDLG_BUTTON_CHANGEALL">Replaces the selection with the suggested characters or word according to the format options. Every time the same selection is detected it will be replaced automatically.</ahelp> The next word or character will be selected for conversion. The list of replacement text is valid for the current $[officename] session.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER" id="bm_id3145420" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER" id="bm_id3145420" localize="false"/>
 <paragraph role="heading" id="hd_id3149290" xml-lang="en-US" level="3" l10n="U" oldref="41">Replace by character</paragraph>
 <paragraph role="paragraph" id="par_id3145154" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER">Check to move character-by-character through the selected text. If not checked, full words are replaced.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_OPTIONS" id="bm_id2443311" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06201000.xhp b/helpcontent2/source/text/shared/01/06201000.xhp
index 9d37461fe1..b1d2c94159 100755
--- a/helpcontent2/source/text/shared/01/06201000.xhp
+++ b/helpcontent2/source/text/shared/01/06201000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06201000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,30 +45,30 @@
 <bookmark xml-lang="en-US" branch="hid/HID_HANGULHANJA_OPT_DICTS_LB" id="bm_id3277077" localize="false"/>
 <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">User-defined dictionaries</paragraph>
 <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_HANGULHANJA_NEWDICT_DLG">Lists all user-defined dictionaries. Select the check box next to the dictionary that you want to use. Clear the check box next to the dictionary that you do not want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW" id="bm_id4629657" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW" id="bm_id4629657" localize="false"/>
 <paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW">Opens the New dictionary dialog box, where you can create a new dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME" id="bm_id8444471.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME" id="bm_id8444471.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Name</paragraph>
 <paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME">Enter a name for the dictionary.</ahelp> To display the new dictionary in the <emph>User-defined dictionaries</emph> list box, click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT" id="bm_id6776635" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT" id="bm_id6776635" localize="false"/>
 <paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT">Opens the <link href="text/shared/01/06202000.xhp">Edit Custom Dictionary</link> dialog where you can edit any user-defined dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE" id="bm_id6255684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE" id="bm_id6255684" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE">Deletes the selected user-defined dictionary.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105F1" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
 <paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW">Specifies additional options for all dictionaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST" id="bm_id6259346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST" id="bm_id6259346" localize="false"/>
 <paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Ignore post-positional word</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST">Ignores positional characters at the end of Korean words when you search a dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE" id="bm_id8419751" localize="false"/>
+<!-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE -->
 <paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="3" l10n="NEW">Close Conversion dialog automatically after replacement</paragraph>
 <paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE">Closes the Hangul/Hanja Conversion dialog box after you click <emph>Ignore</emph>, <emph>Always Ignore</emph>, <emph>Replace</emph>, or <emph>Always Replace</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST" id="bm_id231940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST" id="bm_id231940" localize="false"/>
 <paragraph role="heading" id="par_idN10636" xml-lang="en-US" level="3" l10n="NEW">Show entries recently used first</paragraph>
 <paragraph role="paragraph" id="par_idN1063A" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST">Shows the replacement suggestion that you selected the last time as the first entry on the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE" id="bm_id3751029" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE" id="bm_id3751029" localize="false"/>
 <paragraph role="heading" id="par_idN10651" xml-lang="en-US" level="3" l10n="NEW">Replace all unique entries automatically</paragraph>
 <paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE">Automatically replaces words that only have one suggested word replacement.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/06202000.xhp b/helpcontent2/source/text/shared/01/06202000.xhp
index a67f2641ac..b58ba0ae2f 100755
--- a/helpcontent2/source/text/shared/01/06202000.xhp
+++ b/helpcontent2/source/text/shared/01/06202000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06202000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,20 +42,20 @@
 <body>
 <paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Edit Custom Dictionary</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW">Add and delete entries that are used for the <link href="text/shared/01/06200000.xhp">Hangul/Hanja Conversion</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK" id="bm_id9376506" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK" id="bm_id9376506" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Book</paragraph>
 <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK">Select the user-defined dictionary that you want to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL" id="bm_id6413159" localize="false"/><paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Original</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL" id="bm_id6413159" localize="false"/><paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Original</paragraph>
 <paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL">Select the entry in the current dictionary that you want to edit. If you want, you can also type a new entry in this box.</ahelp> To move from the Original box to the the first text box in the Suggestions area, press Enter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR" id="bm_id590533" localize="false"/><paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Replace by character</paragraph>
+<!-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR --><paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Replace by character</paragraph>
 <paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR">Converts the text on a character by character basis and not on a word by word basis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1" id="bm_id6543778" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2" id="bm_id2266914" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3" id="bm_id5476241" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4" id="bm_id2326120" localize="false"/><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Suggestions (max. 8)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1" id="bm_id6543778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2" id="bm_id2266914" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3" id="bm_id5476241" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4" id="bm_id2326120" localize="false"/><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Suggestions (max. 8)</paragraph>
 <paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1">Type a suggested replacement for the entry that is selected in the Original text box. The replacement word can contain a maximum of eight characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW" id="bm_id7013153" localize="false"/><paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW" id="bm_id7013153" localize="false"/><paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN105E8" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW">Adds the current replacement definition to the dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE" id="bm_id5783562" localize="false"/><paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE" id="bm_id5783562" localize="false"/><paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10603" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE">Deletes the selected entry.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06990000.xhp b/helpcontent2/source/text/shared/01/06990000.xhp
index eda61e93e1..ff57c68f2e 100755
--- a/helpcontent2/source/text/shared/01/06990000.xhp
+++ b/helpcontent2/source/text/shared/01/06990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06990000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/07010000.xhp b/helpcontent2/source/text/shared/01/07010000.xhp
index cf9c70e6b8..90aa1c6a37 100644
--- a/helpcontent2/source/text/shared/01/07010000.xhp
+++ b/helpcontent2/source/text/shared/01/07010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/07080000.xhp b/helpcontent2/source/text/shared/01/07080000.xhp
index 32daa8dc5c..da2b488bca 100755
--- a/helpcontent2/source/text/shared/01/07080000.xhp
+++ b/helpcontent2/source/text/shared/01/07080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
index 87f86a8bf8..cb0c79c575 100644
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ b/helpcontent2/source/text/shared/01/08060100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08060100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,39 +32,43 @@
  
 	
 <meta>
-<topic id="textshared0108060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Registration</title>
-<filename>/text/shared/01/08060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<section id="registrierung">
+      <topic id="textshared0108060100xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Registration</title>
+         <filename>/text/shared/01/08060100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="par_id3152876" role="paragraph" l10n="E" oldref="1"
+                 localize="false"/>
+      <section id="registrierung">
 <bookmark xml-lang="en-US" branch="index" id="bm_id8190557"><bookmark_value>online registration</bookmark_value>
-<bookmark_value>registering; %PRODUCTNAME</bookmark_value>
+         <bookmark_value>registering; %PRODUCTNAME</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_ONLINE_REGISTRATION" id="bm_id3640231" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/>
-<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
-<paragraph role="paragraph" id="par_id3153882" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000408.xhp#online"/>
-</section>
-<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U" oldref="10">Register Now</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="3" l10n="U" oldref="11">Remind me to register later</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER" id="bm_id3156302" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="12">Never register</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
-<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153882" role="paragraph" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000408.xhp#online"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3153624" role="heading" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150445" role="paragraph" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145629" role="heading" level="3" l10n="U"
+                 oldref="10">I want to register now</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW" id="bm_id3150902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149999" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149760" role="heading" level="3" l10n="U"
+                 oldref="11">I want to register later</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER" id="bm_id3156302" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147557" role="heading" level="3" l10n="U"
+                 oldref="12">I do not want to register</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148548" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index e83b1d19d0..f6631c57ae 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: about_meta_tags.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -100,8 +97,8 @@
 <paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
 <paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
 <paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="16">Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] notes. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
+<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
 <paragraph role="heading" id="hd_id3163717" xml-lang="en-US" level="3" l10n="U" oldref="17">Export Tips</paragraph>
-<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Notes and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
+<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index d9fe1d5bb0..f00d915bcc 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: digitalsignatures.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,51 +29,47 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Digital Signatures</title>
-<filename>/text/shared/01/digitalsignatures.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-25T17:23:25">UFI: Digital Signatures from File-Properties-General</created>
-<lastedited date="2007-03-02T16:29:34">dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="digitalsignatures">
+      <topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Digital Signatures</title>
+         <filename>/text/shared/01/digitalsignatures.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="digitalsignatures">
 <bookmark xml-lang="en-US" branch="hid/SID_SIGNATURE" id="bm_id9475924" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Signature" id="bm_id127567" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_DOCINFODOC_BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
-<paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#digitalsig"/>
-</section>
-<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_QUERY_SAVEBEFORESIGN" id="bm_id1376689" localize="false"/>
-<paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_INFO_WRONGDOCFORMAT" id="bm_id133060" localize="false"/>
-<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10548" role="paragraph" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000401.xhp#digitalsig"/>
+      </section>
+      <embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<!-- removed HID HID_XMLSEC_QUERY_SAVEBEFORESIGN -->
+<paragraph xml-lang="en-US" id="par_idN10629" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
+<!-- removed HID HID_XMLSEC_INFO_WRONGDOCFORMAT -->
+<paragraph xml-lang="en-US" id="par_idN10644" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
-<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
-<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW">The Signed icon 
-<image id="img_id4557023" src="xmlsecurity/res/signet_11x16.png" width="0.222inch" height="0.1528inch"><alt id="alt_id4557023" xml-lang="en-US">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon 
+<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
 	</image> indicates a valid digital signature, while the Exclamation mark icon 
-<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665inch" height="0.1146inch"><alt id="alt_id249336" xml-lang="en-US">icon</alt>
+<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
 	</image> indicates an invalid digital signature.</paragraph>
-<paragraph role="tip" id="par_idN10569" xml-lang="en-US" l10n="NEW">A Signed icon is also shown in the Status bar when a signed document only contains valid digital signatures.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_DIGSIG_BTN_VIEWCERT" id="bm_id7360759" localize="false"/>
-<paragraph role="heading" id="par_idN1056C" xml-lang="en-US" level="2" l10n="NEW">View Certificate</paragraph>
-<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT" id="bm_id7360759" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index a3bb03e138..05b8d26a89 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
-	
+
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extensionupdate.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,64 +29,43 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Extension Update</title>
-<filename>/text/shared/01/extensionupdate.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Extension Update</title>
+         <filename>/text/shared/01/extensionupdate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATE" id="bm_id5684377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/><paragraph role="heading" id="hd_id9688100" xml-lang="en-US" level="1" l10n="NEW">Extension Update</paragraph>
-<paragraph role="paragraph" id="par_id5084688" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
-</section>
-<paragraph role="paragraph" id="par_id6401257" xml-lang="en-US" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
-<paragraph role="paragraph" id="par_id5841242" xml-lang="en-US" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6794030" xml-lang="en-US" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id7096774" xml-lang="en-US" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6420484" xml-lang="en-US" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6986602" xml-lang="en-US" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id616779" xml-lang="en-US" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">A manual update is necessary.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_id757469" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5189062" xml-lang="en-US" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
-<paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
-<paragraph role="paragraph" id="par_id3729056" xml-lang="en-US" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6854457" xml-lang="en-US" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3372295" xml-lang="en-US" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
-<paragraph role="heading" id="hd_id5699942" xml-lang="en-US" level="2" l10n="NEW">Show all Updates</paragraph>
-<paragraph role="paragraph" id="par_id641193" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id7634510" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9688100" role="heading" level="1" l10n="NEW">Extension Update</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5084688" role="paragraph" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id6401257" role="paragraph" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5841242" role="paragraph" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6794030" role="paragraph" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7096774" role="paragraph" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6420484" role="paragraph" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6986602" role="paragraph" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id616779" role="paragraph" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id791039" role="paragraph" l10n="NEW">A manual update is necessary.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id757469" role="paragraph" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id5189062" role="paragraph" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3949095" role="paragraph" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3729056" role="paragraph" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6854457" role="paragraph" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3372295" role="paragraph" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5699942" role="heading" level="2" l10n="NEW">Show all Updates</paragraph>
+      <paragraph xml-lang="en-US" id="par_id641193" role="paragraph" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id7634510" role="paragraph" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index c39e62b982..0417dc0c38 100755
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatting_mark.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,59 +29,44 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared01formatting_markxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Formatting Mark</title>
-<filename>text/shared/01/formatting_mark.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  <section id="formatting_mark">
-   
-   
+      <topic id="textshared01formatting_markxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Formatting Mark </title>
+         <filename>/text/shared/01/formatting_mark.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="formatting_mark">
 <bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/>
-   
 <bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value>
-<bookmark_value>words;wrapping in CTL</bookmark_value>
-</bookmark>
-   <comment>MW added 2 index entries because of issue 86750</comment>
-   <paragraph xml-lang="en-US" id="hd_id126651" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link> 
+         <bookmark_value>words;wrapping in CTL</bookmark_value>
+</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment>
+<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
 </variable></paragraph>
-   <paragraph xml-lang="en-US" id="par_id9305398" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks.</ahelp></paragraph>
-   
-  </section>
-  
+         <paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertNonBreakingSpace" id="bm_id2567217" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
-  <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertHardHyphen" id="bm_id6757713" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
-  <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertSoftHyphen" id="bm_id8669698" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
-  <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertZWSP" id="bm_id1068758" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
-  <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertZWNBSP" id="bm_id8484450" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
-  <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertLRM" id="bm_id714743" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
-  <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-  
+<paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertRLM" id="bm_id3938413" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
-  <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
- </body>
+<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
+      <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/gallery.xhp b/helpcontent2/source/text/shared/01/gallery.xhp
index 6df461b946..48035fb950 100644
--- a/helpcontent2/source/text/shared/01/gallery.xhp
+++ b/helpcontent2/source/text/shared/01/gallery.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared01galleryxml" indexer="include">
 <title id="tit" xml-lang="en-US">Gallery</title>
@@ -65,7 +62,7 @@
 <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
 <paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="3" l10n="U" oldref="4">Adding a New File to the Gallery</paragraph>
 <paragraph role="paragraph" id="par_id3153032" xml-lang="en-US" l10n="U" oldref="43">To add a file to the <emph>Gallery</emph>, right-click a theme, choose <emph>Properties</emph>, click the <emph>Files </emph>tab, and then click <emph>Add</emph>. You can also click an object in the current document, hold, and then drag it to the <emph>Gallery</emph> window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_NEW_THEME" id="bm_id3155449" localize="false"/>
+
 <bookmark xml-lang="en-US" branch="hid/HID_GALLERY_NEWTHEME" id="bm_id3154381" localize="false"/>
 <paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="2" l10n="U" oldref="10">New theme</paragraph>
 <paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_GALLERY_NEWTHEME">Adds a new theme to the <emph>Gallery </emph>and lets you choose the files to include in the theme.</ahelp>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/gallery_files.xhp b/helpcontent2/source/text/shared/01/gallery_files.xhp
index 9a9ee1060a..0971d97dbe 100755
--- a/helpcontent2/source/text/shared/01/gallery_files.xhp
+++ b/helpcontent2/source/text/shared/01/gallery_files.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallery_files.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,22 +48,22 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#galleryregisterdateien"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE" id="bm_id3151330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE" id="bm_id3151330" localize="false"/>
 <paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="3" l10n="U" oldref="5">File Type</paragraph>
 <paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:COMBOBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE">Select the type of file that you want to add.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND" id="bm_id3150902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND" id="bm_id3150902" localize="false"/>
 <paragraph role="heading" id="hd_id3153935" xml-lang="en-US" level="3" l10n="U" oldref="7">Files found</paragraph>
 <paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:MULTILISTBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND">Lists the available files. Select the file(s) that you want to add, and then click <emph>Add</emph>. To add all of the files in the list, click <emph>Add All</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH" id="bm_id3155552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH" id="bm_id3155552" localize="false"/>
 <paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="9">Find files</paragraph>
 <paragraph role="paragraph" id="par_id3147557" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH">Locate the directory containing the files that you want to add, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE" id="bm_id3147576" localize="false"/>
 <paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="13">Add</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE">Adds the selected file(s) to the current theme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL" id="bm_id3149095" localize="false"/>
 <paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="15">Add all</paragraph>
 <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL">Adds all of the files in the list to the current theme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW" id="bm_id3147654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW" id="bm_id3147654" localize="false"/>
 <paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="17">Preview</paragraph>
 <paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:CHECKBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW">Displays or hides a preview of the selected file.</ahelp></paragraph><comment>UFI: removed help id</comment>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="19">Preview box</paragraph>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index d56720daa0..b584aea2b5 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grid.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
 <paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
index 749ffe8a3a..cf22da3fab 100755
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guides.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 684ee2a8a4..e3ba6734c9 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,6 +69,7 @@ XHPFILES = \
    01100300.xhp \
    01100400.xhp \
    01100500.xhp \
+   01100600.xhp \
    01110000.xhp \
    01110100.xhp \
    01110101.xhp \
@@ -285,6 +282,7 @@ XHPFILES = \
    06050100.xhp \
    06050200.xhp \
    06050300.xhp \
+   06050400.xhp \
    06050500.xhp \
    06050600.xhp \
    06130000.xhp \
@@ -344,4 +342,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 84f4d1fee2..2040f7d963 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaplayer.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,55 +31,56 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Media Player</title>
-<filename>/text/shared/01/mediaplayer.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="mediaplayer">
+      <topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Media Player</title>
+         <filename>/text/shared/01/mediaplayer.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="mediaplayer">
 <bookmark xml-lang="en-US" branch="index" id="bm_id8659321"><bookmark_value>Media Player window</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_AVMEDIA_PLAYER" id="bm_id8777733" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/><paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10550" role="heading" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
-</section>
-<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
 <switch select="sys">
-<case select="UNIX"><paragraph role="note" id="par_idN105EF" xml-lang="en-US" l10n="NEW">On UNIX systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files, and add the path to the installed jmf.jar to the class path in Tools - Options - %PRODUCTNAME - Java.</paragraph>
+<case select="UNIX">
+<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in the Options dialog box in %PRODUCTNAME - Java.</paragraph>
 </case>
-<case select="WIN"><paragraph role="note" id="par_idN1064F" xml-lang="en-US" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
+<case select="WIN">
+<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Open</paragraph>
-<paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="CHG">Apply<comment>spec says "Insert"</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
-<paragraph role="note" id="par_idN10605" xml-lang="en-US" l10n="NEW">Only a link to the media file is inserted into the current document.</paragraph>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Play</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW">Plays the current file.</paragraph>
-<paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Pause</paragraph>
-<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Stop</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW">Stops the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Repeat</paragraph>
-<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW">Plays the file repeatedly.</paragraph>
-<paragraph role="heading" id="par_idN105A4" xml-lang="en-US" level="2" l10n="NEW">Mute</paragraph>
-<paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US" l10n="NEW">Turns sound off and on.</paragraph>
-<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Volume slider</paragraph>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW">Adjusts the volume.</paragraph>
-<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
-<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
-<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Position slider</paragraph>
-<paragraph role="paragraph" id="par_idN105BD" xml-lang="en-US" l10n="NEW">Moves to a different position in the file.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN1057A" role="heading" level="2" l10n="NEW">Open</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1057E" role="paragraph" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Apply</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Play</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW">Plays the current file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Pause</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10593" role="paragraph" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Stop</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW">Stops the playback of the current file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1059D" role="heading" level="2" l10n="NEW">Repeat</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105A1" role="paragraph" l10n="NEW">Plays the file repeatedly.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105A4" role="heading" level="2" l10n="NEW">Mute</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105A8" role="paragraph" l10n="NEW">Turns sound off and on.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Volume slider</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="NEW">Adjusts the volume.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="CHG">View</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105B6" role="paragraph" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105B9" role="heading" level="2" l10n="NEW">Position slider</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105BD" role="paragraph" l10n="NEW">Moves to a different position in the file.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/moviesound.xhp b/helpcontent2/source/text/shared/01/moviesound.xhp
index 1f54227221..7561af1032 100755
--- a/helpcontent2/source/text/shared/01/moviesound.xhp
+++ b/helpcontent2/source/text/shared/01/moviesound.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moviesound.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,65 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Movie and Sound</title>
-<filename>/text/shared/01/moviesound.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="moviesound">
+      <topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Movie and Sound</title>
+         <filename>/text/shared/01/moviesound.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="moviesound">
 <bookmark xml-lang="en-US" branch="index" id="bm_id1907712"><bookmark_value>inserting;movies/sounds</bookmark_value>
-<bookmark_value>sounds;inserting and playing</bookmark_value>
-<bookmark_value>playing movies and sound files</bookmark_value>
-<bookmark_value>videos</bookmark_value>
-<bookmark_value>audio; inserting</bookmark_value>
-<bookmark_value>music;inserting</bookmark_value>
-</bookmark><comment>UFI: added "music;inserting"</comment>
+         <bookmark_value>sound files</bookmark_value>
+         <bookmark_value>playing movies and sound files</bookmark_value>
+         <bookmark_value>videos</bookmark_value>
+         <bookmark_value>movies</bookmark_value>
+         <bookmark_value>audio</bookmark_value>
+         <bookmark_value>music</bookmark_value>
+</bookmark><comment>UFI: added "music;inserting"</comment><comment>MW made "sounds;",  "audio;", "music;" one level entries and added "movies"</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_AVMEDIA" id="bm_id6085699" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1065C" role="heading" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1066C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000404.xhp#moviesound"/>
-</section>
-<paragraph role="heading" id="par_idN10683" xml-lang="en-US" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="NEW">Click where you want to insert the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1068E" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10696" xml-lang="en-US" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
-<paragraph role="note" id="par_idN10699" xml-lang="en-US" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106D7" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1069C" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in an Impress presentation</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW">Open the slide that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">Click the object icon for the movie or sound file on the slide.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106BF" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in a Writer, Calc, or Draw document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106C6" xml-lang="en-US" l10n="NEW">Open the document that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106CD" xml-lang="en-US" l10n="CHG">Click Play on the Media Playback toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN106D0" xml-lang="en-US" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000404.xhp#moviesound"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN10683" role="heading" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1068A" role="paragraph" l10n="NEW">Click where you want to insert the file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1068E" role="paragraph" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10696" role="paragraph" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10699" role="note" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D7" role="paragraph" l10n="NEW">Click <emph>Open</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0120200912190948" role="paragraph" l10n="NEW">Alternatively, you can choose <item type="menuitem">Tools - Media Player</item> to open the Media Player. Use the Media Player to preview all supported media files. Click the Apply button in the Media Player window to insert the current media file into your document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1069C" role="heading" level="2" l10n="NEW">To play a movie or sound file</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106A7" role="paragraph" l10n="NEW">Click the object icon for the movie or sound file in your document.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id0120200912190940" role="paragraph" l10n="NEW">If the icon is arranged on the background, hold down Ctrl while you click.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id0120200912062096" role="paragraph" l10n="NEW">The Media Playback toolbar is shown.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10788" role="paragraph" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0120200912062064" role="note" l10n="NEW">When you show an Impress presentation, the embedded sound or video on the current slide plays automatically until it's over or until you leave the slide.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index f0c527c6ea..7b5482c123 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,56 +31,59 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Check for Updates </title>
-<filename>/text/shared/01/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Check for Updates </title>
+         <filename>/text/shared/01/online_update.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7647328"><bookmark_value>updates;checking manually</bookmark_value>
-<bookmark_value>online updates;checking manually</bookmark_value>
+      <bookmark_value>online updates;checking manually</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id315256" xml-lang="en-US" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
-</variable></paragraph><comment>UFI: changed name of page, see i76016</comment>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/><paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
-<paragraph role="note" id="par_id4218878" xml-lang="en-US" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
-<paragraph role="paragraph" id="par_id8132267" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
-<paragraph role="paragraph" id="par_id702230" xml-lang="en-US" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3422345" xml-lang="en-US" l10n="NEW">If an update is available, an icon 
-<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4598inch" height="0.1402inch"><alt id="alt_id3155415" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id315256" role="heading" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
+</variable></paragraph><comment>UFI: changed name of page, see i76016</comment><comment>Next time start download automatically</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3174230" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose %PRODUCTNAME - Online Update in the Options dialog box to disable or enable this feature.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH" id="bm_id0116200901051320" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0116200901063996" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select a folder to download the files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id4218878" role="note" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8132267" role="paragraph" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
+<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4583in" height="0.1354in"><alt xml-lang="en-US" id="alt_id3155415">Icon</alt>
 	</image> on the menu bar will notify you of the update. Click the icon to open a dialog with more information.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9313638" xml-lang="en-US" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id9951780" xml-lang="en-US" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_id6479384" xml-lang="en-US" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3639027" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3722342" xml-lang="en-US" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5106662" xml-lang="en-US" l10n="CHG">Download the new version.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4931485" xml-lang="en-US" l10n="CHG">Install the downloaded files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9168980" xml-lang="en-US" l10n="NEW">Abort this check for updates for now.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9766533" xml-lang="en-US" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id927152" xml-lang="en-US" l10n="NEW">For StarOffice, automatic downloads are currently disabled. Start the download manually.</paragraph>
-<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
-<paragraph role="warning" id="par_id9219641" xml-lang="en-US" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph><comment>Next time start download automatically</comment>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/><paragraph role="paragraph" id="par_id3174230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose Tools - Options - %PRODUCTNAME - Online Update to disable or enable this feature.</ahelp></paragraph>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9313638" role="paragraph" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9951780" role="paragraph" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3639027" role="paragraph" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3722342" role="paragraph" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5106662" role="paragraph" l10n="CHG">Download the new version.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4931485" role="paragraph" l10n="CHG">Install the downloaded files.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9168980" role="paragraph" l10n="NEW">Abort this check for updates for now.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9766533" role="paragraph" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id927152" role="paragraph" l10n="NEW">If automatic downloads are disabled, start the download manually.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6081728" role="paragraph" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9219641" role="warning" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index e0a8bb8e59..dcdae77cd2 100644
--- a/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: online_update_dialog.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,12 +43,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_CHECKFORONLINEUPDATE" id="bm_id2912686" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DLG" id="bm_id9766533" localize="false"/><paragraph role="heading" id="hd_id4959257" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link></paragraph><comment>UFI: this is the dialog</comment><paragraph role="paragraph" id="par_id1906491" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Checks for available updates to your version of %PRODUCTNAME. If a newer version is available, you can choose to download the update. After downloading, if you have write permissions for the installation directory, you can install the update.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id4799340" xml-lang="en-US" l10n="NEW">Once the download starts, you see a progress bar and three buttons on the dialog. You can pause and resume the download by clicking the Pause and Resume buttons. Click Cancel to abort the download and delete the partly downloaded file.</paragraph>
-<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in Tools - Options - %PRODUCTNAME - Online Update.</paragraph>
+<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Online Update.</paragraph>
 <paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">After the download is complete, you can click Install to start the installation of the update. You see a confirmation dialog, where you can choose to close %PRODUCTNAME.</paragraph>
 <paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
 <paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD2" id="bm_id2517777" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in Tools - Options - %PRODUCTNAME - Online Update.</ahelp></paragraph><comment>Install</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in %PRODUCTNAME - Online Update in the Options dialog box.</ahelp></paragraph><comment>Install</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_INSTALL" id="bm_id1738639" localize="false"/><paragraph role="paragraph" id="par_id8277230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Installs the downloaded update.</ahelp></paragraph><comment>Pause</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_PAUSE" id="bm_id6081728" localize="false"/><paragraph role="paragraph" id="par_id4086428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Pauses the download. Later click Resume to continue downloading.</ahelp></paragraph><comment>Resume</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_RESUME" id="bm_id9219641" localize="false"/><paragraph role="paragraph" id="par_id9024628" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Continues a paused download.</ahelp></paragraph><comment>Cancel</comment>
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index 2b68f5a091..1c98c3606a 100755
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: packagemanager.xhp,v $
- * $Revision: 1.18.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -117,32 +114,32 @@
 </list>
 <bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER_TREELISTBOX" id="bm_id8800927" localize="false"/>
 <paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="CHG"><ahelp hid="42769">Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD" id="bm_id788903" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/2180354572" id="bm_id0523200810583698" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD -->
+<!-- removed HID 2180354572 -->
 <paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
 <paragraph role="paragraph" id="par_idN106BA" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256276">Click Add to add an extension.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN106BD" xml-lang="en-US" l10n="CHG">A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE" id="bm_id2089297" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_LICENSE_PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE" id="bm_id2089297" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/>
 <paragraph role="paragraph" id="par_id4856410" xml-lang="en-US" l10n="NEW">An extension can show a license dialog. <ahelp hid=".">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE" id="bm_id888393" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/42795" id="bm_id0523200810562584" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_REMOVE" id="bm_id0523200810562584" localize="false"/>
 <paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
 <paragraph role="paragraph" id="par_idN106D1" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256277">Select the extension that you want to remove, and then click Remove.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/42794" id="bm_id0523200810570553" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_DISABLE" id="bm_id0523200810570553" localize="false"/>
 <paragraph role="paragraph" id="par_id0523200810573866" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable or disable the extension.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE" id="bm_id6375926" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE -->
 <paragraph role="heading" id="par_idN1064D" xml-lang="en-US" level="2" l10n="NEW">Enable</paragraph>
 <paragraph role="paragraph" id="par_idN106DE" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256278">Select the extension that you want to enable, and then click Enable.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE" id="bm_id755943" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE -->
 <paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="2" l10n="NEW">Disable</paragraph>
 <paragraph role="paragraph" id="par_idN106EB" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256279">Select the extension that you want to disable, and then click Disable.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES" id="bm_id412915" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/2180354573" id="bm_id0523200810585545" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES -->
+<!-- removed HID 2180354573 -->
 <paragraph role="heading" id="hd_id4453566" xml-lang="en-US" level="2" l10n="NEW">Update</paragraph>
 <paragraph role="paragraph" id="par_id4129459" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately.</ahelp> You will see the <link href="text/shared/01/extensionupdate.xhp">Extension Update</link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS" id="bm_id6909085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/42792" id="bm_id052320081054360" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS -->
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_OPTIONS" id="bm_id052320081054360" localize="false"/>
 <paragraph role="heading" id="hd_id4921414" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
 <paragraph role="paragraph" id="par_id1439558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 2c7522e04f..37cade2acb 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: password_dlg.xhp,v $
- * $Revision: 1.4.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,28 +29,36 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared01password_dlgxml" indexer="include">
-<title id="tit" xml-lang="en-US">Password</title>
-<filename>/text/shared/01/password_dlg.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="passwort">
-<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="1" l10n="U" oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
-<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
+      <topic id="textshared01password_dlgxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Password</title>
+         <filename>/text/shared/01/password_dlg.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="passwort">
+         <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="1" l10n="U"
+                    oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
+         <embed href="text/shared/01/password_main.xhp#password_rules"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
-<paragraph role="heading" id="hd_id3146857" xml-lang="en-US" level="2" l10n="U" oldref="65">Password</paragraph>
-<paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password that is at least five characters long. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
+                    oldref="65">Password</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
-<paragraph role="heading" id="hd_id3153029" xml-lang="en-US" level="2" l10n="U" oldref="66">Confirm</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="67">Re-enter the password.</paragraph>
-<paragraph role="heading" id="hd_id3155351" xml-lang="en-US" level="2" l10n="U" oldref="68">Undoing password protection</paragraph>
-<paragraph role="paragraph" id="par_id3146109" xml-lang="en-US" l10n="U" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
+                    oldref="66">Confirm</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
+                    oldref="68">Undoing password protection</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/password_main.xhp b/helpcontent2/source/text/shared/01/password_main.xhp
index 877d79bab2..65e535d0a4 100755
--- a/helpcontent2/source/text/shared/01/password_main.xhp
+++ b/helpcontent2/source/text/shared/01/password_main.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: password_main.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,37 +29,50 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared01password_mainxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Enter Master Password</title>
-<filename>/text/shared/01/password_main.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-21T14:06:53">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="password_main">
-<paragraph role="heading" id="hd_id3154183" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="password_maintitle"><link href="text/shared/01/password_main.xhp" name="Enter Master Password">Enter Master Password</link>
+      <topic id="textshared01password_mainxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Enter Master Password</title>
+         <filename>/text/shared/01/password_main.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="password_main">
+         <paragraph xml-lang="en-US" id="hd_id3154183" role="heading" level="1" l10n="U" oldref="1"><variable id="password_maintitle"><link href="text/shared/01/password_main.xhp" name="Enter Master Password">Enter Master Password</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
-<section id="password_text">
-<paragraph role="paragraph" id="par_id3146857" xml-lang="en-US" l10n="CHG" oldref="3">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="6">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_CRT" id="bm_id3154682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD" id="bm_id3151100" localize="false"/>
-<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="7">Master password</paragraph>
-<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT" id="bm_id3149549" localize="false"/>
-<paragraph role="heading" id="hd_id3144436" xml-lang="en-US" level="2" l10n="U" oldref="9">Confirm master password</paragraph>
-<paragraph role="paragraph" id="par_id3145129" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT">Re-enter the master password.</ahelp></paragraph>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/protection.xhp#protection"/>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id3154841" role="paragraph" l10n="U" oldref="2"><ahelp hid="">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
+         <section id="password_text">
+            <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph" l10n="CHG" oldref="3">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147000" role="paragraph" l10n="U" oldref="6">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph>
+         </section>
+         <section id="password_rules">
+            <paragraph xml-lang="en-US" id="par_id0608200910545958" role="paragraph" l10n="NEW">You should only use passwords that are hard to find by other persons or programs. A password should follow these rules:</paragraph>
+            <list type="unordered">
+               <listitem>
+                  <paragraph xml-lang="en-US" id="par_id0608200910545989" role="paragraph" l10n="NEW">Length of eight or more characters.</paragraph>
+               </listitem>
+               <listitem>
+                  <paragraph xml-lang="en-US" id="par_id0608200910545951" role="paragraph" l10n="NEW">Contains a mix of lower case and upper case letters, numbers, and special characters.</paragraph>
+               </listitem>
+               <listitem>
+                  <paragraph xml-lang="en-US" id="par_id0608200910545923" role="paragraph" l10n="NEW">Cannot be found in any wordbook or encyclopedia.</paragraph>
+               </listitem>
+               <listitem>
+                  <paragraph xml-lang="en-US" id="par_id0608200910550049" role="paragraph" l10n="NEW">Has no direct relation to your personal data, e.g., date of birth or car plate.</paragraph>
+               </listitem>
+            </list>
+         </section>
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_CRT -->
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD -->
+<paragraph xml-lang="en-US" id="hd_id3147588" role="heading" level="2" l10n="U" oldref="7">Master password</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="U" oldref="8"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT -->
+<paragraph xml-lang="en-US" id="hd_id3144436" role="heading" level="2" l10n="U" oldref="9">Confirm master password</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145129" role="paragraph" l10n="U" oldref="10"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT">Re-enter the master password.</ahelp></paragraph>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/protection.xhp#protection"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 31dcfcb86a..7c3eb19442 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ref_pdf_export.xhp,v $
- * $Revision: 1.23.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,257 +29,262 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared01ref_pdf_exportxml" indexer="include">
-<title id="tit" xml-lang="en-US">Export as PDF</title>
-<filename>/text/shared/01/ref_pdf_export.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="pdf_export">
+      <topic id="textshared01ref_pdf_exportxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Export as PDF</title>
+         <filename>/text/shared/01/ref_pdf_export.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="pdf_export">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149532"><bookmark_value>PDF;export</bookmark_value>
-<bookmark_value>portable document format</bookmark_value>
-<bookmark_value>exporting;to PDF</bookmark_value>
+         <bookmark_value>portable document format</bookmark_value>
+         <bookmark_value>exporting;to PDF</bookmark_value>
 </bookmark><comment>MW made "PDF export a two level entry"</comment><comment>UFI: write guide and move bookmarks there</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_EXPORTDOCASPDF" id="bm_id2491692" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExportToPDF" id="bm_id3146856" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES" id="bm_id3150758" localize="false"/>
-<paragraph role="heading" id="hd_id3149532" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="export_as_pdf"><variable id="ref_pdf_export"><link href="text/shared/01/ref_pdf_export.xhp" name="Export as PDF">Export as PDF</link>
+<!-- removed HID FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES -->
+<paragraph xml-lang="en-US" id="hd_id3149532" role="heading" level="1" l10n="U"
+                    oldref="52"><variable id="export_as_pdf"><variable id="ref_pdf_export"><link href="text/shared/01/ref_pdf_export.xhp" name="Export as PDF">Export as PDF</link>
 </variable>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed. 
+         <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000401.xhp#exportpdf"/>
-</section>
-<paragraph role="heading" id="hd_id746482" xml-lang="en-US" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
-<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="3" l10n="CHG" oldref="2">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL" id="bm_id1623889" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL" id="bm_id1033967" localize="false"/>
-<paragraph role="heading" id="hd_id3166445" xml-lang="en-US" level="3" l10n="U" oldref="4">All</paragraph>
-<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_ALL">Exports all defined print ranges. If no print range is defined, exports the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE" id="bm_id8835718" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_RANGE" id="bm_id2618793" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_Edit_RID_PDF_TAB_GENER_ED_PAGES" id="bm_id2676778" localize="false"/>
-<paragraph role="heading" id="hd_id3154673" xml-lang="en-US" level="3" l10n="U" oldref="6">Range</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION" id="bm_id480971" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_SELECTION" id="bm_id8889126" localize="false"/>
-<paragraph role="heading" id="hd_id3147043" xml-lang="en-US" level="3" l10n="U" oldref="8">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_SELECTION">Exports the current selection.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10706" xml-lang="en-US" level="3" l10n="NEW">Images</paragraph>
-<paragraph role="paragraph" id="par_idN1070A" xml-lang="en-US" l10n="NEW">Sets the PDF export options for images inside your document.</paragraph>
-<paragraph role="note" id="par_idN1071B" xml-lang="en-US" l10n="NEW">EPS images with embedded previews are exported only as previews. EPS images without embedded previews are exported as empty placeholders.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_LOSSLESSCOMPRESSION" id="bm_id1303750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION" id="bm_id8095950" localize="false"/>
-<paragraph role="heading" id="par_idN10715" xml-lang="en-US" level="3" l10n="NEW">Lossless compression</paragraph>
-<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects a lossless compression of images. All pixels are preserved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_JPEGCOMPRESSION" id="bm_id1926023" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION" id="bm_id137028" localize="false"/>
-<paragraph role="heading" id="par_idN10730" xml-lang="en-US" level="3" l10n="NEW">JPEG compression</paragraph>
-<paragraph role="paragraph" id="par_idN10734" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects a JPEG compression of images. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels get lost and artefacts are introduced, but file sizes are reduced.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_NumericField_RID_PDF_EXPORT_DLG_NF_QUALITY" id="bm_id9557786" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_MetricField_RID_PDF_TAB_GENER_NF_QUALITY" id="bm_id5849787" localize="false"/>
-<paragraph role="heading" id="par_idN1074C" xml-lang="en-US" level="4" l10n="NEW">Quality</paragraph>
-<paragraph role="paragraph" id="par_idN10750" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the quality level for JPEG compression.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_REDUCEIMAGERESOLUTION" id="bm_id9614551" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_REDUCEIMAGERESOLUTION" id="bm_id3947264" localize="false"/>
-<paragraph role="heading" id="par_idN10767" xml-lang="en-US" level="3" l10n="NEW">Reduce image resolution</paragraph>
-<paragraph role="paragraph" id="par_idN1076B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to resample or down-size the images to a lower number of pixels per inch.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_ComboBox_RID_PDF_EXPORT_DLG_CO_REDUCEIMAGERESOLUTION" id="bm_id9715567" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION" id="bm_id1751762" localize="false"/>
-<paragraph role="paragraph" id="par_idN10782" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the target resolution for the images.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="3" l10n="NEW">General</paragraph>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Sets general PDF export options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_PDFA_1B_SELECT" id="bm_id303964" localize="false"/>
-<paragraph role="heading" id="hd_id2796411" xml-lang="en-US" level="3" l10n="NEW">PDF/A-1a</paragraph>
-<paragraph role="paragraph" id="par_id5016327" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1a format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF" id="bm_id3958250" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF" id="bm_id6884975" localize="false"/>
-<paragraph role="heading" id="par_idN107A0" xml-lang="en-US" level="3" l10n="NEW">Tagged PDF</paragraph>
-<paragraph role="paragraph" id="par_idN107A4" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects to write PDF tags. This can increase file size by huge amounts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN107B3" xml-lang="en-US" l10n="CHG">Tagged PDF contains information about the structure of the document contents. This can help to display the document on devices with different screens, and when using screen reader software.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES" id="bm_id5767998" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTNOTES" id="bm_id7971129" localize="false"/>
-<paragraph role="heading" id="par_idN107BE" xml-lang="en-US" level="3" l10n="NEW">Export notes</paragraph>
-<paragraph role="paragraph" id="par_idN107C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to export notes of Writer and Calc documents as PDF notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTBOOKMARKS" id="bm_id8694112" localize="false"/>
-<paragraph role="heading" id="hd_id8257087" xml-lang="en-US" level="3" l10n="NEW">Export bookmarks</paragraph>
-<paragraph role="paragraph" id="par_id3479415" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTFORMFIELDS" id="bm_id9651478" localize="false"/>
-<paragraph role="heading" id="par_idN107F4" xml-lang="en-US" level="3" l10n="CHG">Create PDF form</paragraph>
-<paragraph role="paragraph" id="par_id4909817" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Choose to create a PDF form. This can be filled out and printed by the user of the PDF document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_ListBox_RID_PDF_EXPORT_DLG_LB_FORMSFORMAT" id="bm_id2612689" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT" id="bm_id3088167" localize="false"/>
-<paragraph role="heading" id="hd_id6585283" xml-lang="en-US" level="4" l10n="NEW">Submit format</paragraph>
-<paragraph role="paragraph" id="par_idN107F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id0901200811454970" xml-lang="en-US" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
-<paragraph role="paragraph" id="par_idN10807" xml-lang="en-US" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES" id="bm_id113223" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
-<paragraph role="heading" id="hd_id3946958" xml-lang="en-US" level="3" l10n="NEW">Export automatically inserted blank pages</paragraph>
-<paragraph role="paragraph" id="par_id8551896" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
-<paragraph role="heading" id="hd_id080420080355360" xml-lang="en-US" level="3" l10n="NEW">Create hybrid file</paragraph>
-<paragraph role="paragraph" id="par_id0804200803553767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">Sun PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9796441" xml-lang="en-US" level="2" l10n="NEW">Initial View</paragraph>
-<paragraph role="heading" id="hd_id1218604" xml-lang="en-US" level="3" l10n="NEW">Panes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
-<paragraph role="heading" id="hd_id7071443" xml-lang="en-US" level="4" l10n="NEW">Page only</paragraph>
-<paragraph role="paragraph" id="par_id1851557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows only the page contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_OUTLINE" id="bm_id5274819" localize="false"/>
-<paragraph role="heading" id="hd_id7464217" xml-lang="en-US" level="4" l10n="NEW">Bookmarks and page</paragraph>
-<paragraph role="paragraph" id="par_id4490188" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a bookmarks palette and the page contents.</ahelp><comment>UFI: Adobe reader help names the panes as "palettes"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_THUMBS" id="bm_id9964598" localize="false"/>
-<paragraph role="heading" id="hd_id3581041" xml-lang="en-US" level="4" l10n="NEW">Thumbnails and page</paragraph>
-<paragraph role="paragraph" id="par_id956755" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a thumbnails palette and the page contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867883100" id="bm_id5693533" localize="false"/>
-<paragraph role="heading" id="hd_id1905575" xml-lang="en-US" level="4" l10n="NEW">Open on page</paragraph>
-<paragraph role="paragraph" id="par_id9776909" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show the given page when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7509994" xml-lang="en-US" level="3" l10n="NEW">Magnification</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_DEFAULT" id="bm_id7652821" localize="false"/>
-<paragraph role="heading" id="hd_id5900143" xml-lang="en-US" level="4" l10n="NEW">Default</paragraph>
-<paragraph role="paragraph" id="par_id822168" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page contents without zooming. If the reader software is configured to use a zoom factor by default, the page shows with that zoom factor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIND" id="bm_id8959929" localize="false"/>
-<paragraph role="heading" id="hd_id1092257" xml-lang="en-US" level="4" l10n="NEW">Fit in window</paragraph>
-<paragraph role="paragraph" id="par_id3092135" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit entirely into the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIDTH" id="bm_id5164342" localize="false"/>
-<paragraph role="heading" id="hd_id654622" xml-lang="en-US" level="4" l10n="NEW">Fit width</paragraph>
-<paragraph role="paragraph" id="par_id814539" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_VISIBLE" id="bm_id4881435" localize="false"/>
-<paragraph role="heading" id="hd_id9883114" xml-lang="en-US" level="4" l10n="NEW">Fit visible</paragraph>
-<paragraph role="paragraph" id="par_id2362437" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the text and graphics on the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867877465" id="bm_id3769035" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/867883610" id="bm_id2727134" localize="false"/>
-<paragraph role="heading" id="hd_id7296975" xml-lang="en-US" level="4" l10n="NEW">Zoom factor</paragraph>
-<paragraph role="paragraph" id="par_id371715" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a given zoom factor when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id329905" xml-lang="en-US" level="3" l10n="NEW">Page layout</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT" id="bm_id2023682" localize="false"/>
-<paragraph role="heading" id="hd_id5632496" xml-lang="en-US" level="4" l10n="NEW">Default</paragraph>
-<paragraph role="paragraph" id="par_id1694082" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the pages according to the layout setting of the reader software.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG" id="bm_id863368" localize="false"/>
-<paragraph role="heading" id="hd_id8454237" xml-lang="en-US" level="4" l10n="NEW">Single page</paragraph>
-<paragraph role="paragraph" id="par_id672322" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows one page at a time.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT" id="bm_id3083590" localize="false"/>
-<paragraph role="heading" id="hd_id7387310" xml-lang="en-US" level="4" l10n="NEW">Continuous</paragraph>
-<paragraph role="paragraph" id="par_id8764305" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages in a continuous vertical column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC" id="bm_id5062410" localize="false"/>
-<paragraph role="heading" id="hd_id6223639" xml-lang="en-US" level="4" l10n="NEW">Continuous facing</paragraph>
-<paragraph role="paragraph" id="par_id5318765" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
-<paragraph role="heading" id="hd_id1416364" xml-lang="en-US" level="4" l10n="NEW">First page is left</paragraph>
-<paragraph role="paragraph" id="par_id9596850" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id18005" xml-lang="en-US" level="2" l10n="NEW">User Interface</paragraph>
-<paragraph role="heading" id="hd_id6676839" xml-lang="en-US" level="3" l10n="NEW">Window options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
-<paragraph role="heading" id="hd_id3809015" xml-lang="en-US" level="4" l10n="NEW">Resize window to initial page</paragraph>
-<paragraph role="paragraph" id="par_id1321146" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_CNTRWIN" id="bm_id1589098" localize="false"/>
-<paragraph role="heading" id="hd_id6994842" xml-lang="en-US" level="4" l10n="NEW">Center window on screen</paragraph>
-<paragraph role="paragraph" id="par_id9601428" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a reader window centered on screen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_OPNFULL" id="bm_id1278420" localize="false"/>
-<paragraph role="heading" id="hd_id6369212" xml-lang="en-US" level="4" l10n="NEW">Open in full screen mode</paragraph>
-<paragraph role="paragraph" id="par_id1111789" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window in front of all other windows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE" id="bm_id8746910" localize="false"/>
-<paragraph role="heading" id="hd_id2041993" xml-lang="en-US" level="4" l10n="NEW">Display document title</paragraph>
-<paragraph role="paragraph" id="par_id4576555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown with the document title in the reader's title bar.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id4632099" xml-lang="en-US" level="3" l10n="NEW">User interface options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR" id="bm_id9636524" localize="false"/>
-<paragraph role="heading" id="hd_id3154087" xml-lang="en-US" level="4" l10n="NEW">Hide menu bar</paragraph>
-<paragraph role="paragraph" id="par_id6582537" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's menu bar when the document is active.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVTOOLBAR" id="bm_id5675527" localize="false"/>
-<paragraph role="heading" id="hd_id729697" xml-lang="en-US" level="4" l10n="NEW">Hide toolbar</paragraph>
-<paragraph role="paragraph" id="par_id769066" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's toolbar when the document is active.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVWINCTRL" id="bm_id3486434" localize="false"/>
-<paragraph role="heading" id="hd_id376293" xml-lang="en-US" level="4" l10n="NEW">Hide window controls</paragraph>
-<paragraph role="paragraph" id="par_id43641" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's controls when the document is active.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id1886654" xml-lang="en-US" level="3" l10n="NEW">Transitions</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TRANSITIONEFFECTS" id="bm_id7838373" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_TRANSITIONEFFECTS" id="bm_id4296395" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS" id="bm_id3901791" localize="false"/>
-<paragraph role="heading" id="par_idN107D9" xml-lang="en-US" level="4" l10n="NEW">Use transition effects</paragraph>
-<paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to export Impress slide transition effects to respective PDF effects.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9053926" xml-lang="en-US" level="3" l10n="NEW">Bookmarks</paragraph>
-<bookmark xml-lang="en-US" branch="hid/867861104" id="bm_id4371776" localize="false"/>
-<paragraph role="heading" id="hd_id1941892" xml-lang="en-US" level="4" l10n="NEW">All bookmark levels</paragraph>
-<paragraph role="paragraph" id="par_id341807" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show all bookmark levels when the reader opens the PDF file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867861105" id="bm_id6384166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/867866738" id="bm_id1559801" localize="false"/>
-<paragraph role="heading" id="hd_id486770" xml-lang="en-US" level="4" l10n="NEW">Visible bookmark levels</paragraph>
-<paragraph role="paragraph" id="par_id4850001" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show bookmark levels down to the selected level when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9464094" xml-lang="en-US" level="2" l10n="NEW">Links</paragraph>
-<paragraph role="paragraph" id="par_id9302346" xml-lang="en-US" l10n="NEW">Specify how to export bookmarks and hyperlinks in your document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_EXP_BMRK_TO_DEST" id="bm_id5594042" localize="false"/>
-<paragraph role="heading" id="hd_id8296151" xml-lang="en-US" level="3" l10n="NEW">Export bookmarks as named destinations</paragraph>
-<paragraph role="paragraph" id="par_id4809411" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The bookmarks (targets of references) in PDF files can be defined as rectangular areas. Additionally, bookmarks to named objects can be defined by their names. Enable the checkbox to export the names of objects in your document as valid bookmark targets. This allows to link to those objects by name from other documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_CNV_OOO_DOCTOPDF" id="bm_id6163823" localize="false"/>
-<paragraph role="heading" id="hd_id6454969" xml-lang="en-US" level="3" l10n="NEW">Convert document references to PDF targets</paragraph>
-<paragraph role="paragraph" id="par_id7928708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this checkbox to convert the URLs referencing other ODF files to PDF files with the same name. In the referencing URLs the extensions .odt, .odp, .ods, .odg, and .odm are converted to the extension .pdf.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_ENAB_RELLINKFSYS" id="bm_id9741508" localize="false"/>
-<paragraph role="heading" id="hd_id3864253" xml-lang="en-US" level="3" l10n="NEW">Export URLs relative to file system</paragraph>
-<paragraph role="paragraph" id="par_id3144016" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this checkbox to export URLs to other documents as relative URLs in the file system. See <link href="text/shared/guide/hyperlink_rel_abs.xhp">"relative hyperlinks"</link> in the Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9937131" xml-lang="en-US" level="3" l10n="NEW">Cross-document links</paragraph>
-<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">Specify how to handle hyperlinks from your PDF file to other files.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_DEFAULT" id="bm_id909451" localize="false"/>
-<paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Default mode</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Links from your PDF document to other documents will be handled as it is specified in your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_APPLICATION" id="bm_id1665089" localize="false"/>
-<paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="3" l10n="NEW">Open with PDF reader application</paragraph>
-<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the PDF reader application that currently shows the document. The PDF reader application must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_BROWSER" id="bm_id4997100" localize="false"/>
-<paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Open with Internet browser</paragraph>
-<paragraph role="paragraph" id="par_id1909848" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3068636" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT" id="bm_id3811456" localize="false"/>
-<paragraph role="heading" id="hd_id2480849" xml-lang="en-US" level="3" l10n="NEW">Encrypt the PDF document</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD" id="bm_id8720358" localize="false"/>
-<paragraph role="heading" id="hd_id2927335" xml-lang="en-US" level="4" l10n="NEW">Set open password</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS" id="bm_id824610" localize="false"/>
-<paragraph role="heading" id="hd_id4071779" xml-lang="en-US" level="3" l10n="NEW">Restrict permission</paragraph>
-<paragraph role="paragraph" id="par_id7844477" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
-<paragraph role="heading" id="hd_id6478469" xml-lang="en-US" level="4" l10n="NEW">Set permission password</paragraph>
-<paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7985168" xml-lang="en-US" level="4" l10n="NEW">Printing</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
-<paragraph role="heading" id="hd_id876186" xml-lang="en-US" level="4" l10n="NEW">Not permitted</paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Printing the document is not permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES" id="bm_id1693472" localize="false"/>
-<paragraph role="heading" id="hd_id599688" xml-lang="en-US" level="4" l10n="NEW">Low resolution (150 dpi)</paragraph>
-<paragraph role="paragraph" id="par_id1371501" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The document can only be printed in low resolution (150 dpi). Not all PDF readers honor this setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES" id="bm_id8849147" localize="false"/>
-<paragraph role="heading" id="hd_id4661702" xml-lang="en-US" level="4" l10n="NEW">High resolution</paragraph>
-<paragraph role="paragraph" id="par_id7868892" xml-lang="en-US" l10n="CHG"><ahelp hid=".">The document can be printed in high resolution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2188787" xml-lang="en-US" level="4" l10n="NEW">Changes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE" id="bm_id8967253" localize="false"/>
-<paragraph role="heading" id="hd_id5833307" xml-lang="en-US" level="4" l10n="NEW">Not permitted</paragraph>
-<paragraph role="paragraph" id="par_id7726676" xml-lang="en-US" l10n="NEW"><ahelp hid=".">No changes of the content are permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL" id="bm_id53712" localize="false"/>
-<paragraph role="heading" id="hd_id3729361" xml-lang="en-US" level="4" l10n="NEW">Inserting, deleting, and rotating pages</paragraph>
-<paragraph role="paragraph" id="par_id9573961" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only inserting, deleting, and rotating pages is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM" id="bm_id8904385" localize="false"/>
-<paragraph role="heading" id="hd_id7700430" xml-lang="en-US" level="4" l10n="NEW">Filling in form fields</paragraph>
-<paragraph role="paragraph" id="par_id1180455" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only filling in form fields is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT" id="bm_id677205" localize="false"/>
-<paragraph role="heading" id="hd_id3405560" xml-lang="en-US" level="4" l10n="NEW">Commenting, filling in form fields</paragraph>
-<paragraph role="paragraph" id="par_id3409527" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only commenting and filling in form fields is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY" id="bm_id4991607" localize="false"/>
-<paragraph role="heading" id="hd_id7112338" xml-lang="en-US" level="4" l10n="NEW">Any except extracting pages</paragraph>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">All changes are permitted, except extracting pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY" id="bm_id7106845" localize="false"/>
-<paragraph role="heading" id="hd_id2091433" xml-lang="en-US" level="4" l10n="NEW">Enable copying of content</paragraph>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable copying of content to the clipboard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS" id="bm_id3429059" localize="false"/>
-<paragraph role="heading" id="hd_id9312417" xml-lang="en-US" level="4" l10n="NEW">Enable text access for accessibility tools</paragraph>
-<paragraph role="paragraph" id="par_id9089022" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable text access for accessibility tools.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150507" xml-lang="en-US" level="2" l10n="U" oldref="50">Export</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid=".">Exports the current file in PDF format.</ahelp></paragraph>
-</body>
-</helpdocument>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000401.xhp#exportpdf"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id746482" role="heading" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="2" l10n="CHG"
+                 oldref="2">Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL" id="bm_id1033967" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3166445" role="heading" level="2" l10n="U" oldref="4">All</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149893" role="paragraph" l10n="U" oldref="5"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_ALL">Exports all defined print ranges. If no print range is defined, exports the entire document.</ahelp></paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE" id="bm_id2618793" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/filter:Edit:RID_PDF_TAB_GENER:ED_PAGES" id="bm_id2676778" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="U" oldref="6">Range</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION" id="bm_id8889126" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147043" role="heading" level="2" l10n="U" oldref="8">Selection</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="9"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_SELECTION">Exports the current selection.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10706" role="heading" level="2" l10n="NEW">Images</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">Sets the PDF export options for images inside your document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1071B" role="note" l10n="NEW">EPS images with embedded previews are exported only as previews. EPS images without embedded previews are exported as empty placeholders.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_LOSSLESSCOMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION" id="bm_id8095950" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10715" role="heading" level="2" l10n="NEW">Lossless compression</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10719" role="paragraph" l10n="NEW"><ahelp hid=".">Selects a lossless compression of images. All pixels are preserved.</ahelp></paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_JPEGCOMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION" id="bm_id137028" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10730" role="heading" level="2" l10n="NEW">JPEG compression</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10734" role="paragraph" l10n="CHG"><ahelp hid=".">Selects a JPEG compression of images. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels get lost and artefacts are introduced, but file sizes are reduced.</ahelp></paragraph>
+<!-- removed HID filter_NumericField_RID_PDF_EXPORT_DLG_NF_QUALITY -->
+<bookmark xml-lang="en-US" branch="hid/filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY" id="bm_id5849787" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1074C" role="heading" level="2" l10n="NEW">Quality</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10750" role="paragraph" l10n="CHG"><ahelp hid=".">Enter the quality level for JPEG compression.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_REDUCEIMAGERESOLUTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION" id="bm_id3947264" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10767" role="heading" level="2" l10n="NEW">Reduce image resolution</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1076B" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to resample or down-size the images to a lower number of pixels per inch.</ahelp></paragraph>
+<!-- removed HID filter_ComboBox_RID_PDF_EXPORT_DLG_CO_REDUCEIMAGERESOLUTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION" id="bm_id1751762" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10782" role="paragraph" l10n="NEW"><ahelp hid=".">Select the target resolution for the images.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">General</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Sets general PDF export options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT" id="bm_id303964" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2796411" role="heading" level="2" l10n="NEW">PDF/A-1a</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5016327" role="paragraph" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1a format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF" id="bm_id6884975" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107A0" role="heading" level="2" l10n="NEW">Tagged PDF</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107A4" role="paragraph" l10n="CHG"><ahelp hid=".">Selects to write PDF tags. This can increase file size by huge amounts.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107B3" role="paragraph" l10n="CHG">Tagged PDF contains information about the structure of the document contents. This can help to display the document on devices with different screens, and when using screen reader software.</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES" id="bm_id7971129" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107BE" role="heading" level="2" l10n="NEW">Export notes</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107C2" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export comments of Writer and Calc documents as PDF notes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS" id="bm_id8694112" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8257087" role="heading" level="2" l10n="NEW">Export bookmarks</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3479415" role="paragraph" l10n="CHG"><ahelp hid=".">Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS" id="bm_id9651478" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107F4" role="heading" level="2" l10n="CHG">Create PDF form</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4909817" role="paragraph" l10n="CHG"><ahelp hid=".">Choose to create a PDF form. This can be filled out and printed by the user of the PDF document.</ahelp></paragraph>
+<!-- removed HID filter_ListBox_RID_PDF_EXPORT_DLG_LB_FORMSFORMAT -->
+<bookmark xml-lang="en-US" branch="hid/filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT" id="bm_id3088167" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
+      <paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" l10n="NEW">Panes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7071443" role="heading" level="2" l10n="NEW">Page only</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1851557" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows only the page contents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE" id="bm_id5274819" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7464217" role="heading" level="2" l10n="NEW">Bookmarks and page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4490188" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a bookmarks palette and the page contents.</ahelp><comment>UFI: Adobe reader help names the panes as "palettes"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS" id="bm_id9964598" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3581041" role="heading" level="2" l10n="NEW">Thumbnails and page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id956755" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a thumbnails palette and the page contents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_NUMERICFIELD_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE" id="bm_id5693533" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1905575" role="heading" level="2" l10n="NEW">Open on page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9776909" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show the given page when the reader opens the PDF file.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7509994" role="heading" level="2" l10n="NEW">Magnification</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT" id="bm_id7652821" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5900143" role="heading" level="2" l10n="NEW">Default</paragraph>
+      <paragraph xml-lang="en-US" id="par_id822168" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page contents without zooming. If the reader software is configured to use a zoom factor by default, the page shows with that zoom factor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND" id="bm_id8959929" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1092257" role="heading" level="2" l10n="NEW">Fit in window</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3092135" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit entirely into the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH" id="bm_id5164342" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id654622" role="heading" level="2" l10n="NEW">Fit width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id814539" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE" id="bm_id4881435" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9883114" role="heading" level="2" l10n="NEW">Fit visible</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2362437" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the text and graphics on the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_OPNFTR_RB_MAGNF_ZOOM" id="bm_id3769035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FILTER_METRICFIELD_RID_PDF_TAB_OPNFTR_NUM_MAGNF_ZOOM" id="bm_id2727134" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7296975" role="heading" level="2" l10n="NEW">Zoom factor</paragraph>
+      <paragraph xml-lang="en-US" id="par_id371715" role="paragraph" l10n="NEW"><ahelp hid=".">Select a given zoom factor when the reader opens the PDF file.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id329905" role="heading" level="2" l10n="NEW">Page layout</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT" id="bm_id2023682" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5632496" role="heading" level="2" l10n="NEW">Default</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1694082" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the pages according to the layout setting of the reader software.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG" id="bm_id863368" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8454237" role="heading" level="2" l10n="NEW">Single page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id672322" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows one page at a time.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT" id="bm_id3083590" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7387310" role="heading" level="2" l10n="NEW">Continuous</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8764305" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages in a continuous vertical column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC" id="bm_id5062410" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6223639" role="heading" level="2" l10n="NEW">Continuous facing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5318765" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1416364" role="heading" level="2" l10n="NEW">First page is left</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id18005" role="heading" level="2" l10n="NEW">User Interface</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6676839" role="heading" level="2" l10n="NEW">Window options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3809015" role="heading" level="2" l10n="NEW">Resize window to initial page</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1321146" role="paragraph" l10n="CHG"><ahelp hid=".">Select to generate a PDF file that is shown in a window displaying the whole initial page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN" id="bm_id1589098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6994842" role="heading" level="2" l10n="NEW">Center window on screen</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9601428" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a reader window centered on screen.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL" id="bm_id1278420" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6369212" role="heading" level="2" l10n="NEW">Open in full screen mode</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1111789" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window in front of all other windows.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE" id="bm_id8746910" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2041993" role="heading" level="2" l10n="NEW">Display document title</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4576555" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown with the document title in the reader's title bar.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4632099" role="heading" level="2" l10n="NEW">User interface options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR" id="bm_id9636524" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154087" role="heading" level="2" l10n="NEW">Hide menu bar</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6582537" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's menu bar when the document is active.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR" id="bm_id5675527" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id729697" role="heading" level="2" l10n="NEW">Hide toolbar</paragraph>
+      <paragraph xml-lang="en-US" id="par_id769066" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's toolbar when the document is active.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL" id="bm_id3486434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id376293" role="heading" level="2" l10n="NEW">Hide window controls</paragraph>
+      <paragraph xml-lang="en-US" id="par_id43641" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's controls when the document is active.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id1886654" role="heading" level="2" l10n="NEW">Transitions</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TRANSITIONEFFECTS -->
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_GENER_CB_TRANSITIONEFFECTS -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS" id="bm_id3901791" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107D9" role="heading" level="2" l10n="NEW">Use transition effects</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107DD" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export Impress slide transition effects to respective PDF effects.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9053926" role="heading" level="2" l10n="NEW">Bookmarks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS" id="bm_id4371776" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1941892" role="heading" level="2" l10n="NEW">All bookmark levels</paragraph>
+      <paragraph xml-lang="en-US" id="par_id341807" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show all bookmark levels when the reader opens the PDF file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS" id="bm_id6384166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FILTER_NUMERICFIELD_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS" id="bm_id1559801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id486770" role="heading" level="2" l10n="NEW">Visible bookmark levels</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4850001" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show bookmark levels down to the selected level when the reader opens the PDF file.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9464094" role="heading" level="2" l10n="NEW">Links</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9302346" role="paragraph" l10n="NEW">Specify how to export bookmarks and hyperlinks in your document.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_EXP_BMRK_TO_DEST" id="bm_id5594042" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8296151" role="heading" level="2" l10n="NEW">Export bookmarks as named destinations</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4809411" role="paragraph" l10n="NEW"><ahelp hid=".">The bookmarks (targets of references) in PDF files can be defined as rectangular areas. Additionally, bookmarks to named objects can be defined by their names. Enable the checkbox to export the names of objects in your document as valid bookmark targets. This allows to link to those objects by name from other documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_CNV_OOO_DOCTOPDF" id="bm_id6163823" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6454969" role="heading" level="2" l10n="NEW">Convert document references to PDF targets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7928708" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this checkbox to convert the URLs referencing other ODF files to PDF files with the same name. In the referencing URLs the extensions .odt, .odp, .ods, .odg, and .odm are converted to the extension .pdf.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_ENAB_RELLINKFSYS" id="bm_id9741508" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3864253" role="heading" level="2" l10n="NEW">Export URLs relative to file system</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144016" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this checkbox to export URLs to other documents as relative URLs in the file system. See <link href="text/shared/guide/hyperlink_rel_abs.xhp">"relative hyperlinks"</link> in the Help.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9937131" role="heading" level="2" l10n="NEW">Cross-document links</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5616626" role="paragraph" l10n="NEW">Specify how to handle hyperlinks from your PDF file to other files.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_DEFAULT" id="bm_id909451" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1972106" role="heading" level="2" l10n="NEW">Default mode</paragraph>
+      <paragraph xml-lang="en-US" id="par_id79042" role="paragraph" l10n="NEW"><ahelp hid=".">Links from your PDF document to other documents will be handled as it is specified in your operating system.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_APPLICATION" id="bm_id1665089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4076357" role="heading" level="2" l10n="NEW">Open with PDF reader application</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8231757" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the PDF reader application that currently shows the document. The PDF reader application must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_BROWSER" id="bm_id4997100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3168736" role="heading" level="2" l10n="NEW">Open with Internet browser</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1909848" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Security</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT -->
+<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="2" l10n="NEW">Encrypt the PDF document</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD" id="bm_id8720358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set open password</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS -->
+<paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Restrict permission</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6478469" role="heading" level="2" l10n="NEW">Set permission password</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7985168" role="heading" level="2" l10n="NEW">Printing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Not permitted</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW"><ahelp hid=".">Printing the document is not permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES" id="bm_id1693472" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id599688" role="heading" level="2" l10n="NEW">Low resolution (150 dpi)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW"><ahelp hid=".">The document can only be printed in low resolution (150 dpi). Not all PDF readers honor this setting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES" id="bm_id8849147" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4661702" role="heading" level="2" l10n="NEW">High resolution</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="CHG"><ahelp hid=".">The document can be printed in high resolution.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2188787" role="heading" level="2" l10n="NEW">Changes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE" id="bm_id8967253" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5833307" role="heading" level="2" l10n="NEW">Not permitted</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW"><ahelp hid=".">No changes of the content are permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL" id="bm_id53712" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3729361" role="heading" level="2" l10n="NEW">Inserting, deleting, and rotating pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9573961" role="paragraph" l10n="NEW"><ahelp hid=".">Only inserting, deleting, and rotating pages is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM" id="bm_id8904385" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7700430" role="heading" level="2" l10n="NEW">Filling in form fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW"><ahelp hid=".">Only filling in form fields is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT" id="bm_id677205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3405560" role="heading" level="2" l10n="NEW">Commenting, filling in form fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3409527" role="paragraph" l10n="NEW"><ahelp hid=".">Only commenting and filling in form fields is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_ANY_NOCOPY" id="bm_id4991607" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7112338" role="heading" level="2" l10n="NEW">Any except extracting pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW"><ahelp hid=".">All changes are permitted, except extracting pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY" id="bm_id7106845" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2091433" role="heading" level="2" l10n="NEW">Enable copying of content</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5092318" role="paragraph" l10n="NEW"><ahelp hid=".">Select to enable copying of content to the clipboard.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS" id="bm_id3429059" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9312417" role="heading" level="2" l10n="NEW">Enable text access for accessibility tools</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9089022" role="paragraph" l10n="NEW"><ahelp hid=".">Select to enable text access for accessibility tools.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150507" role="heading" level="2" l10n="U"
+                 oldref="50">Export</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="51"><ahelp hid=".">Exports the current file in PDF format.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp b/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
index aaac3d9b6f..359ec13a07 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ref_pdf_send_as.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/securitywarning.xhp b/helpcontent2/source/text/shared/01/securitywarning.xhp
index 668de9a5f9..21d5717fb1 100644
--- a/helpcontent2/source/text/shared/01/securitywarning.xhp
+++ b/helpcontent2/source/text/shared/01/securitywarning.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: securitywarning.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,13 +45,13 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id6499832"><bookmark_value>security;warning dialogs with macros</bookmark_value>
 <bookmark_value>macros;security warning dialog</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_WARNING_MACROSDISABLED" id="bm_id7895443" localize="false"/>
+<!-- removed HID HID_WARNING_MACROSDISABLED -->
 <bookmark xml-lang="en-US" branch="hid/HID_WARNING_SECURITY_HYPERLINK" id="bm_id5382854" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSECDLG_MACROWARN" id="bm_id7777947" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">When you open a document that contains an unsigned macro, or a signed macro from an unknown source, the <emph>Security Warning</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>Tools - Options - %PRODUCTNAME - Security</emph> to set the options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">View Signature</paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can view the signature.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Always trust macros from this source</paragraph>
diff --git a/helpcontent2/source/text/shared/01/selectcertificate.xhp b/helpcontent2/source/text/shared/01/selectcertificate.xhp
index a3578bdadb..bbb0482e84 100644
--- a/helpcontent2/source/text/shared/01/selectcertificate.xhp
+++ b/helpcontent2/source/text/shared/01/selectcertificate.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selectcertificate.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,8 +47,8 @@
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_CHOOSESIGNATURES" id="bm_id8177129" localize="false"/>
 <paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
 <paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the certificate that you want to digitally sign the current document with.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_CERTCHOOSER_BTN_VIEWCERT" id="bm_id5101168" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_CERTPATH_BTN_VIEWCERT" id="bm_id3395794" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT" id="bm_id5101168" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT" id="bm_id3395794" localize="false"/>
 <paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">View Certificate</paragraph>
 <paragraph role="paragraph" id="par_idN10575" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog where you can examine the selected certificate.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/01/webhtml.xhp b/helpcontent2/source/text/shared/01/webhtml.xhp
index 1a632f39ff..49b1a5cc7d 100644
--- a/helpcontent2/source/text/shared/01/webhtml.xhp
+++ b/helpcontent2/source/text/shared/01/webhtml.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webhtml.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#webhtml"/>
 </section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem">Tools - Options - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem">Tools - Options - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/xformsdata.xhp b/helpcontent2/source/text/shared/01/xformsdata.xhp
index 507976dfa6..fe9a95b1ad 100644
--- a/helpcontent2/source/text/shared/01/xformsdata.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdata.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdata.xhp,v $
- * $Revision: 1.15.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,77 +32,81 @@
  
 	
 <meta>
-<topic id="textshared01xformsdataxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Data Navigator</title>
-<filename>/text/shared/01/xformsdata.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="datanavigator">
+      <topic id="textshared01xformsdataxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Data Navigator</title>
+         <filename>/text/shared/01/xformsdata.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="datanavigator">
 <bookmark xml-lang="en-US" branch="index" id="bm_id6823023"><bookmark_value>data structure of XForms</bookmark_value>
-<bookmark_value>deleting;models/instances</bookmark_value>
-<bookmark_value>models in XForms</bookmark_value>
-<bookmark_value>Data Navigator;display options</bookmark_value>
+         <bookmark_value>deleting;models/instances</bookmark_value>
+         <bookmark_value>models in XForms</bookmark_value>
+         <bookmark_value>Data Navigator;display options</bookmark_value>
 </bookmark><comment>MW made "Data Navigator.." a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_FM_SHOW_DATANAVIGATOR" id="bm_id7463799" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ShowDataNavigator" id="bm_id7677236" localize="false"/>
-<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX" id="bm_id0130200901571189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TAB_CONTROL" id="bm_id0130200901573014" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1054E" role="heading" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
-</section>
+         <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_LIST" id="bm_id759300" localize="false"/>
-<paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2" l10n="NEW">Model name</paragraph>
-<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Model name</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_MENUBTN" id="bm_id6110721" localize="false"/>
-<paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">Models</paragraph>
-<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Models</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_ADD" id="bm_id6934415" localize="false"/>
-<paragraph role="heading" id="par_idN10604" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10608" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
-<paragraph role="heading" id="hd_id0910200811173295" xml-lang="en-US" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
-<paragraph role="paragraph" id="par_id0910200811173255" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10604" role="heading" level="3" l10n="NEW">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10608" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME" id="bm_id0130200901582112" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0130200901590878" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0910200811173295" role="heading" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0910200811173255" role="paragraph" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_REMOVE" id="bm_id5671559" localize="false"/>
-<paragraph role="heading" id="par_idN10612" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN10616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10612" role="heading" level="3" l10n="NEW">Remove</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10616" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_EDIT" id="bm_id8617816" localize="false"/>
-<paragraph role="heading" id="par_idN10743" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
-<paragraph role="paragraph" id="par_idN10749" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10743" role="heading" level="3" l10n="NEW">Rename</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10749" role="paragraph" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_SHOW_DETAILS" id="bm_id5646229" localize="false"/>
-<paragraph role="heading" id="par_idN10619" xml-lang="en-US" level="3" l10n="NEW">Show Details</paragraph>
-<paragraph role="paragraph" id="par_idN1061D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10619" role="heading" level="3" l10n="NEW">Show Details</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1061D" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_ITEMS_LIST" id="bm_id2524491" localize="false"/>
-<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Instance</paragraph>
-<paragraph role="paragraph" id="par_idN10682" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1057D" role="heading" level="2" l10n="NEW">Instance</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10682" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id4040955" localize="false"/>
-<paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Submissions</paragraph>
-<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
-<paragraph role="heading" id="par_idN10592" xml-lang="en-US" level="2" l10n="NEW">Bindings</paragraph>
-<paragraph role="paragraph" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1058B" role="heading" level="2" l10n="NEW">Submissions</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1058F" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10592" role="heading" level="2" l10n="NEW">Bindings</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10596" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_INSTANCES_MENUBTN" id="bm_id3339335" localize="false"/>
-<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2" l10n="NEW">Instances</paragraph>
-<paragraph role="paragraph" id="par_idN1059D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10599" role="heading" level="2" l10n="NEW">Instances</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1059D" role="paragraph" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_ADD" id="bm_id9214148" localize="false"/>
-<paragraph role="heading" id="par_idN10649" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1064D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10649" role="heading" level="3" l10n="NEW">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1064D" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_EDIT" id="bm_id4229255" localize="false"/>
-<paragraph role="heading" id="par_idN10650" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
-<paragraph role="paragraph" id="par_idN10654" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10650" role="heading" level="3" l10n="NEW">Edit</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10654" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_REMOVE" id="bm_id1858882" localize="false"/>
-<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN1065B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1065E" xml-lang="en-US" level="3" l10n="NEW">Show data types</paragraph>
-<paragraph role="paragraph" id="par_idN10662" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10657" role="heading" level="3" l10n="NEW">Remove</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1065B" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1065E" role="heading" level="3" l10n="NEW">Show data types</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10662" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" id="bm_id2156132" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" id="bm_id9931943" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id1840876" localize="false"/>
-<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="3" l10n="CHG">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="3" l10n="CHG">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_EDIT" id="bm_id1051362" localize="false"/>
-<paragraph role="heading" id="par_idN10624" xml-lang="en-US" level="3" l10n="CHG">Edit</paragraph>
-<paragraph role="paragraph" id="par_idN10628" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10624" role="heading" level="3" l10n="CHG">Edit</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10628" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_REMOVE" id="bm_id3862117" localize="false"/>
-<paragraph role="heading" id="par_idN1062B" xml-lang="en-US" level="3" l10n="CHG">Delete</paragraph>
-<paragraph role="paragraph" id="par_idN1062F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN1062B" role="heading" level="3" l10n="CHG">Delete</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1062F" role="paragraph" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/xformsdataadd.xhp b/helpcontent2/source/text/shared/01/xformsdataadd.xhp
index 3ba52c5d65..c4626dd282 100644
--- a/helpcontent2/source/text/shared/01/xformsdataadd.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataadd.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdataadd.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,66 +51,66 @@
   <paragraph xml-lang="en-US" id="par_idN1054B" role="paragraph" l10n="CHG"><ahelp hid=".">Adds a new item or edits the selected item in the XForms Data Navigator.</ahelp> Items can be elements, attributes, submissions, or bindings.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="CHG"><ahelp hid=".">%PRODUCTNAME inserts a new item directly after the currently selected item in the Data Navigator. A new attribute is added to the currently selected element.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME" id="bm_id5775627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME" id="bm_id5775627" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10563" role="heading" level="3" l10n="NEW">Name</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10567" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the name of the item.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1056A" role="note" l10n="CHG">The attribute names must be unique within the same group.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1056D" role="heading" level="3" l10n="NEW">Type</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10571" role="paragraph" l10n="NEW"><ahelp hid=".">Select the type of a new item. You cannot change the type of an edited item.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT" id="bm_id9302041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT" id="bm_id9302041" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10574" role="heading" level="3" l10n="NEW">Default value</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10578" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a default value for the selected item.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1057B" role="heading" level="2" l10n="NEW">Settings</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1057F" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the properties of the selected item.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE" id="bm_id5551011" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE" id="bm_id5551011" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10582" role="heading" level="3" l10n="NEW">Data type</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10586" role="paragraph" l10n="NEW"><ahelp hid=".">Select the data type for the selected item.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_REQUIRED" id="bm_id2487258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED" id="bm_id2487258" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_REQUIRED" id="bm_id1239661" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10589" role="heading" level="3" l10n="NEW">Required</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1058D" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_REQUIRED" id="bm_id1404156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED" id="bm_id1404156" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10590" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_RELEVANT" id="bm_id8867458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT" id="bm_id8867458" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_RELEVANT" id="bm_id3679616" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN105AA" role="heading" level="3" l10n="NEW">Relevant</paragraph>
   <paragraph xml-lang="en-US" id="par_idN105AE" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_RELEVANT" id="bm_id3488570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT" id="bm_id3488570" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN105B1" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT" id="bm_id2007812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT" id="bm_id2007812" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CONSTRAINT" id="bm_id8594622" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="3" l10n="NEW">Constraint</paragraph>
   <paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_CONSTRAINT" id="bm_id2240058" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT" id="bm_id2240058" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN106C7" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can specify the constraint condition.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY" id="bm_id6203192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY" id="bm_id6203192" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_READONLY" id="bm_id4252449" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN105E4" role="heading" level="3" l10n="NEW">Read-only</paragraph>
   <paragraph xml-lang="en-US" id="par_idN105E8" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_READONLY" id="bm_id165105" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY" id="bm_id165105" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN105EB" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CALCULATE" id="bm_id6361583" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE" id="bm_id6361583" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CALCULATION" id="bm_id383617" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10605" role="heading" level="3" l10n="CHG">Calculate / Calculation<comment>UFI: inconsistent use of name</comment></paragraph>
   <paragraph xml-lang="en-US" id="par_idN10609" role="paragraph" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_CALCULATE" id="bm_id2518997" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE" id="bm_id2518997" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN1076B" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter the calculation.</paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp b/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
index cad32aa4d8..3cbf78d75c 100644
--- a/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdataaddcon.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
   <paragraph xml-lang="en-US" id="par_idN1053E" role="heading" level="1" l10n="NEW">Add Condition</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10542" role="paragraph" l10n="CHG"><ahelp hid=".">Add a condition in this subdialog of the Add Item / Edit Item dialog of the Data Navigator.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION" id="bm_id5080721" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION" id="bm_id5080721" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10561" role="heading" level="2" l10n="NEW">Condition</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a condition.</ahelp><comment>examples?</comment></paragraph>
   <paragraph xml-lang="en-US" id="par_idN10568" role="heading" level="2" l10n="NEW">Result</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a preview of the result.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_CONDITION_PB_EDIT_NAMESPACES" id="bm_id5074007" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES" id="bm_id5074007" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Edit Namespaces</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Form Namespaces dialog where you can add, edit, or delete namespaces.</ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/01/xformsdatachange.xhp b/helpcontent2/source/text/shared/01/xformsdatachange.xhp
index 8e20fabc8a..f27b3ea2b4 100644
--- a/helpcontent2/source/text/shared/01/xformsdatachange.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdatachange.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdatachange.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/xformsdataname.xhp b/helpcontent2/source/text/shared/01/xformsdataname.xhp
index 6804fe6882..c9537e8fe7 100644
--- a/helpcontent2/source/text/shared/01/xformsdataname.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataname.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdataname.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,17 +56,17 @@
   <paragraph xml-lang="en-US" id="par_idN10561" role="heading" level="2" l10n="NEW">Namespaces</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the currently defined namespaces for the form.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_ADD_NAMESPACE" id="bm_id5343485" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE" id="bm_id5343485" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10568" role="heading" level="2" l10n="NEW">Add</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="NEW"><ahelp hid=".">Adds a new namespace to the list.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1056F" role="paragraph" l10n="NEW">Use the <emph>Add Namespace</emph> dialog to enter the Prefix and URL.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_EDIT_NAMESPACE" id="bm_id3851435" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE" id="bm_id3851435" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Edit</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Edits the selected namespace.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1057D" role="paragraph" l10n="NEW">Use the <emph>Edit Namespace</emph> dialog to edit the Prefix and URL.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_DELETE_NAMESPACE" id="bm_id2580034" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE" id="bm_id2580034" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="2" l10n="NEW">Delete</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected namespace.</ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/01/xformsdatatab.xhp b/helpcontent2/source/text/shared/01/xformsdatatab.xhp
index 26d3aee7fc..9dd4b8d611 100644
--- a/helpcontent2/source/text/shared/01/xformsdatatab.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdatatab.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsdatatab.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,93 +29,89 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared01xformsdatatabxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Data (for XML Form Documents)</title>
-<filename>/text/shared/01/xformsdatatab.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-24T11:25:20">UFI: XForms, Data Navigator, Add/Edit Item, Condition, Edit Namespaces</created>
-<lastedited date="2006-02-22T17:10:46">UFI: copied this as new file</lastedited>
-</history>
-</meta>
-<body>
-<section id="data">
-<paragraph role="heading" id="hd_id5766472" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/xformsdatatab.xhp">Data (for XML Form Documents)</link></paragraph>
-<paragraph role="paragraph" id="par_id1161534" xml-lang="en-US" l10n="NEW">The Data tab page of the Properties dialog for an XML Form document offers some XML forms settings.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040501.xhp#xformsdatatab"/>
-</section>
-<paragraph role="paragraph" id="par_id3994567" xml-lang="en-US" l10n="NEW">The possible settings of the <emph>Data</emph> tab page of a control depend on the respective control. You will only see the options that are available for the current control and context. The following fields are available:</paragraph>
+      <topic id="textshared01xformsdatatabxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Data (for XML Form Documents)</title>
+         <filename>/text/shared/01/xformsdatatab.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="data">
+         <paragraph xml-lang="en-US" id="hd_id5766472" role="heading" level="1" l10n="NEW"><link href="text/shared/01/xformsdatatab.xhp">Data (for XML Form Documents)</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id1161534" role="paragraph" l10n="NEW">The Data tab page of the Properties dialog for an XML Form document offers some XML forms settings.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040501.xhp#xformsdatatab"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3994567" role="paragraph" l10n="NEW">The possible settings of the <emph>Data</emph> tab page of a control depend on the respective control. You will only see the options that are available for the current control and context. The following fields are available:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XML_DATA_MODEL" id="bm_id2136295" localize="false"/>
-<paragraph role="heading" id="hd_id9461653" xml-lang="en-US" level="2" l10n="NEW">XML data model</paragraph>
-<paragraph role="paragraph" id="par_id9239173" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a model from the list of all models in the current document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9461653" role="heading" level="2" l10n="NEW">XML data model</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9239173" role="paragraph" l10n="NEW"><ahelp hid=".">Select a model from the list of all models in the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_BINDING_NAME" id="bm_id908841" localize="false"/>
-<paragraph role="heading" id="hd_id2656941" xml-lang="en-US" level="2" l10n="NEW">Binding</paragraph>
-<paragraph role="paragraph" id="par_id1481063" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select or enter the name of a binding. Selecting the name of an existing binding associates the binding with the form control. Entering a new name creates a new binding and associates it with the form control.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2656941" role="heading" level="2" l10n="NEW">Binding</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1481063" role="paragraph" l10n="NEW"><ahelp hid=".">Select or enter the name of a binding. Selecting the name of an existing binding associates the binding with the form control. Entering a new name creates a new binding and associates it with the form control.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_BIND_EXPRESSION" id="bm_id9841608" localize="false"/>
-<paragraph role="heading" id="hd_id7921079" xml-lang="en-US" level="2" l10n="NEW">Binding expression</paragraph>
-<paragraph role="paragraph" id="par_id636921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the DOM node <comment>what's a DOM node? spec doesn't tell</comment>to bind the control model to<comment>what's a control model? spec doesn't tell. may be a typo in spec: control's model?</comment>. Click the ... button for a dialog to enter the XPath expression.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7921079" role="heading" level="2" l10n="NEW">Binding expression</paragraph>
+      <paragraph xml-lang="en-US" id="par_id636921" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the DOM node <comment>what's a DOM node? spec doesn't tell</comment>to bind the control model to<comment>what's a control model? spec doesn't tell. may be a typo in spec: control's model?</comment>. Click the ... button for a dialog to enter the XPath expression.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_REQUIRED" id="bm_id4186223" localize="false"/>
-<paragraph role="heading" id="hd_id2799157" xml-lang="en-US" level="2" l10n="NEW">Required</paragraph>
-<paragraph role="paragraph" id="par_id3004547" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2799157" role="heading" level="2" l10n="NEW">Required</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3004547" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_RELEVANT" id="bm_id1491134" localize="false"/>
-<paragraph role="heading" id="hd_id6401867" xml-lang="en-US" level="2" l10n="NEW">Relevant</paragraph>
-<paragraph role="paragraph" id="par_id18616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id6401867" role="heading" level="2" l10n="NEW">Relevant</paragraph>
+      <paragraph xml-lang="en-US" id="par_id18616" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_READONLY" id="bm_id2873622" localize="false"/>
-<paragraph role="heading" id="hd_id6138492" xml-lang="en-US" level="2" l10n="NEW">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id4569231" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id6138492" role="heading" level="2" l10n="NEW">Read-only</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4569231" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CONSTRAINT" id="bm_id2374034" localize="false"/>
-<paragraph role="heading" id="hd_id291451" xml-lang="en-US" level="2" l10n="NEW">Constraint</paragraph>
-<paragraph role="paragraph" id="par_id3341776" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id291451" role="heading" level="2" l10n="NEW">Constraint</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3341776" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CALCULATION" id="bm_id1687063" localize="false"/>
-<paragraph role="heading" id="hd_id5947141" xml-lang="en-US" level="2" l10n="NEW">Calculation</paragraph>
-<paragraph role="paragraph" id="par_id1911679" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id5947141" role="heading" level="2" l10n="NEW">Calculation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1911679" role="paragraph" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_DATA_TYPE" id="bm_id8982207" localize="false"/>
-<paragraph role="heading" id="hd_id9364909" xml-lang="en-US" level="2" l10n="NEW">Data type</paragraph>
-<paragraph role="paragraph" id="par_id4473403" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a data type which the control should be validated against.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="2" l10n="NEW">Data type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4473403" role="paragraph" l10n="NEW"><ahelp hid=".">Select a data type which the control should be validated against.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/UID_PROP_REMOVE_DATA_TYPE" id="bm_id3486434" localize="false"/>
-<paragraph role="heading" id="hd_id2480849" xml-lang="en-US" level="3" l10n="NEW">x</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a user-defined data type and click the button to delete the user-defined data type.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="3" l10n="NEW">x</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select a user-defined data type and click the button to delete the user-defined data type.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/UID_PROP_ADD_DATA_TYPE" id="bm_id3068636" localize="false"/>
-<paragraph role="heading" id="hd_id2927335" xml-lang="en-US" level="3" l10n="NEW">+</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click the button to open a dialog where you can enter the name of a new user-defined data type. The new data type inherits all facets from the currently selected data type.</ahelp></paragraph>
-<paragraph role="note" id="par_id4071779" xml-lang="en-US" l10n="NEW">The following lists all facets that are valid for data types. Some facets are only available for some data types.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="3" l10n="NEW">+</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click the button to open a dialog where you can enter the name of a new user-defined data type. The new data type inherits all facets from the currently selected data type.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id4071779" role="note" l10n="NEW">The following lists all facets that are valid for data types. Some facets are only available for some data types.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_WHITESPACES" id="bm_id7074190" localize="false"/>
-<paragraph role="heading" id="hd_id4313791" xml-lang="en-US" level="3" l10n="NEW">Whitespaces</paragraph>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies how whitespaces are to be handled when a string of the current data type is being processed. Possible values are Preserve, Replace, and Collapse. The sematics follow the definition at <link href="http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace">http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace</link>.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id4313791" role="heading" level="3" l10n="NEW">Whitespaces</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies how whitespaces are to be handled when a string of the current data type is being processed. Possible values are Preserve, Replace, and Collapse. The sematics follow the definition at http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_PATTERN" id="bm_id5452436" localize="false"/>
-<paragraph role="heading" id="hd_id4191717" xml-lang="en-US" level="3" l10n="NEW">Pattern</paragraph>
-<paragraph role="paragraph" id="par_id2318796" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies a regular expression pattern. Strings validated against the data type must conform to this pattern to be valid. The XSD data type syntax for regular expressions is different from the regular expression syntax used elseswhere in %PRODUCTNAME, for example in the Find &amp; Replace dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id4191717" role="heading" level="3" l10n="NEW">Pattern</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2318796" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies a regular expression pattern. Strings validated against the data type must conform to this pattern to be valid. The XSD data type syntax for regular expressions is different from the regular expression syntax used elseswhere in %PRODUCTNAME, for example in the Find &amp; Replace dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_TOTAL_DIGITS" id="bm_id9527878" localize="false"/>
-<paragraph role="heading" id="hd_id399182" xml-lang="en-US" level="3" l10n="NEW">Digits (total)</paragraph>
-<paragraph role="paragraph" id="par_id5298318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of digits that values of the decimal data type can have.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id399182" role="heading" level="3" l10n="NEW">Digits (total)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5298318" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of digits that values of the decimal data type can have.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_FRACTION_DIGITS" id="bm_id6342356" localize="false"/>
-<paragraph role="heading" id="hd_id7588732" xml-lang="en-US" level="3" l10n="NEW">Digits (fraction)</paragraph>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of fractional digits that values of the decimal data type can have.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7588732" role="heading" level="3" l10n="NEW">Digits (fraction)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of fractional digits that values of the decimal data type can have.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_INCLUSIVE" id="bm_id166936" localize="false"/>
-<paragraph role="heading" id="hd_id3496200" xml-lang="en-US" level="3" l10n="NEW">Max. (inclusive)</paragraph>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an inclusive upper bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3496200" role="heading" level="3" l10n="NEW">Max. (inclusive)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an inclusive upper bound for values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_EXCLUSIVE" id="bm_id6826990" localize="false"/>
-<paragraph role="heading" id="hd_id888698" xml-lang="en-US" level="3" l10n="NEW">Max. (exclusive)</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an exclusive upper bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="3" l10n="NEW">Max. (exclusive)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an exclusive upper bound for values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MIN_INCLUSIVE" id="bm_id6897183" localize="false"/>
-<paragraph role="heading" id="hd_id7594225" xml-lang="en-US" level="3" l10n="NEW">Min. (inclusive)</paragraph>
-<paragraph role="paragraph" id="par_id8147221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an inclusive lower bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7594225" role="heading" level="3" l10n="NEW">Min. (inclusive)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an inclusive lower bound for values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MIN_EXCLUSIVE" id="bm_id7003387" localize="false"/>
-<paragraph role="heading" id="hd_id5081637" xml-lang="en-US" level="3" l10n="NEW">Min. (exclusive)</paragraph>
-<paragraph role="paragraph" id="par_id9759514" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an exclusive lower bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id5081637" role="heading" level="3" l10n="NEW">Min. (exclusive)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9759514" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an exclusive lower bound for values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_LENGTH" id="bm_id4897915" localize="false"/>
-<paragraph role="heading" id="hd_id1614429" xml-lang="en-US" level="3" l10n="NEW">Length</paragraph>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the number of characters for a string.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/38008" id="bm_id3105868" localize="false"/><comment>UFI: found 37998 which is already in use</comment>
-<paragraph role="heading" id="hd_id1278420" xml-lang="en-US" level="3" l10n="NEW">Length (at least)</paragraph>
-<paragraph role="paragraph" id="par_id8746910" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the minimum number of characters for a string.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id1614429" role="heading" level="3" l10n="NEW">Length</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the number of characters for a string.</ahelp></paragraph>
+<!-- removed HID 38008 --><comment>UFI: found 37998 which is already in use</comment>
+<paragraph xml-lang="en-US" id="hd_id1278420" role="heading" level="3" l10n="NEW">Length (at least)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8746910" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the minimum number of characters for a string.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_LENGTH" id="bm_id3908810" localize="false"/>
-<paragraph role="heading" id="hd_id9636524" xml-lang="en-US" level="3" l10n="NEW">Length (at most)</paragraph>
-<paragraph role="paragraph" id="par_id5675527" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum number of characters for a string.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id9636524" role="heading" level="3" l10n="NEW">Length (at most)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5675527" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum number of characters for a string.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01110000.xhp b/helpcontent2/source/text/shared/02/01110000.xhp
index 7918dada7d..f0f3e53b4b 100644
--- a/helpcontent2/source/text/shared/02/01110000.xhp
+++ b/helpcontent2/source/text/shared/02/01110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01140000.xhp b/helpcontent2/source/text/shared/02/01140000.xhp
index 4165245c9b..f33db0534a 100644
--- a/helpcontent2/source/text/shared/02/01140000.xhp
+++ b/helpcontent2/source/text/shared/02/01140000.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.
  * 
@@ -11,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.17 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,396 +32,349 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0201140000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Show Draw Functions</title>
-<filename>/text/shared/02/01140000.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textshared0201140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Show Draw Functions</title>
+         <filename>/text/shared/02/01140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150476"><bookmark_value>Drawing bar</bookmark_value>
-<bookmark_value>lines; draw functions</bookmark_value>
-<bookmark_value>polygon drawing</bookmark_value>
-<bookmark_value>freeform lines; draw functions</bookmark_value>
-<bookmark_value>text boxes; positioning</bookmark_value>
-<bookmark_value>headings; entering as text box</bookmark_value>
-<bookmark_value>text objects; draw functions</bookmark_value>
-<bookmark_value>ticker text</bookmark_value>
-<bookmark_value>text; animating</bookmark_value>
-<bookmark_value>vertical callouts</bookmark_value>
-<bookmark_value>vertical text boxes</bookmark_value>
-</bookmark>
-  <comment>MW moved "frames;" and "selecting;"  to the shared guide groups.xhp</comment>
-  <paragraph xml-lang="en-US" id="par_id3150476" role="paragraph" l10n="E" oldref="96" localize="false"/>
-  <section id="zeichnen">
-   
-   
+      <bookmark_value>lines; draw functions</bookmark_value>
+      <bookmark_value>polygon drawing</bookmark_value>
+      <bookmark_value>freeform lines; draw functions</bookmark_value>
+      <bookmark_value>text boxes; positioning</bookmark_value>
+      <bookmark_value>headings; entering as text box</bookmark_value>
+      <bookmark_value>text objects; draw functions</bookmark_value>
+      <bookmark_value>ticker text</bookmark_value>
+      <bookmark_value>text; animating</bookmark_value>
+      <bookmark_value>vertical callouts</bookmark_value>
+      <bookmark_value>vertical text boxes</bookmark_value>
+      <bookmark_value>cube drawing</bookmark_value>
+      <bookmark_value>triangle drawing</bookmark_value>
+      <bookmark_value>ellipse drawing</bookmark_value>
+      <bookmark_value>rectangle drawing</bookmark_value>
+      <bookmark_value>shapes</bookmark_value>
+</bookmark><comment>MW moved "frames;" and "selecting;"  to the shared guide groups.xhp</comment><comment>MW added 5 entries</comment>
+<paragraph xml-lang="en-US" id="par_id3150476" role="paragraph" l10n="E" oldref="96"
+                 localize="false"/>
+      <section id="zeichnen">
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_DRAW" id="bm_id484265" localize="false"/>
-   
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertDraw" id="bm_id3149205" localize="false"/>
-   <paragraph xml-lang="en-US" id="hd_id3152363" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3150789" role="paragraph" l10n="CHG" oldref="72"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing </emph>bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
-   
-  </section>
-  <section id="syzeichnen">
-   
-   <paragraph xml-lang="en-US" id="par_idN10849" role="paragraph" l10n="NEW">You can switch on and off the Drawing toolbar of Writer and Calc documents using an icon on the Standard toolbar.</paragraph>
-   <section id="syshowdraw">
-    
-    <table id="tbl_id3149182">
-     
-     
-     <tablerow>
-      <tablecell>
-       <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E"> 
-<image id="img_id3153683" src="res/commandimagelist/sc_insertdraw.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3152363" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150789" role="paragraph" l10n="CHG" oldref="72"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing </emph>bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
+      </section>
+      <section id="syzeichnen">
+         <paragraph xml-lang="en-US" id="par_idN10849" role="paragraph" l10n="NEW">You can switch on and off the Drawing toolbar of Writer and Calc documents using an icon on the Standard toolbar.</paragraph>
+         <section id="syshowdraw">
+            <table id="tbl_id3149182">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153683" src="res/commandimagelist/sc_insertdraw.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
 	</image></paragraph>
-      </tablecell>
-      <tablecell>
-       <paragraph xml-lang="en-US" id="par_id3153032" role="paragraph" l10n="CHG" oldref="10">Show Draw Functions</paragraph>
-      </tablecell>
-     </tablerow>
-    </table>
-    
-   </section>
-   
-  </section>
-  <paragraph xml-lang="en-US" id="par_idN1089D" role="tip" l10n="NEW">You can show and hide the <emph>Visible Buttons</emph>. Click the arrow at the end of the toolbar to access the <emph>Visible Buttons</emph> command.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="2" l10n="U" oldref="11">Selection</paragraph>
-  <table id="tbl_id3159157">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="E"> 
-<image id="img_id3153824" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153032" role="paragraph" l10n="CHG" oldref="10">Show Draw Functions</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
+
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN1089D" role="tip" l10n="NEW">You can show and hide the <emph>Visible Buttons</emph>. Click the arrow at the end of the toolbar to access the <emph>Visible Buttons</emph> command.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="2" l10n="U"
+                 oldref="11">Selection</paragraph>
+      <table id="tbl_id3159157">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="E">
+<image id="img_id3153824" src="res/commandimagelist/sc_drawselect.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="12">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press Shift, and then click the object.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="12">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press Shift, and then click the object.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_LINE" id="bm_id9304767" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id3155449" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U" oldref="13">Line</paragraph>
-  <table id="tbl_id3150275">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E"> 
-<image id="img_id3147618" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U"
+                 oldref="13">Line</paragraph>
+      <table id="tbl_id3150275">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3147618" src="res/commandimagelist/sc_line.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <paragraph xml-lang="en-US" id="par_id3153360" role="tip" l10n="CHG" oldref="71">To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select <emph>Invisible</emph> in the <emph>Line Style</emph> box on the <emph>Drawing Object Properties</emph> bar.</paragraph>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3153360" role="tip" l10n="CHG" oldref="71">To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select <emph>Invisible</emph> in the <emph>Line Style</emph> box on the <emph>Drawing Object Properties</emph> bar.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_RECT" id="bm_id8789060" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Rect" id="bm_id3149169" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3152922" role="heading" level="2" l10n="U" oldref="16">Rectangle</paragraph>
-  <table id="tbl_id3153178">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="E"> 
-<image id="img_id3158407" src="res/commandimagelist/sc_rect.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3152922" role="heading" level="2" l10n="U"
+                 oldref="16">Rectangle</paragraph>
+      <table id="tbl_id3153178">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="E">
+<image id="img_id3158407" src="res/commandimagelist/sc_rect.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="65"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. To draw a square, hold down Shift while you drag. Click where you want to place a corner of the rectangle, and drag to the size you want.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="65"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. To draw a square, hold down Shift while you drag. Click where you want to place a corner of the rectangle, and drag to the size you want.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_ELLIPSE" id="bm_id1817643" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Ellipse" id="bm_id3153771" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3153367" role="heading" level="2" l10n="U" oldref="20">Ellipse</paragraph>
-  <table id="tbl_id3157894">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph" l10n="E"> 
-<image id="img_id3153951" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153367" role="heading" level="2" l10n="U"
+                 oldref="20">Ellipse</paragraph>
+      <table id="tbl_id3157894">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph" l10n="E">
+<image id="img_id3153951" src="res/commandimagelist/sc_ellipse.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3159197" role="paragraph" l10n="U" oldref="21"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159197" role="paragraph" l10n="U" oldref="21"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_POLYGON_NOFILL" id="bm_id8487307" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Polygon_Unfilled" id="bm_id3146976" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3155308" role="heading" level="2" l10n="U" oldref="23">Polygon</paragraph>
-  <section id="polytext">
-   
-   <table id="tbl_id3155366">
-    
-    
-    <tablerow>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="E"> 
-<image id="img_id3152576" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3155308" role="heading" level="2" l10n="U"
+                 oldref="23">Polygon</paragraph>
+      <section id="polytext">
+         <table id="tbl_id3155366">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="E">
+<image id="img_id3152576" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
 	</image></paragraph>
-     </tablecell>
-     <tablecell>
-      <section id="polytext2">
-       
-       <paragraph xml-lang="en-US" id="par_id3147214" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, double-click the starting point of the line.</ahelp></paragraph>
-       <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="47">Hold the Shift key while drawing a polygon to position new points at 45 degree angles.</paragraph>
-       <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="48">The <link href="text/shared/01/05270000.xhp" name="Edit Points">Edit Points</link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
-       
+               </tablecell>
+               <tablecell>
+                  <section id="polytext2">
+                     <paragraph xml-lang="en-US" id="par_id3147214" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, double-click the starting point of the line.</ahelp></paragraph>
+                     <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="47">Hold the Shift key while drawing a polygon to position new points at 45 degree angles.</paragraph>
+                     <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="48">The <link href="text/shared/01/05270000.xhp" name="Edit Points">Edit Points</link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
+                  </section>
+               </tablecell>
+            </tablerow>
+         </table>
+
       </section>
-     </tablecell>
-    </tablerow>
-   </table>
-   
-  </section>
-  
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_BEZIER_NOFILL" id="bm_id7112387" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Bezier_Unfilled" id="bm_id3149960" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3153279" role="heading" level="2" l10n="U" oldref="56">Curve</paragraph>
-  <table id="tbl_id3150423">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="E"> 
-<image id="img_id3149379" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153279" role="heading" level="2" l10n="U"
+                 oldref="56">Curve</paragraph>
+      <table id="tbl_id3150423">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="E">
+<image id="img_id3149379" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3148878" role="paragraph" l10n="U" oldref="57"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag. 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148878" role="paragraph" l10n="U" oldref="57"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag. 
 </variable></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_FREELINE_NOFILL" id="bm_id7473732" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Freeline_Unfilled" id="bm_id3150116" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3148587" role="heading" level="2" l10n="U" oldref="60">Freeform Line</paragraph>
-  <table id="tbl_id3154015">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="E"> 
-<image id="img_id3154510" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3148587" role="heading" level="2" l10n="U"
+                 oldref="60">Freeform Line</paragraph>
+      <table id="tbl_id3154015">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="E">
+<image id="img_id3154510" src="res/commandimagelist/sc_linetoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154163" role="paragraph" l10n="U" oldref="61"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp> 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154163" role="paragraph" l10n="U" oldref="61"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp>
 </variable></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_ARC" id="bm_id8811603" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Arc" id="bm_id3154272" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3147259" role="heading" level="2" l10n="U" oldref="27">Arc</paragraph>
-  <table id="tbl_id3148566">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph" l10n="E"> 
-<image id="img_id3153710" src="res/commandimagelist/sc_arc.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3147259" role="heading" level="2" l10n="U"
+                 oldref="27">Arc</paragraph>
+      <table id="tbl_id3148566">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph" l10n="E">
+<image id="img_id3153710" src="res/commandimagelist/sc_arc.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3148482" role="paragraph" l10n="U" oldref="66"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down Shift while you drag.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148482" role="paragraph" l10n="U" oldref="66"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down Shift while you drag.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_PIE" id="bm_id8122704" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Pie" id="bm_id3152962" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3153924" role="heading" level="2" l10n="U" oldref="30">Ellipse Pie</paragraph>
-  <table id="tbl_id3148914">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph" l10n="E"> 
-<image id="img_id3159186" src="res/commandimagelist/sc_pie.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153924" role="heading" level="2" l10n="U"
+                 oldref="30">Ellipse Pie</paragraph>
+      <table id="tbl_id3148914">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph" l10n="E">
+<image id="img_id3159186" src="res/commandimagelist/sc_pie.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3156383" role="paragraph" l10n="CHG" oldref="67"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156383" role="paragraph" l10n="CHG" oldref="67"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_CIRCLECUT" id="bm_id485718" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:CircleCut" id="bm_id3145297" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3154964" role="heading" level="2" l10n="U" oldref="33">Circle Segment</paragraph>
-  <table id="tbl_id3163807">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph" l10n="E"> 
-<image id="img_id3147315" src="res/commandimagelist/sc_circlecut.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3154964" role="heading" level="2" l10n="U"
+                 oldref="33">Circle Segment</paragraph>
+      <table id="tbl_id3163807">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph" l10n="E">
+<image id="img_id3147315" src="res/commandimagelist/sc_circlecut.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="68"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down Shift while you drag.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="68"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down Shift while you drag.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT" id="bm_id8730699" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id3147321" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U" oldref="36">Text</paragraph>
-  <table id="tbl_id3150297">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph" l10n="E"> 
-<image id="img_id3155608" src="res/commandimagelist/sc_texttoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+                 oldref="36">Text</paragraph>
+      <table id="tbl_id3150297">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph" l10n="E">
+<image id="img_id3155608" src="res/commandimagelist/sc_texttoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT_MARQUEE" id="bm_id9847340" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:Text_Marquee" id="bm_id3148877" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3158214" role="heading" level="2" l10n="U" oldref="62">Text Animation</paragraph>
-  <table id="tbl_id3150979">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="E"> 
-<image id="img_id3152580" src="res/commandimagelist/sc_text_marquee.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3158214" role="heading" level="2" l10n="U"
+                 oldref="62">Text Animation</paragraph>
+      <table id="tbl_id3150979">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="E">
+<image id="img_id3152580" src="res/commandimagelist/sc_text_marquee.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="63"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp><variable id="lauftext">Inserts animated text with horizontal text direction into the current document. 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="63"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp><variable id="lauftext">Inserts animated text with horizontal text direction into the current document. 
 </variable></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_CAPTION" id="bm_id3229321" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:DrawCaption" id="bm_id3145616" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3149966" role="heading" level="2" l10n="U" oldref="41">Callouts</paragraph>
-  <table id="tbl_id3153793">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph" l10n="E"> 
-<image id="img_id3145256" src="res/commandimagelist/sc_drawcaption.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149966" role="heading" level="2" l10n="U"
+                 oldref="41">Callouts</paragraph>
+      <table id="tbl_id3153793">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph" l10n="E">
+<image id="img_id3145256" src="res/commandimagelist/sc_drawcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3151274" role="paragraph" l10n="U" oldref="70"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
-  <embed href="text/shared/00/00000404.xhp#sybasicshapes"/>
-  <embed href="text/shared/02/symbolshapes.xhp#symbolshapes"/>
-  <embed href="text/shared/00/00000404.xhp#sysymbolshapes"/>
-  <embed href="text/shared/02/blockarrows.xhp#blockarrows"/>
-  <embed href="text/shared/00/00000404.xhp#syblockarrows"/>
-  <embed href="text/shared/02/flowcharts.xhp#flowcharts"/>
-  <embed href="text/shared/00/00000404.xhp#syflowcharts"/>
-  <embed href="text/shared/02/callouts.xhp#callouts"/>
-  <embed href="text/shared/00/00000404.xhp#sycallouts"/>
-  <embed href="text/shared/02/stars.xhp#stars"/>
-  <embed href="text/shared/00/00000404.xhp#systars"/>
-  <paragraph xml-lang="en-US" id="par_idN10E50" role="heading" level="2" l10n="NEW"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10E60" role="paragraph" l10n="NEW">Enables you to edit points on your drawing.</paragraph>
-  <embed href="text/shared/02/fontwork.xhp#fontwork"/>
-  <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
-  <paragraph xml-lang="en-US" id="par_idN10E75" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph>
-  <embed href="text/shared/01/04140000.xhp#grafiktext"/>
-  <embed href="text/shared/00/00000404.xhp#sygrafik"/>
-  <paragraph xml-lang="en-US" id="par_idN10E95" role="heading" level="2" l10n="NEW"><link href="text/shared/3dsettings_toolbar.xhp">Extrusion On/Off</link></paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10EA5" role="paragraph" l10n="NEW">Switches the 3D effects on and off for the selected objects.</paragraph>
-  <embed href="text/shared/00/00000007.xhp#asia"/>
-  <section id="legasia">
-   
-   
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151274" role="paragraph" l10n="U" oldref="70"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
+      <embed href="text/shared/00/00000404.xhp#sybasicshapes"/>
+      <embed href="text/shared/02/symbolshapes.xhp#symbolshapes"/>
+      <embed href="text/shared/00/00000404.xhp#sysymbolshapes"/>
+      <embed href="text/shared/02/blockarrows.xhp#blockarrows"/>
+      <embed href="text/shared/00/00000404.xhp#syblockarrows"/>
+      <embed href="text/shared/02/flowcharts.xhp#flowcharts"/>
+      <embed href="text/shared/00/00000404.xhp#syflowcharts"/>
+      <embed href="text/shared/02/callouts.xhp#callouts"/>
+      <embed href="text/shared/00/00000404.xhp#sycallouts"/>
+      <embed href="text/shared/02/stars.xhp#stars"/>
+      <embed href="text/shared/00/00000404.xhp#systars"/>
+      <paragraph xml-lang="en-US" id="par_idN10E50" role="heading" level="2" l10n="NEW"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10E60" role="paragraph" l10n="NEW">Enables you to edit points on your drawing.</paragraph>
+      <embed href="text/shared/02/fontwork.xhp#fontwork"/>
+      <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
+      <paragraph xml-lang="en-US" id="par_idN10E75" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph>
+      <embed href="text/shared/01/04140000.xhp#grafiktext"/>
+      <embed href="text/shared/00/00000404.xhp#sygrafik"/>
+      <paragraph xml-lang="en-US" id="par_idN10E95" role="heading" level="2" l10n="NEW"><link href="text/shared/3dsettings_toolbar.xhp">Extrusion On/Off</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10EA5" role="paragraph" l10n="NEW">Switches the 3D effects on and off for the selected objects.</paragraph>
+      <embed href="text/shared/00/00000007.xhp#asia"/>
+      <section id="legasia">
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_CAPTION_VERTICAL" id="bm_id1434672" localize="false"/>
-   
 <bookmark xml-lang="en-US" branch="hid/.uno:VerticalCaption" id="bm_id3151046" localize="false"/>
-   <paragraph xml-lang="en-US" id="hd_id3149735" role="heading" level="2" l10n="U" oldref="75">Vertical Callouts</paragraph>
-   <table id="tbl_id3154585">
-    
-    
-    <tablerow>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E"> 
-<image id="img_id3154818" src="res/commandimagelist/sc_verticalcaption.png" width="0.1335inch" height="0.1335inch"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149735" role="heading" level="2" l10n="U"
+                    oldref="75">Vertical Callouts</paragraph>
+         <table id="tbl_id3154585">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E">
+<image id="img_id3154818" src="res/commandimagelist/sc_verticalcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
 	</image></paragraph>
-     </tablecell>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3150492" role="paragraph" l10n="CHG" oldref="76"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
-     </tablecell>
-    </tablerow>
-   </table>
-   
-  </section>
-  <section id="textasia">
-   
-   
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150492" role="paragraph" l10n="CHG" oldref="76"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+      <section id="textasia">
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT_VERTICAL" id="bm_id5245755" localize="false"/>
-   
 <bookmark xml-lang="en-US" branch="hid/.uno:VerticalText" id="bm_id3163722" localize="false"/>
-   <paragraph xml-lang="en-US" id="hd_id3166437" role="heading" level="2" l10n="U" oldref="77">Vertical Text</paragraph>
-   <table id="tbl_id3148751">
-    
-    
-    <tablerow>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph" l10n="E"> 
-<image id="img_id3154372" src="res/commandimagelist/sc_verticaltext.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3166437" role="heading" level="2" l10n="U"
+                    oldref="77">Vertical Text</paragraph>
+         <table id="tbl_id3148751">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph" l10n="E">
+<image id="img_id3154372" src="res/commandimagelist/sc_verticaltext.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
 	</image></paragraph>
-     </tablecell>
-     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3152989" role="paragraph" l10n="CHG" oldref="78"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
-     </tablecell>
-    </tablerow>
-   </table>
-   
-  </section>
-  <section id="relatedtopics">
-   
-   <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152989" role="paragraph" l10n="CHG" oldref="78"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 12c4979e14..acf1e16f78 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.16.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,21 +72,19 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-	</image></paragraph>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
 </tablecell>
 </tablerow>
 </table>
-
 </section>
 </section>
 <paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
 <paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="CHG" oldref="45">To create a form, open a document and use the Form Controls toolbar to add and define the form controls. If you want, you can also link the form to a database, so that you can use the controls to manipulate a database.</paragraph>
 <paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="46">When you create a form in an HTML document, you can use the form to send data over the Internet.</paragraph>
-<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>.</paragraph>
+<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>.</paragraph>
 <paragraph role="heading" id="par_idN10C39" xml-lang="en-US" level="2" l10n="NEW">To add a control to a document</paragraph>
 <list type="ordered">
 <listitem>
@@ -120,8 +115,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-	</image></paragraph>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
@@ -143,15 +137,13 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-	</image></paragraph>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
 </tablecell>
 </tablerow>
 </table>
-
 </section>
 <section id="Section16">
 <bookmark xml-lang="en-US" branch="hid/SID_FM_EDIT" id="bm_id7355178" localize="false"/>
@@ -161,15 +153,13 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-	</image></paragraph>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
 </tablecell>
 </tablerow>
 </table>
-
 </section>
 <section id="Section7">
 <bookmark xml-lang="en-US" branch="hid/SID_FM_FORMATTEDFIELD" id="bm_id6606960" localize="false"/>
@@ -179,7 +169,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -198,7 +188,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -217,7 +207,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="E">
-<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -236,7 +226,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="E">
-<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -254,7 +244,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149981" xml-lang="en-US" l10n="E">
-<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -272,7 +262,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="E">
-<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -296,7 +286,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11B65" xml-lang="en-US" l10n="NEW">
-<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -319,7 +309,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11A64" xml-lang="en-US" l10n="NEW">
-<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -338,7 +328,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11ACA" xml-lang="en-US" l10n="NEW">
-<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -442,7 +432,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159622" xml-lang="en-US" l10n="E">
-<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -460,7 +450,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="E">
-<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -479,7 +469,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149423" xml-lang="en-US" l10n="E">
-<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -500,7 +490,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153687" xml-lang="en-US" l10n="E">
-<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -519,7 +509,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150531" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -537,7 +527,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149396" xml-lang="en-US" l10n="E">
-<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -555,7 +545,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145324" xml-lang="en-US" l10n="E">
-<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -573,7 +563,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149742" xml-lang="en-US" l10n="E">
-<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -592,7 +582,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="E">
-<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -615,7 +605,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156402" xml-lang="en-US" l10n="E">
-<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -634,7 +624,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US" l10n="NEW">
-<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -658,7 +648,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150261" xml-lang="en-US" l10n="E">
-<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/01170001.xhp b/helpcontent2/source/text/shared/02/01170001.xhp
index 89b0921fec..258fc477ff 100644
--- a/helpcontent2/source/text/shared/02/01170001.xhp
+++ b/helpcontent2/source/text/shared/02/01170001.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170001.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170002.xhp b/helpcontent2/source/text/shared/02/01170002.xhp
index 7a086ca03c..7d9c59156a 100755
--- a/helpcontent2/source/text/shared/02/01170002.xhp
+++ b/helpcontent2/source/text/shared/02/01170002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170002.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index 7d98745f6b..14d2138244 100755..100644
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01170003.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,17 +32,11 @@
 <title xml-lang="en-US" id="tit">Special Tips for Date Fields</title>
 <filename>/text/shared/02/01170003.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>
-  
-  
-  <bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph>Tools - Options - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
-  <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
-  <embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
- </body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+  <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document.</paragraph>
+<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170004.xhp b/helpcontent2/source/text/shared/02/01170004.xhp
index a0a842c439..78e5b3b0dc 100755
--- a/helpcontent2/source/text/shared/02/01170004.xhp
+++ b/helpcontent2/source/text/shared/02/01170004.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170004.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -67,7 +64,7 @@
 <paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SID_FM_SHOWCOLS">Calls a submenu where you can select the columns to show again.</ahelp> To show only one column, click the column name. You see only the first 16 hidden columns. If there are more hidden columns, choose the <emph>More</emph> command to call the <emph>Show Columns</emph> dialog.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWCOLS_MORE" id="bm_id3150669" localize="false"/><paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="83">More</paragraph>
 <paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SID_FM_SHOWCOLS_MORE">Calls the <emph>Show Columns</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl (Mac: Command) key to select multiple entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl (Mac: Command) key to select multiple entries.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWALLCOLS" id="bm_id3145119" localize="false"/><paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="86">All</paragraph>
 <paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SID_FM_SHOWALLCOLS">Click <emph>All </emph>if you want to show all columns.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="127">Keyboard-only control of Table Controls</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170100.xhp b/helpcontent2/source/text/shared/02/01170100.xhp
index 8ce33995dc..771f450cc3 100644
--- a/helpcontent2/source/text/shared/02/01170100.xhp
+++ b/helpcontent2/source/text/shared/02/01170100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170100.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index 34d06943ec..b826137df6 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01170101.xhp,v $
- * $Revision: 1.19.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,682 +31,865 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/02/01170101.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="allgemein">
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170101.xhp" name="General">General</link></paragraph><comment>UFI: had to remove all internal links to this file because all the targets vanished and no time to reinsert them all</comment><paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">This <emph>General </emph>tab enables you to define the general properties of a form control. These properties differ, depending on the control type. Not all of the following properties are available for every control.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00040501.xhp#controleigenschaftenallgemein"/>
-</section>
-<paragraph role="note" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="172">If you export the current form document to HTML format, the default control values are exported, not the current control values. Default values are determined - depending on the type of control - by the properties' Default value (for example, in text fields), Default status (for check boxes and option fields), and Default selection (for list boxes).</paragraph>
+      <topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">General</title>
+         <filename>/text/shared/02/01170101.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="allgemein">
+         <paragraph xml-lang="en-US" id="hd_id3153681" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170101.xhp" name="General">General</link></paragraph><comment>UFI: had to remove all internal links to this file because all the targets vanished and no time to reinsert them all</comment>
+<paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="2">This <emph>General </emph>tab enables you to define the general properties of a form control. These properties differ, depending on the control type. Not all of the following properties are available for every control.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040501.xhp#controleigenschaftenallgemein"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155342" role="note" l10n="CHG" oldref="172">If you export the current form document to HTML format, the default control values are exported, not the current control values. Default values are determined - depending on the type of control - by the properties' Default value (for example, in text fields), Default status (for check boxes and option fields), and Default selection (for list boxes).</paragraph>
 <sort>
 <section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLED" id="bm_id3154897" localize="false"/><paragraph role="heading" id="hd_id3149734" xml-lang="en-US" level="2" l10n="U" oldref="13">Enabled</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_PROP_ENABLED">If a control field has the property "Enabled" (Yes), the form user will be able to use the control field.</ahelp> If the property is disabled, it will not be enabled (No) and will be displayed in a gray color.</paragraph>
-</section>
-<section id="Section63">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINECOUNT" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="2" l10n="U" oldref="74">Line count</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="HID_PROP_LINECOUNT" visibility="hidden">Specifies how many lines should be displayed in the dropdown list. This setting is only active if you chose "Yes" in the "Dropdown" option.</ahelp>For combo boxes with the Dropdown property, you can specify how many lines should be displayed in the dropdown list. With control fields which do not have the Dropdown option, the line's display will be specified by the size of the control field and the font size.</paragraph>
-</section>
-<section id="Section62">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BUTTONTYPE" id="bm_id3156152" localize="false"/><paragraph role="heading" id="hd_id3153147" xml-lang="en-US" level="2" l10n="CHG" oldref="23">Action<comment>UFI: renamed from Button type to Action, see dba.features: Form navigation functionality for command buttons</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="HID_PROP_BUTTONTYPE" visibility="hidden">The Action property determines the action that occurs when you activate a button.</ahelp>You can use navigation actions to design your own database navigation buttons.</paragraph>
-<paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="U" oldref="25">The following table describes the actions that you can assign to a button.</paragraph>
-<table id="tbl_id3148943">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147303" xml-lang="en-US" l10n="U" oldref="224">Action</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="225">Description</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154071" xml-lang="en-US" l10n="CHG" oldref="26">None</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153797" xml-lang="en-US" l10n="U" oldref="27">No action occurs.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="30">Submit form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147228" xml-lang="en-US" l10n="CHG" oldref="31">Sends the data that is entered in other control fields of the current form to the address that is specified in <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link> under <link href="text/shared/02/01170201.xhp" name="URL"><emph>URL</emph></link>. </paragraph>
-<paragraph role="tablecontent" id="par_idN107F7" xml-lang="en-US" l10n="NEW">Enter the URL into the form's data property "URL" text box when you export to a PDF file.<comment>UFI: see #i36574#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151041" xml-lang="en-US" l10n="CHG" oldref="28">Reset form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155101" xml-lang="en-US" l10n="CHG" oldref="29">Resets the settings in other control fields to the predefined defaults (Default Status, Default Selection, Default Value).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155431" xml-lang="en-US" l10n="CHG" oldref="32">Open document / web page</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="33">Opens the URL that is specified under <emph>URL</emph>. You can use <emph>Frame</emph> to specify the target frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN107FE" xml-lang="en-US" l10n="NEW">First record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10803" xml-lang="en-US" l10n="NEW">Moves the current form to the first record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10809" xml-lang="en-US" l10n="NEW">Previous record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1080E" xml-lang="en-US" l10n="NEW">Moves the current form to the previous record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10814" xml-lang="en-US" l10n="NEW">Next record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10819" xml-lang="en-US" l10n="NEW">Moves the current form to the next record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1081F" xml-lang="en-US" l10n="NEW">Last record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10824" xml-lang="en-US" l10n="NEW">Moves the current form to the last record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1082A" xml-lang="en-US" l10n="NEW">Save record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1082F" xml-lang="en-US" l10n="NEW">Saves the current record, if necessary.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10835" xml-lang="en-US" l10n="NEW">Undo data entry</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1083A" xml-lang="en-US" l10n="NEW">Reverses the changes in the current record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10840" xml-lang="en-US" l10n="NEW">New record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10845" xml-lang="en-US" l10n="NEW">Moves the current form to the insert row.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1084B" xml-lang="en-US" l10n="NEW">Delete record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10850" xml-lang="en-US" l10n="NEW">Deletes the current record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10856" xml-lang="en-US" l10n="NEW">Refresh form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="NEW">Reloads the most recently saved version of the current form.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<section id="Section61">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DROPDOWN" id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="2" l10n="U" oldref="19">Dropdown</paragraph>
-<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_PROP_DROPDOWN" visibility="hidden">Specifies whether the combo box should dropdown (Yes) or not (No).</ahelp>A control field with the dropdown property has an additional arrow button which opens the list of the existing form entries per mouse click. Under <emph>Line count</emph>, you can specify how many lines (or rows) should be displayed in the dropdown state. Combination fields can have the dropdown property.</paragraph>
-<paragraph role="paragraph" id="par_id3159198" xml-lang="en-US" l10n="U" oldref="182">Combo boxes that were inserted as columns in a table control are always dropdown as the default.</paragraph>
-</section>
-<section id="Section60">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLED" id="bm_id3154897" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149734" role="heading" level="2" l10n="U"
+                    oldref="13">Enabled</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_PROP_ENABLED">If a control field has the property "Enabled" (Yes), the form user will be able to use the control field.</ahelp> If the property is disabled, it will not be enabled (No) and will be displayed in a gray color.</paragraph>
+      </section>
+      <section id="Section63">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINECOUNT" id="bm_id3146948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153320" role="heading" level="2" l10n="U"
+                    oldref="74">Line count</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="75"><ahelp hid="HID_PROP_LINECOUNT" visibility="hidden">Specifies how many lines should be displayed in the dropdown list. This setting is only active if you chose "Yes" in the "Dropdown" option.</ahelp>For combo boxes with the Dropdown property, you can specify how many lines should be displayed in the dropdown list. With control fields which do not have the Dropdown option, the line's display will be specified by the size of the control field and the font size.</paragraph>
+      </section>
+      <section id="Section62">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BUTTONTYPE" id="bm_id3156152" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153147" role="heading" level="2" l10n="CHG"
+                    oldref="23">Action<comment>UFI: renamed from Button type to Action, see dba.features: Form navigation functionality for command buttons</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149415" role="paragraph" l10n="CHG" oldref="24"><ahelp hid="HID_PROP_BUTTONTYPE" visibility="hidden">The Action property determines the action that occurs when you activate a button.</ahelp>You can use navigation actions to design your own database navigation buttons.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152474" role="paragraph" l10n="U" oldref="25">The following table describes the actions that you can assign to a button.</paragraph>
+         <table id="tbl_id3148943">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147303" role="tablehead" l10n="U" oldref="224">Action</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154388" role="tablehead" l10n="U" oldref="225">Description</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154071" role="tablecontent" l10n="CHG" oldref="26">None</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153797" role="tablecontent" l10n="U" oldref="27">No action occurs.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154216" role="tablecontent" l10n="CHG" oldref="30">Submit form</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147228" role="tablecontent" l10n="CHG" oldref="31">Sends the data that is entered in other control fields of the current form to the address that is specified in <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link> under <link href="text/shared/02/01170201.xhp" name="URL"><emph>URL</emph></link>. </paragraph>
+                  <paragraph xml-lang="en-US" id="par_idN107F7" role="tablecontent" l10n="NEW">Enter the URL into the form's data property "URL" text box when you export to a PDF file.<comment>UFI: see #i36574#</comment></paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151041" role="tablecontent" l10n="CHG" oldref="28">Reset form</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155101" role="tablecontent" l10n="CHG" oldref="29">Resets the settings in other control fields to the predefined defaults (Default Status, Default Selection, Default Value).</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155431" role="tablecontent" l10n="CHG" oldref="32">Open document / web page</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150010" role="tablecontent" l10n="U" oldref="33">Opens the URL that is specified under <emph>URL</emph>. You can use <emph>Frame</emph> to specify the target frame.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN107FE" role="tablecontent" l10n="NEW">First record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10803" role="tablecontent" l10n="NEW">Moves the current form to the first record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10809" role="tablecontent" l10n="NEW">Previous record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1080E" role="tablecontent" l10n="NEW">Moves the current form to the previous record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10814" role="tablecontent" l10n="NEW">Next record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10819" role="tablecontent" l10n="NEW">Moves the current form to the next record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1081F" role="tablecontent" l10n="NEW">Last record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10824" role="tablecontent" l10n="NEW">Moves the current form to the last record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1082A" role="tablecontent" l10n="NEW">Save record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1082F" role="tablecontent" l10n="NEW">Saves the current record, if necessary.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10835" role="tablecontent" l10n="NEW">Undo data entry</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1083A" role="tablecontent" l10n="NEW">Reverses the changes in the current record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10840" role="tablecontent" l10n="NEW">New record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10845" role="tablecontent" l10n="NEW">Moves the current form to the insert row.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1084B" role="tablecontent" l10n="NEW">Delete record</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10850" role="tablecontent" l10n="NEW">Deletes the current record.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN10856" role="tablecontent" l10n="NEW">Refresh form</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="NEW">Reloads the most recently saved version of the current form.</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+      <section id="Section61">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DROPDOWN" id="bm_id3146148" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154638" role="heading" level="2" l10n="U"
+                    oldref="19">Dropdown</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_PROP_DROPDOWN" visibility="hidden">Specifies whether the combo box should dropdown (Yes) or not (No).</ahelp>A control field with the dropdown property has an additional arrow button which opens the list of the existing form entries per mouse click. Under <emph>Line count</emph>, you can specify how many lines (or rows) should be displayed in the dropdown state. Combination fields can have the dropdown property.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159198" role="paragraph" l10n="U" oldref="182">Combo boxes that were inserted as columns in a table control are always dropdown as the default.</paragraph>
+      </section>
+      <section id="Section60">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_ALIGN" id="bm_id3150116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGEPOSITION" id="bm_id2524491" localize="false"/><paragraph role="heading" id="hd_id3153140" xml-lang="en-US" level="2" l10n="CHG" oldref="11">Alignment / Graphics alignment</paragraph>
-<paragraph role="paragraph" id="par_id3151281" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_ALIGN" visibility="hidden">Specifies the alignment option for text or graphics that are used on a control.</ahelp>The alignment options are left-aligned, right-aligned, and centered. These options are available for the following elements:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN109DD" xml-lang="en-US" l10n="NEW">Title of Label fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E1" xml-lang="en-US" l10n="NEW">Content of text fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E5" xml-lang="en-US" l10n="NEW">Content of table fields in the columns of a table control</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E9" xml-lang="en-US" l10n="NEW">Graphics or text that are used in buttons</paragraph>
-<paragraph role="note" id="par_idN109EC" xml-lang="en-US" l10n="NEW">The <emph>Alignment</emph> option for buttons is called <emph>Graphics alignment</emph>.</paragraph>
-</listitem>
-</list>
-</section>
-<section id="Section59">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_AUTOCOMPLETE" id="bm_id3154790" localize="false"/><paragraph role="heading" id="hd_id3151073" xml-lang="en-US" level="2" l10n="CHG" oldref="76">AutoFill</paragraph>
-<paragraph role="paragraph" id="par_id3152375" xml-lang="en-US" l10n="CHG" oldref="77"><ahelp hid="HID_PROP_AUTOCOMPLETE" visibility="hidden">Assigns the AutoFill function to a combo box.</ahelp>The AutoFill function displays a list of previous entries after you start to type an entry.<comment>UFI: changed AutoComplete to AutoFill (got changed by error in the UI, so we stay with it now, according to FS)</comment></paragraph>
-</section>
-<section id="Section58">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLLABEL" id="bm_id3151053" localize="false"/><paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="216">Label field</paragraph>
-<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="217"><ahelp hid="HID_PROP_CONTROLLABEL">Specifies the source for the label of the control.</ahelp> The text of the label field will be used instead of the name of a database field. For example, in the <emph>Filter Navigator</emph>, <emph>Search</emph> dialog, and as a column name in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="231">To define one character of the label as a mnemonic, so that the user can access this control by pressing the character on the keyboard, insert a tilde (~) character in front of the character in the label.</paragraph>
-<paragraph role="paragraph" id="par_id3154502" xml-lang="en-US" l10n="U" oldref="218">Only the text of a group frame can be used as the label field when using radio buttons. This text applies to all of the radio buttons of the same group.</paragraph>
-<paragraph role="paragraph" id="par_id3148587" xml-lang="en-US" l10n="CHG" oldref="219">If you click on the <emph>...</emph> button next to the text field, you will see the <emph>Label Field Selection</emph> dialog. Select a label from the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1" id="bm_id3156179" localize="false"/><paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="220"><ahelp hid="PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1">Check the <emph>No assignment </emph>box to remove the link between a control and the assigned label field.</ahelp></paragraph>
-</section>
-<section id="Section57">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3156356" localize="false"/><paragraph role="heading" id="hd_id3148834" xml-lang="en-US" level="2" l10n="U" oldref="142">Width</paragraph>
-<paragraph role="paragraph" id="par_id3148566" xml-lang="en-US" l10n="CHG" oldref="143"><ahelp hid="HID_PROP_WIDTH" visibility="hidden">Sets the column width in the table control field.</ahelp>Sets the column width in the table control field in the units that are specified in the %PRODUCTNAME module options. If you want, you can enter a value followed by a valid measurement unit, for example, 2 cm.</paragraph>
-</section>
-<section id="Section56">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT" id="bm_id2982573" localize="false"/><paragraph role="heading" id="hd_id1877803" xml-lang="en-US" level="2" l10n="NEW">Repeat<comment>UFI: see spec spinbutton_form_control.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id9863277" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_PROP_REPEAT">Specifies if the action of a control such as a spin button repeats when you click the control and hold the mouse button down.</ahelp></paragraph>
-</section>
-<section id="Section55">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="hd_id9827875" xml-lang="en-US" level="2" l10n="NEW">Delay<comment>UFI: see http://dba.openoffice.org/specifications/forms/scrollbar_form_control.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id6092715" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_PROP_REPEAT_DELAY">Specifies the delay in milliseconds between repeating events.</ahelp> A repeating event occurs when you click an arrow button or the background of a scrollbar, or one of the record navigation buttons of a Navigation Bar, and you keep the mouse button pressed for some time. You can enter a value followed by a valid time unit, for example, 2 s or 500 ms.</paragraph>
-</section>
-<section id="Section54">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_RECORDMARKER" id="bm_id3154272" localize="false"/><paragraph role="heading" id="hd_id3145164" xml-lang="en-US" level="2" l10n="U" oldref="214">Record marker</paragraph>
-<paragraph role="paragraph" id="par_id3147257" xml-lang="en-US" l10n="U" oldref="215"><ahelp hid="HID_PROP_RECORDMARKER">Specifies whether the first column is displayed with row labels, in which the current record is marked by an arrow.</ahelp></paragraph>
-</section>
-<section id="Section53">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEFORMAT" id="bm_id3158419" localize="false"/><paragraph role="heading" id="hd_id3151019" xml-lang="en-US" level="2" l10n="U" oldref="82">Date format</paragraph>
-<paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="83"><ahelp hid="HID_PROP_DATEFORMAT" visibility="hidden">Here, you can determine the format you want for the date readout.</ahelp>With date fields you can determine the format for the date readout.</paragraph>
-<paragraph role="note" id="par_id3151356" xml-lang="en-US" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input. 
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGEPOSITION" id="bm_id2524491" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153140" role="heading" level="2" l10n="CHG"
+                    oldref="11">Alignment / Graphics alignment</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151281" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_ALIGN" visibility="hidden">Specifies the alignment option for text or graphics that are used on a control.</ahelp>The alignment options are left-aligned, right-aligned, and centered. These options are available for the following elements:</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN109DD" role="paragraph" l10n="NEW">Title of Label fields</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN109E1" role="paragraph" l10n="NEW">Content of text fields</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN109E5" role="paragraph" l10n="NEW">Content of table fields in the columns of a table control</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN109E9" role="paragraph" l10n="NEW">Graphics or text that are used in buttons</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN109EC" role="note" l10n="NEW">The <emph>Alignment</emph> option for buttons is called <emph>Graphics alignment</emph>.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <section id="Section59">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_AUTOCOMPLETE" id="bm_id3154790" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151073" role="heading" level="2" l10n="CHG"
+                    oldref="76">AutoFill</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152375" role="paragraph" l10n="CHG" oldref="77"><ahelp hid="HID_PROP_AUTOCOMPLETE" visibility="hidden">Assigns the AutoFill function to a combo box.</ahelp>The AutoFill function displays a list of previous entries after you start to type an entry.<comment>UFI: changed AutoComplete to AutoFill (got changed by error in the UI, so we stay with it now, according to FS)</comment></paragraph>
+      </section>
+      <section id="Section58">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLLABEL" id="bm_id3151053" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154729" role="heading" level="2" l10n="U"
+                    oldref="216">Label field</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145801" role="paragraph" l10n="CHG" oldref="217"><ahelp hid="HID_PROP_CONTROLLABEL">Specifies the source for the label of the control.</ahelp> The text of the label field will be used instead of the name of a database field. For example, in the <emph>Filter Navigator</emph>, <emph>Search</emph> dialog, and as a column name in the table view.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="231">To define one character of the label as a mnemonic, so that the user can access this control by pressing the character on the keyboard, insert a tilde (~) character in front of the character in the label.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154502" role="paragraph" l10n="U" oldref="218">Only the text of a group frame can be used as the label field when using radio buttons. This text applies to all of the radio buttons of the same group.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148587" role="paragraph" l10n="CHG" oldref="219">If you click on the <emph>...</emph> button next to the text field, you will see the <emph>Label Field Selection</emph> dialog. Select a label from the list.</paragraph>
+<!-- removed HID PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1 -->
+<paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="220"><ahelp hid="PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1">Check the <emph>No assignment </emph>box to remove the link between a control and the assigned label field.</ahelp></paragraph>
+      </section>
+      <section id="Section57">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3156356" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148834" role="heading" level="2" l10n="U"
+                    oldref="142">Width</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148566" role="paragraph" l10n="CHG" oldref="143"><ahelp hid="HID_PROP_WIDTH" visibility="hidden">Sets the column width in the table control field.</ahelp>Sets the column width in the table control field in the units that are specified in the %PRODUCTNAME module options. If you want, you can enter a value followed by a valid measurement unit, for example, 2 cm.</paragraph>
+      </section>
+      <section id="Section56">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT" id="bm_id2982573" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1877803" role="heading" level="2" l10n="NEW">Repeat<comment>UFI: see spec spinbutton_form_control.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id9863277" role="paragraph" l10n="CHG"><ahelp hid="HID_PROP_REPEAT">Specifies if the action of a control such as a spin button repeats when you click the control and hold the mouse button down.</ahelp></paragraph>
+      </section>
+      <section id="Section55">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9827875" role="heading" level="2" l10n="NEW">Delay</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6092715" role="paragraph" l10n="CHG"><ahelp hid="HID_PROP_REPEAT_DELAY">Specifies the delay in milliseconds between repeating events.</ahelp> A repeating event occurs when you click an arrow button or the background of a scrollbar, or one of the record navigation buttons of a Navigation Bar, and you keep the mouse button pressed for some time. You can enter a value followed by a valid time unit, for example, 2 s or 500 ms.</paragraph>
+      </section>
+      <section id="Section54">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_RECORDMARKER" id="bm_id3154272" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145164" role="heading" level="2" l10n="U"
+                    oldref="214">Record marker</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147257" role="paragraph" l10n="U" oldref="215"><ahelp hid="HID_PROP_RECORDMARKER">Specifies whether the first column is displayed with row labels, in which the current record is marked by an arrow.</ahelp></paragraph>
+      </section>
+      <section id="Section53">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEFORMAT" id="bm_id3158419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="2" l10n="U"
+                    oldref="82">Date format</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152971" role="paragraph" l10n="U" oldref="83"><ahelp hid="HID_PROP_DATEFORMAT" visibility="hidden">Here, you can determine the format you want for the date readout.</ahelp>With date fields you can determine the format for the date readout.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151356" role="note" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input.
 </variable></paragraph>
-</section>
-<section id="Section52">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPIN" id="bm_id3145642" localize="false"/><paragraph role="heading" id="hd_id3156054" xml-lang="en-US" level="2" l10n="U" oldref="87">Spin Button</paragraph>
-<paragraph role="paragraph" id="par_id3154360" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_PROP_SPIN" visibility="hidden">The "Yes" option transforms the control field into a spin button, where corresponding arrow buttons are added.</ahelp>Numerical fields, currency fields, date and time fields can be introduced as spin buttons in the form.</paragraph>
-</section>
-<section id="Section51">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TRISTATE" id="bm_id3150386" localize="false"/><paragraph role="heading" id="hd_id3159268" xml-lang="en-US" level="2" l10n="U" oldref="173">Tristate</paragraph>
-<paragraph role="paragraph" id="par_id3154254" xml-lang="en-US" l10n="U" oldref="174"><ahelp hid="HID_PROP_TRISTATE">Specifies whether a check box can also represent ZERO values of a linked database apart from the TRUE and FALSE values.</ahelp> This function is only available if the database accepts three states: TRUE, FALSE and ZERO.</paragraph>
-<paragraph role="note" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="183">The<emph> Tristate </emph>property is only defined for database forms, not for HTML forms.</paragraph>
-</section>
-<section id="Section50">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_PRINTABLE" id="bm_id3145228" localize="false"/><paragraph role="heading" id="hd_id3147324" xml-lang="en-US" level="2" l10n="U" oldref="89">Print</paragraph>
-<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="90"><ahelp hid="HID_PROP_PRINTABLE">Specifies whether you want the control field to appear in a document's printout.</ahelp></paragraph>
-</section>
-<section id="Section49">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_EDITMASK" id="bm_id3147001" localize="false"/><paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="2" l10n="U" oldref="91">Edit mask</paragraph>
-<paragraph role="paragraph" id="par_id3150938" xml-lang="en-US" l10n="U" oldref="92"><ahelp hid="HID_PROP_EDITMASK" visibility="hidden">Defines the edit mask. By specifying a character code you can determine what the user can enter in the control field.</ahelp>By specifying the character code in pattern fields, you can determine what the user can enter in the pattern field.</paragraph>
-<paragraph role="paragraph" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="184">The length of the edit mask determines the number of the possible input positions. If the user enters characters that do not correspond to the edit mask, the input is rejected when the user leaves the field. You can enter the following characters to define the edit mask:</paragraph>
-<table id="tbl_id3155607">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147130" xml-lang="en-US" l10n="U" oldref="93"> Character </paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="94">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153774" xml-lang="en-US" l10n="U" oldref="95">L</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154660" xml-lang="en-US" l10n="U" oldref="96">A text constant. This position cannot be edited. The character is displayed at the corresponding position of the Literal Mask.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151346" xml-lang="en-US" l10n="U" oldref="97">a</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150829" xml-lang="en-US" l10n="U" oldref="98">The characters a-z and A-Z can be entered. Capital characters are not converted to lowercase characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="99">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156140" xml-lang="en-US" l10n="U" oldref="100">The characters A-Z can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="101">c</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148873" xml-lang="en-US" l10n="U" oldref="102">The characters a-z, A-Z, and 0-9 can be entered. Capital characters are not converted to lowercase characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153781" xml-lang="en-US" l10n="U" oldref="103">C</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="104">The characters A-Z and 0-9 can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="105">N</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="106">Only the characters 0-9 can be entered.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152769" xml-lang="en-US" l10n="U" oldref="107">x</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="108">All printable characters can be entered.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150517" xml-lang="en-US" l10n="U" oldref="109">X</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150429" xml-lang="en-US" l10n="U" oldref="110">All printable characters can be entered. If a lowercase letter is used, it is automatically converted to a capital letter.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3155081" xml-lang="en-US" l10n="CHG" oldref="111">For the literal mask "__.__.2000", for example, define the "NNLNNLLLLL" edit mask so that the user can only enter four digits when entering a date.</paragraph>
-</section>
-<section id="Section48">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRICTFORMAT" id="bm_id3145588" localize="false"/><paragraph role="heading" id="hd_id3154818" xml-lang="en-US" level="2" l10n="U" oldref="112">Strict format</paragraph>
-<paragraph role="paragraph" id="par_id3148750" xml-lang="en-US" l10n="U" oldref="113">You can have a format check with control fields that accept formatted contents (date, time, and so on). <ahelp hid="HID_PROP_STRICTFORMAT">If the strict format function is activated (Yes), only the allowed characters are accepted.</ahelp> For example, in a date field, only numbers or date delimiters are accepted; all alphabet entries typed with your keyboard are ignored.</paragraph>
-</section>
-<section id="targetframe">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_FRAME" id="bm_id3149491" localize="false"/><paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="2" l10n="CHG" oldref="60">Frame</paragraph>
-<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="HID_PROP_TARGET_FRAME" visibility="hidden">Specifies the target frame to display the document that is opened by the "Open document / web page" action.</ahelp>You can also specify the target frame to display a <emph>URL</emph> that you open when you click a button that has been assigned the Open document or web page action).</paragraph>
-<section id="fuerformulareigenschaft">
-<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="U" oldref="62">If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist:</paragraph>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="226">Entry</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155500" xml-lang="en-US" l10n="U" oldref="227">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="U" oldref="63">_blank</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146770" xml-lang="en-US" l10n="U" oldref="64">The next document is created in a new empty frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149771" xml-lang="en-US" l10n="U" oldref="65">_parent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159143" xml-lang="en-US" l10n="U" oldref="66">The next document is created in a parent frame. If no parent exists, the document is created in the same frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151374" xml-lang="en-US" l10n="U" oldref="67">_self</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148600" xml-lang="en-US" l10n="U" oldref="68">The next document is created in the same frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153067" xml-lang="en-US" l10n="U" oldref="69">_top</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="70">The next document is created in a top-level window, that is, in the highest frame of the hierarchy; if the current frame is already a top window, the document is created in the current frame.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<paragraph role="note" id="par_id3156172" xml-lang="en-US" l10n="CHG" oldref="185">The Frame property is relevant for HTML forms, but not for database forms.</paragraph>
-</section>
-<section id="Section46">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_URL" id="bm_id3156191" localize="false"/><paragraph role="heading" id="hd_id3146950" xml-lang="en-US" level="2" l10n="U" oldref="114">Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3154344" xml-lang="en-US" l10n="U" oldref="115">An image button has a <emph>Graphics </emph>property. <ahelp hid="HID_PROP_IMAGE_URL">The<emph> Graphics</emph> property specifies the graphic's path and file name that you want to have displayed on the button.</ahelp> If you select the graphic file with the <emph>...</emph> button, the path and file name will be automatically included in the text box.</paragraph>
-</section>
-<section id="Section44">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPTEXT" id="bm_id3151131" localize="false"/><paragraph role="heading" id="hd_id3150530" xml-lang="en-US" level="2" l10n="U" oldref="208">Help text</paragraph>
-<paragraph role="paragraph" id="par_id3156310" xml-lang="en-US" l10n="U" oldref="209"><ahelp hid="HID_PROP_HELPTEXT">Provides the option of entering a help text that will be displayed as a tip on the control.</ahelp> The tip shows the text in user mode when the mouse is moved over the control.</paragraph>
-<paragraph role="paragraph" id="par_id3153287" xml-lang="en-US" l10n="U" oldref="210">For URL type buttons, the help text appears as the extended tip instead of the URL address entered under URL.</paragraph>
-</section>
-<section id="Section43">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPURL" id="bm_id3156336" localize="false"/><paragraph role="heading" id="hd_id3145377" xml-lang="en-US" level="2" l10n="U" oldref="212">Help URL</paragraph>
-<paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="213"><ahelp hid="HID_PROP_HELPURL">Specifies a batch label in URL spelling which refers to a help document and which can be called with the help of the control field.</ahelp> The help for the control field help can be opened if the focus is positioned on the control field and the user presses F1.</paragraph>
-</section>
-<section id="Section42">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BACKGROUNDCOLOR" id="bm_id3149545" localize="false"/><paragraph role="heading" id="hd_id3152541" xml-lang="en-US" level="2" l10n="U" oldref="3">Background color</paragraph>
-<paragraph role="paragraph" id="par_id3155073" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_PROP_BACKGROUNDCOLOR" visibility="hidden">Sets the background color of the control field.</ahelp>A background color is available for most control fields. If you click on <emph>Background color</emph>, a list will open which enables you to select among various colors. The "Standard" option adopts the system setting. If the desired color is not listed, click the <emph>...</emph> button to define a color in the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog.</paragraph>
-</section>
-<section id="Section41">
+      </section>
+      <section id="Section52">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPIN" id="bm_id3145642" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156054" role="heading" level="2" l10n="U"
+                    oldref="87">Spin Button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="88"><ahelp hid="HID_PROP_SPIN" visibility="hidden">The "Yes" option transforms the control field into a spin button, where corresponding arrow buttons are added.</ahelp>Numerical fields, currency fields, date and time fields can be introduced as spin buttons in the form.</paragraph>
+      </section>
+      <section id="Section51">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TRISTATE" id="bm_id3150386" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159268" role="heading" level="2" l10n="U"
+                    oldref="173">Tristate</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154254" role="paragraph" l10n="U" oldref="174"><ahelp hid="HID_PROP_TRISTATE">Specifies whether a check box can also represent ZERO values of a linked database apart from the TRUE and FALSE values.</ahelp> This function is only available if the database accepts three states: TRUE, FALSE and ZERO.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156712" role="note" l10n="U" oldref="183">The<emph> Tristate </emph>property is only defined for database forms, not for HTML forms.</paragraph>
+      </section>
+      <section id="Section50">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_PRINTABLE" id="bm_id3145228" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147324" role="heading" level="2" l10n="U"
+                    oldref="89">Printable</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="90"><ahelp hid="HID_PROP_PRINTABLE">Specifies whether you want the control field to appear in a document's printout.</ahelp></paragraph>
+      </section>
+      <section id="Section88">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_POSITIONX" id="bm_id3145229" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153889" role="heading" level="2" l10n="NEW">PositionX</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921153823" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the X position of the control, relative to the anchor.</ahelp></paragraph>
+      </section>
+      <section id="Section87">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_POSITIONY" id="bm_id3145230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153814" role="heading" level="2" l10n="NEW">PositionY</paragraph>
+         <paragraph xml-lang="en-US" id="par_id040920092115387" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the Y position of the control, relative to the anchor.</ahelp></paragraph>
+      </section>
+      <section id="Section86">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ANCHOR_TYPE" id="bm_id3145231" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153833" role="heading" level="2" l10n="NEW">Anchor</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921153855" role="paragraph" l10n="NEW"><ahelp hid=".">Defines where the control will be anchored.</ahelp></paragraph>
+      </section>
+      <section id="Section85">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3145238" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153836" role="heading" level="2" l10n="NEW">Width</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921153918" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the width of the control.</ahelp></paragraph>
+      </section>
+      <section id="Section84">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HEIGHT" id="bm_id3145248" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153980" role="heading" level="2" l10n="NEW">Height</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921153919" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the height of the control.</ahelp></paragraph>
+      </section>
+      <section id="Section49">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_EDITMASK" id="bm_id3147001" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155962" role="heading" level="2" l10n="U"
+                    oldref="91">Edit mask</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150938" role="paragraph" l10n="U" oldref="92"><ahelp hid="HID_PROP_EDITMASK" visibility="hidden">Defines the edit mask. By specifying a character code you can determine what the user can enter in the control field.</ahelp>By specifying the character code in pattern fields, you can determine what the user can enter in the pattern field.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148479" role="paragraph" l10n="U" oldref="184">The length of the edit mask determines the number of the possible input positions. If the user enters characters that do not correspond to the edit mask, the input is rejected when the user leaves the field. You can enter the following characters to define the edit mask:</paragraph>
+         <table id="tbl_id3155607">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147130" role="tablehead" l10n="U" oldref="93"> Character </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149815" role="tablehead" l10n="U" oldref="94">Meaning</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153774" role="tablecontent" l10n="U" oldref="95">L</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154660" role="tablecontent" l10n="U" oldref="96">A text constant. This position cannot be edited. The character is displayed at the corresponding position of the Literal Mask.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151346" role="tablecontent" l10n="U" oldref="97">a</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150829" role="tablecontent" l10n="U" oldref="98">The characters a-z and A-Z can be entered. Capital characters are not converted to lowercase characters.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149207" role="tablecontent" l10n="U" oldref="99">A</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156140" role="tablecontent" l10n="U" oldref="100">The characters A-Z can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153703" role="tablecontent" l10n="U" oldref="101">c</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148873" role="tablecontent" l10n="U" oldref="102">The characters a-z, A-Z, and 0-9 can be entered. Capital characters are not converted to lowercase characters.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153781" role="tablecontent" l10n="U" oldref="103">C</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154574" role="tablecontent" l10n="U" oldref="104">The characters A-Z and 0-9 can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153268" role="tablecontent" l10n="U" oldref="105">N</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="106">Only the characters 0-9 can be entered.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152769" role="tablecontent" l10n="U" oldref="107">x</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156064" role="tablecontent" l10n="U" oldref="108">All printable characters can be entered.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150517" role="tablecontent" l10n="U" oldref="109">X</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150429" role="tablecontent" l10n="U" oldref="110">All printable characters can be entered. If a lowercase letter is used, it is automatically converted to a capital letter.</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+         <paragraph xml-lang="en-US" id="par_id3155081" role="paragraph" l10n="CHG" oldref="111">For the literal mask "__.__.2000", for example, define the "NNLNNLLLLL" edit mask so that the user can only enter four digits when entering a date.</paragraph>
+      </section>
+      <section id="Section48">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRICTFORMAT" id="bm_id3145588" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154818" role="heading" level="2" l10n="U"
+                    oldref="112">Strict format</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148750" role="paragraph" l10n="U" oldref="113">You can have a format check with control fields that accept formatted contents (date, time, and so on). <ahelp hid="HID_PROP_STRICTFORMAT">If the strict format function is activated (Yes), only the allowed characters are accepted.</ahelp> For example, in a date field, only numbers or date delimiters are accepted; all alphabet entries typed with your keyboard are ignored.</paragraph>
+      </section>
+      <section id="targetframe">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_FRAME" id="bm_id3149491" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147167" role="heading" level="2" l10n="CHG"
+                    oldref="60">Frame</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="61"><ahelp hid="HID_PROP_TARGET_FRAME" visibility="hidden">Specifies the target frame to display the document that is opened by the "Open document / web page" action.</ahelp>You can also specify the target frame to display a <emph>URL</emph> that you open when you click a button that has been assigned the Open document or web page action).</paragraph>
+         <section id="fuerformulareigenschaft">
+            <paragraph xml-lang="en-US" id="par_id3150521" role="paragraph" l10n="U" oldref="62">If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist:</paragraph>
+            <table id="">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3148814" role="tablehead" l10n="U" oldref="226">Entry</paragraph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3155500" role="tablehead" l10n="U" oldref="227">Meaning</paragraph>
+                  </tablecell>
+               </tablerow>
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149408" role="paragraph" l10n="U" oldref="63">_blank</paragraph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3146770" role="paragraph" l10n="U" oldref="64">The next document is created in a new empty frame.</paragraph>
+                  </tablecell>
+               </tablerow>
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149771" role="paragraph" l10n="U" oldref="65">_parent</paragraph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3159143" role="paragraph" l10n="U" oldref="66">The next document is created in a parent frame. If no parent exists, the document is created in the same frame.</paragraph>
+                  </tablecell>
+               </tablerow>
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151374" role="paragraph" l10n="U" oldref="67">_self</paragraph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3148600" role="paragraph" l10n="U" oldref="68">The next document is created in the same frame.</paragraph>
+                  </tablecell>
+               </tablerow>
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153067" role="paragraph" l10n="U" oldref="69">_top</paragraph>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149174" role="paragraph" l10n="U" oldref="70">The next document is created in a top-level window, that is, in the highest frame of the hierarchy; if the current frame is already a top window, the document is created in the current frame.</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
+
+         </section>
+         <paragraph xml-lang="en-US" id="par_id3156172" role="note" l10n="CHG" oldref="185">The Frame property is relevant for HTML forms, but not for database forms.</paragraph>
+      </section>
+      <section id="Section46">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_URL" id="bm_id3156191" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146950" role="heading" level="2" l10n="U"
+                    oldref="114">Graphics</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154344" role="paragraph" l10n="U" oldref="115">An image button has a <emph>Graphics </emph>property. <ahelp hid="HID_PROP_IMAGE_URL">The<emph> Graphics</emph> property specifies the graphic's path and file name that you want to have displayed on the button.</ahelp> If you select the graphic file with the <emph>...</emph> button, the path and file name will be automatically included in the text box.</paragraph>
+      </section>
+      <section id="Section44">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPTEXT" id="bm_id3151131" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150530" role="heading" level="2" l10n="U"
+                    oldref="208">Help text</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156310" role="paragraph" l10n="U" oldref="209"><ahelp hid="HID_PROP_HELPTEXT">Provides the option of entering a help text that will be displayed as a tip on the control.</ahelp> The tip shows the text in user mode when the mouse is moved over the control.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153287" role="paragraph" l10n="U" oldref="210">For URL type buttons, the help text appears as the extended tip instead of the URL address entered under URL.</paragraph>
+      </section>
+      <section id="Section43">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPURL" id="bm_id3156336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145377" role="heading" level="2" l10n="U"
+                    oldref="212">Help URL</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148649" role="paragraph" l10n="U" oldref="213"><ahelp hid="HID_PROP_HELPURL">Specifies a batch label in URL spelling which refers to a help document and which can be called with the help of the control field.</ahelp> The help for the control field help can be opened if the focus is positioned on the control field and the user presses F1.</paragraph>
+      </section>
+      <section id="Section42">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BACKGROUNDCOLOR" id="bm_id3149545" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152541" role="heading" level="2" l10n="U" oldref="3">Background color</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155073" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_PROP_BACKGROUNDCOLOR" visibility="hidden">Sets the background color of the control field.</ahelp>A background color is available for most control fields. If you click on <emph>Background color</emph>, a list will open which enables you to select among various colors. The "Standard" option adopts the system setting. If the desired color is not listed, click the <emph>...</emph> button to define a color in the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog.</paragraph>
+      </section>
+      <section id="Section41">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_HSCROLL" id="bm_id3149895" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_VSCROLL" id="bm_id3149517" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_SCROLLBARS" id="bm_id6053651" localize="false"/><paragraph role="heading" id="hd_id3148971" xml-lang="en-US" level="2" l10n="CHG" oldref="40">Scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3144430" xml-lang="en-US" l10n="CHG" oldref="41"><ahelp hid="HID_PROP_HSCROLL" visibility="hidden">Adds the scrollbar type that you specify to a text box.</ahelp>Adds the scrollbar type that you specify to a text box.</paragraph>
-</section>
-<section id="Section78">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPININCREMENT" id="bm_id3022247" localize="false"/><paragraph role="heading" id="par_idN1110B" xml-lang="en-US" level="2" l10n="NEW">Incr./decrement value</paragraph>
-<paragraph role="paragraph" id="par_idN1110F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Determines intervals to add or subtract with each activation of the spin button control.</ahelp></paragraph>
-</section>
-<section id="Section40">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUESTEP" id="bm_id3150624" localize="false"/><paragraph role="heading" id="hd_id3146779" xml-lang="en-US" level="2" l10n="U" oldref="85">Value step</paragraph>
-<paragraph role="paragraph" id="par_id3155096" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="HID_PROP_VALUESTEP" visibility="hidden">Determines spin button intervals.</ahelp>You can preset the value intervals for numerical and currency spin buttons. Use the up and down arrows of the spin button to increase or decrease the value.</paragraph>
-</section>
-<section id="Section39">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRINGITEMLIST" id="bm_id3153975" localize="false"/><paragraph role="heading" id="hd_id3145756" xml-lang="en-US" level="2" l10n="U" oldref="73">List entries</paragraph>
-<paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="CHG" oldref="120"><ahelp hid="HID_PROP_STRINGITEMLIST" visibility="hidden">Defines the list entries visible in the document. Open this list and type your text. Use Shift+Enter for a new line. With list and combo boxes, you can define the list entries that will be visible in the document. Open the <emph>List entries</emph> field and type your text.</ahelp> Please note the <link href="text/shared/02/01170100.xhp" name="tips">tips</link> referring to the keyboard controls.</paragraph>
-<paragraph role="paragraph" id="par_id3152874" xml-lang="en-US" l10n="U" oldref="228">The predefined default list entry is entered into the <emph>Default selection combo</emph> box.</paragraph>
-<paragraph role="note" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="186">Note that the list entries entered here are only incorporated into the form if, on the <emph>Data</emph> tab under <emph>List Content Type</emph>, the option "Value List" is selected.</paragraph>
-<paragraph role="paragraph" id="par_id3154767" xml-lang="en-US" l10n="U" oldref="188">If you do not want the list entries to be written to the database or transmitted to the recipient of the Web form, but rather assigned values that are not visible in the form, you can assign the list entries to other values in a value list. The value list is determined on the <link href="text/shared/02/01170102.xhp" name="Data"><emph>Data</emph></link> tab. Under <emph>Type of List Contents</emph>, select the option "Value List". Then enter the values under <emph>List Contents</emph> that are to be assigned to the corresponding visible list entries of the form. For the correct assignment, the order in the value list is relevant.</paragraph>
-<paragraph role="note" id="par_id3150511" xml-lang="en-US" l10n="U" oldref="189">For HTML documents, a list entry entered on the <emph>General</emph> tab corresponds to the HTML tag &lt;OPTION&gt;; an entry of the value list entered on the <emph>Data</emph> tab under <emph>List Contents</emph> corresponds to the &lt;OPTION VALUE=...&gt; tag.</paragraph>
-</section>
-<section id="Section38">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMAX" id="bm_id3154336" localize="false"/><paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="2" l10n="U" oldref="121">Date max</paragraph>
-<paragraph role="paragraph" id="par_id3148637" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="HID_PROP_DATEMAX" visibility="hidden">Determines a date which can not be exceeded by another value introduced by the user.</ahelp>Determines a date which can not be exceeded by another value introduced by the user.</paragraph>
-</section>
-<section id="Section37">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_MAXTEXTLEN" id="bm_id3149391" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="2" l10n="U" oldref="123">Max text length</paragraph>
-<paragraph role="paragraph" id="par_id3150776" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="HID_PROP_MAXTEXTLEN" visibility="hidden">Defines the maximum number of characters that the user can enter.</ahelp>For text and combo boxes, you can define the maximum number of characters that the user can enter. If this control field property is uncertain, the default setting will be zero.</paragraph>
-<paragraph role="paragraph" id="par_id3153813" xml-lang="en-US" l10n="U" oldref="190">If the control is linked to a database and the text length is to be accepted from the field definition of the database, you must not enter the text length here. The settings are only accepted from the database if the control property was not defined ("Not Defined" state).</paragraph>
-</section>
-<section id="Section36">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_SCROLLBARS" id="bm_id6053651" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148971" role="heading" level="2" l10n="CHG"
+                    oldref="40">Scrollbar</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3144430" role="paragraph" l10n="CHG" oldref="41"><ahelp hid="HID_PROP_HSCROLL" visibility="hidden">Adds the scrollbar type that you specify to a text box.</ahelp>Adds the scrollbar type that you specify to a text box.</paragraph>
+      </section>
+      <section id="Section78">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPININCREMENT" id="bm_id3022247" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1110B" role="heading" level="2" l10n="NEW">Incr./decrement value</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1110F" role="paragraph" l10n="CHG"><ahelp hid=".">Determines intervals to add or subtract with each activation of the spin button control.</ahelp></paragraph>
+      </section>
+      <section id="Section40">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUESTEP" id="bm_id3150624" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146779" role="heading" level="2" l10n="U"
+                    oldref="85">Value step</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155096" role="paragraph" l10n="CHG" oldref="86"><ahelp hid="HID_PROP_VALUESTEP" visibility="hidden">Determines spin button intervals.</ahelp>You can preset the value intervals for numerical and currency spin buttons. Use the up and down arrows of the spin button to increase or decrease the value.</paragraph>
+      </section>
+      <section id="Section39">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRINGITEMLIST" id="bm_id3153975" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145756" role="heading" level="2" l10n="U"
+                    oldref="73">List entries</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151300" role="paragraph" l10n="CHG" oldref="120"><ahelp hid="HID_PROP_STRINGITEMLIST" visibility="hidden">Defines the list entries visible in the document. Open this list and type your text. Use Shift+Enter for a new line. With list and combo boxes, you can define the list entries that will be visible in the document. Open the <emph>List entries</emph> field and type your text.</ahelp> Please note the <link href="text/shared/02/01170100.xhp" name="tips">tips</link> referring to the keyboard controls.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152874" role="paragraph" l10n="U" oldref="228">The predefined default list entry is entered into the <emph>Default selection combo</emph> box.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154610" role="note" l10n="U" oldref="186">Note that the list entries entered here are only incorporated into the form if, on the <emph>Data</emph> tab under <emph>List Content Type</emph>, the option "Value List" is selected.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154767" role="paragraph" l10n="U" oldref="188">If you do not want the list entries to be written to the database or transmitted to the recipient of the Web form, but rather assigned values that are not visible in the form, you can assign the list entries to other values in a value list. The value list is determined on the <link href="text/shared/02/01170102.xhp" name="Data"><emph>Data</emph></link> tab. Under <emph>Type of List Contents</emph>, select the option "Value List". Then enter the values under <emph>List Contents</emph> that are to be assigned to the corresponding visible list entries of the form. For the correct assignment, the order in the value list is relevant.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150511" role="note" l10n="U" oldref="189">For HTML documents, a list entry entered on the <emph>General</emph> tab corresponds to the HTML tag &lt;OPTION&gt;; an entry of the value list entered on the <emph>Data</emph> tab under <emph>List Contents</emph> corresponds to the &lt;OPTION VALUE=...&gt; tag.</paragraph>
+      </section>
+      <section id="Section38">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMAX" id="bm_id3154336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154290" role="heading" level="2" l10n="U"
+                    oldref="121">Date max</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148637" role="paragraph" l10n="U" oldref="122"><ahelp hid="HID_PROP_DATEMAX" visibility="hidden">Determines a date which can not be exceeded by another value introduced by the user.</ahelp>Determines a date which can not be exceeded by another value introduced by the user.</paragraph>
+      </section>
+      <section id="Section37">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_MAXTEXTLEN" id="bm_id3149391" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149804" role="heading" level="2" l10n="U"
+                    oldref="123">Max text length</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150776" role="paragraph" l10n="U" oldref="124"><ahelp hid="HID_PROP_MAXTEXTLEN" visibility="hidden">Defines the maximum number of characters that the user can enter.</ahelp>For text and combo boxes, you can define the maximum number of characters that the user can enter. If this control field property is uncertain, the default setting will be zero.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153813" role="paragraph" l10n="U" oldref="190">If the control is linked to a database and the text length is to be accepted from the field definition of the database, you must not enter the text length here. The settings are only accepted from the database if the control property was not defined ("Not Defined" state).</paragraph>
+      </section>
+      <section id="Section36">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUEMAX" id="bm_id3145145" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEMAX" id="bm_id3155345" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MAX" id="bm_id5229956" localize="false"/><paragraph role="heading" id="hd_id3145599" xml-lang="en-US" level="2" l10n="U" oldref="125">Value max</paragraph>
-<paragraph role="paragraph" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="HID_PROP_EFFECTIVEMAX" visibility="hidden">Defines a value for the control field which can not be exceeded by another value introduced by the user.</ahelp>For numerical and currency fields, you can determine the maximum value that the user can enter.</paragraph>
-</section>
-<section id="Section35">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMAX" id="bm_id3154712" localize="false"/><paragraph role="heading" id="hd_id3154835" xml-lang="en-US" level="2" l10n="U" oldref="127">Time max</paragraph>
-<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="U" oldref="128"><ahelp hid="HID_PROP_TIMEMAX" visibility="hidden">Determines a time which can not be exceeded by another value introduced by the user.</ahelp>Determines a time which can not be exceeded by another value introduced by the user.</paragraph>
-</section>
-<section id="Section34">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTISELECTION" id="bm_id3154168" localize="false"/><paragraph role="heading" id="hd_id3150416" xml-lang="en-US" level="2" l10n="U" oldref="129">Multiselection</paragraph>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="CHG" oldref="130"><ahelp hid="HID_PROP_MULTISELECTION" visibility="hidden">Allows you to select more than one item in a list box.</ahelp>Allows you to select more than one item in a list box.</paragraph>
-</section>
-<section id="Section33">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MAX" id="bm_id5229956" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145599" role="heading" level="2" l10n="U"
+                    oldref="125">Value max</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154733" role="paragraph" l10n="U" oldref="126"><ahelp hid="HID_PROP_EFFECTIVEMAX" visibility="hidden">Defines a value for the control field which can not be exceeded by another value introduced by the user.</ahelp>For numerical and currency fields, you can determine the maximum value that the user can enter.</paragraph>
+      </section>
+      <section id="Section35">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMAX" id="bm_id3154712" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154835" role="heading" level="2" l10n="U"
+                    oldref="127">Time max</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155762" role="paragraph" l10n="U" oldref="128"><ahelp hid="HID_PROP_TIMEMAX" visibility="hidden">Determines a time which can not be exceeded by another value introduced by the user.</ahelp>Determines a time which can not be exceeded by another value introduced by the user.</paragraph>
+      </section>
+      <section id="Section34">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTISELECTION" id="bm_id3154168" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150416" role="heading" level="2" l10n="U"
+                    oldref="129">Multiselection</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143275" role="paragraph" l10n="CHG" oldref="130"><ahelp hid="HID_PROP_MULTISELECTION" visibility="hidden">Allows you to select more than one item in a list box.</ahelp>Allows you to select more than one item in a list box.</paragraph>
+      </section>
+      <section id="Section33">
 <bookmark xml-lang="en-US" branch="index" id="bm_id4040955"><bookmark_value>rich text control</bookmark_value>
-<bookmark_value>controls;rich text control</bookmark_value>
+         <bookmark_value>controls;rich text control</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTILINE" id="bm_id3156370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXTTYPE" id="bm_id6511734" localize="false"/><paragraph role="heading" id="hd_id3148527" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Text type<comment>UFI: now renamed to Text Type, see #i24386#</comment><comment>UFI: see dba spec prop_browser_enhancements.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id3153724" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="37933">Allows you to use line breaks and formatting in a control field, such as a text box or label. To manually enter a line break, press the Enter key. Select "Multi-line with formatting" to enter formatted text.</ahelp></paragraph>
-<paragraph role="warning" id="par_idN113D2" xml-lang="en-US" l10n="NEW">If you select the text type "Multi-line with formatting", you cannot bind this control to a database field.</paragraph>
-<paragraph role="note" id="par_idN11391" xml-lang="en-US" l10n="NEW">This control is named "Multiline input" for a text column inside a table control.</paragraph>
-</section>
-<section id="Section47">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_WORDBREAK" id="bm_id1313516" localize="false"/><paragraph role="heading" id="par_idN114EF" xml-lang="en-US" level="2" l10n="NEW">Word break<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN11505" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays text on more than one line.</ahelp> Allows you to use line breaks in a text box, so that you can enter more than one line of text. To manually enter a line break, press the <item type="keycode">Enter</item> key.</paragraph>
-</section>
-<section id="Section64">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TOGGLE" id="bm_id9645680" localize="false"/><paragraph role="heading" id="par_idN11538" xml-lang="en-US" level="2" l10n="NEW">Toggle<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1154E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if a Push Button behaves as a Toggle Button. If you set Toggle to "Yes", you can switch between the "selected" and "not selected" control states when you click the button or press the spacebar while the the control has the focus. A button in the "selected" state appears "pressed in".</ahelp></paragraph>
-</section>
-<section id="Section65">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FOCUSONCLICK" id="bm_id6996978" localize="false"/><paragraph role="heading" id="par_idN11558" xml-lang="en-US" level="2" l10n="NEW">Take Focus on Click<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1156E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you set this option to "Yes", the Push Button receives the focus when you click the button.</ahelp></paragraph>
-</section>
-<section id="Section66">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDEINACTIVESELECTION" id="bm_id9755546" localize="false"/><paragraph role="heading" id="par_idN11578" xml-lang="en-US" level="2" l10n="NEW">Hide selection<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1158E" xml-lang="en-US" l10n="NEW"><ahelp hid="37965">Specifies whether a text selection on a control remains selected when a the focus is no longer on a control.</ahelp> If you set <emph>Hide selection</emph> to "No", the selected text remains selected when the focus is no longer on the control that contains the text.</paragraph>
-</section>
-<section id="Section67">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISUALEFFECT" id="bm_id7896664" localize="false"/><paragraph role="heading" id="par_idN11598" xml-lang="en-US" level="2" l10n="NEW">Style<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN115AE" xml-lang="en-US" l10n="NEW"><ahelp hid="37966">Specifies whether Check boxes and Option buttons are displayed in a 3D look (default) or a flat look.</ahelp></paragraph>
-</section>
-<section id="Section68">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDERCOLOR" id="bm_id6106448" localize="false"/><paragraph role="heading" id="par_idN115B8" xml-lang="en-US" level="2" l10n="NEW">Border color<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN115CE" xml-lang="en-US" l10n="NEW"><ahelp hid="37967">Specifies the border color for controls that have the Border property set to "flat".</ahelp></paragraph>
-</section>
-<section id="Section79">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SYMBOLCOLOR" id="bm_id9707632" localize="false"/><paragraph role="heading" id="par_idN115B7" xml-lang="en-US" level="2" l10n="NEW">Symbol color</paragraph>
-<paragraph role="paragraph" id="par_idN115BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the color for symbols on controls, for example the arrows on a scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section32">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMIN" id="bm_id3155750" localize="false"/><paragraph role="heading" id="hd_id3149314" xml-lang="en-US" level="2" l10n="U" oldref="131">Date min</paragraph>
-<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="132"><ahelp hid="HID_PROP_DATEMIN" visibility="hidden">Determines the earliest date that a user can enter.</ahelp>Determines the earliest date that a user can enter.</paragraph>
-</section>
-<section id="Section31">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXTTYPE" id="bm_id6511734" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148527" role="heading" level="2" l10n="CHG"
+                    oldref="21">Text type<comment>UFI: now renamed to Text Type, see #i24386#</comment><comment>UFI: see dba spec prop_browser_enhancements.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153724" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="37933">Allows you to use line breaks and formatting in a control field, such as a text box or label. To manually enter a line break, press the Enter key. Select "Multi-line with formatting" to enter formatted text.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN113D2" role="warning" l10n="NEW">If you select the text type "Multi-line with formatting", you cannot bind this control to a database field.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11391" role="note" l10n="NEW">This control is named "Multiline input" for a text column inside a table control.</paragraph>
+      </section>
+      <section id="Section47">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WORDBREAK" id="bm_id1313516" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN114EF" role="heading" level="2" l10n="NEW">Word break<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11505" role="paragraph" l10n="NEW"><ahelp hid=".">Displays text on more than one line.</ahelp> Allows you to use line breaks in a text box, so that you can enter more than one line of text. To manually enter a line break, press the Enter key.</paragraph>
+      </section>
+      <section id="Section64">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TOGGLE" id="bm_id9645680" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11538" role="heading" level="2" l10n="NEW">Toggle<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1154E" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if a Push Button behaves as a Toggle Button. If you set Toggle to "Yes", you can switch between the "selected" and "not selected" control states when you click the button or press the spacebar while the the control has the focus. A button in the "selected" state appears "pressed in".</ahelp></paragraph>
+      </section>
+      <section id="Section65">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FOCUSONCLICK" id="bm_id6996978" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11558" role="heading" level="2" l10n="NEW">Take Focus on Click<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1156E" role="paragraph" l10n="NEW"><ahelp hid=".">If you set this option to "Yes", the Push Button receives the focus when you click the button.</ahelp></paragraph>
+      </section>
+      <section id="Section66">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDEINACTIVESELECTION" id="bm_id9755546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11578" role="heading" level="2" l10n="NEW">Hide selection<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1158E" role="paragraph" l10n="NEW"><ahelp hid="37965">Specifies whether a text selection on a control remains selected when a the focus is no longer on a control.</ahelp> If you set <emph>Hide selection</emph> to "No", the selected text remains selected when the focus is no longer on the control that contains the text.</paragraph>
+      </section>
+      <section id="Section67">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISUALEFFECT" id="bm_id7896664" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11598" role="heading" level="2" l10n="NEW">Style<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN115AE" role="paragraph" l10n="NEW"><ahelp hid="37966">Specifies whether Check boxes and Option buttons are displayed in a 3D look (default) or a flat look.</ahelp></paragraph>
+      </section>
+      <section id="Section68">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDERCOLOR" id="bm_id6106448" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN115B8" role="heading" level="2" l10n="NEW">Border color<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN115CE" role="paragraph" l10n="NEW"><ahelp hid="37967">Specifies the border color for controls that have the Border property set to "flat".</ahelp></paragraph>
+      </section>
+      <section id="Section79">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SYMBOLCOLOR" id="bm_id9707632" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN115B7" role="heading" level="2" l10n="NEW">Symbol color</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN115BB" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the color for symbols on controls, for example the arrows on a scrollbar.</ahelp></paragraph>
+      </section>
+      <section id="Section32">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMIN" id="bm_id3155750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149314" role="heading" level="2" l10n="U"
+                    oldref="131">Date min</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155755" role="paragraph" l10n="U" oldref="132"><ahelp hid="HID_PROP_DATEMIN" visibility="hidden">Determines the earliest date that a user can enter.</ahelp>Determines the earliest date that a user can enter.</paragraph>
+      </section>
+      <section id="Section31">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUEMIN" id="bm_id3145321" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEMIN" id="bm_id3147499" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MIN" id="bm_id3649403" localize="false"/><paragraph role="heading" id="hd_id3152866" xml-lang="en-US" level="2" l10n="U" oldref="133">Value min</paragraph>
-<paragraph role="paragraph" id="par_id3147505" xml-lang="en-US" l10n="U" oldref="134"><ahelp hid="HID_PROP_EFFECTIVEMIN" visibility="hidden">You can determine here a value for the control field to prevent the user from entering a smaller value.</ahelp>For numerical and currency fields you can determine a minimum value to prevent the user from entering a smaller value.</paragraph>
-</section>
-<section id="Section30">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMIN" id="bm_id3148825" localize="false"/><paragraph role="heading" id="hd_id3153298" xml-lang="en-US" level="2" l10n="U" oldref="135">Time min</paragraph>
-<paragraph role="paragraph" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="136"><ahelp hid="HID_PROP_TIMEMIN" visibility="hidden">Determines the minimum time that a user can enter.</ahelp>Determines the minimum time that a user can enter.</paragraph>
-</section>
-<section id="Section29">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DECIMAL_ACCURACY" id="bm_id3154402" localize="false"/><paragraph role="heading" id="hd_id3155746" xml-lang="en-US" level="2" l10n="U" oldref="137">Decimal accuracy</paragraph>
-<paragraph role="paragraph" id="par_id3146096" xml-lang="en-US" l10n="U" oldref="138"><ahelp hid="HID_PROP_DECIMAL_ACCURACY" visibility="hidden">Determines the number of digits displayed to the right of the decimal point.</ahelp>With numerical and currency fields you can determine the number of digits displayed to the right of the decimal point.</paragraph>
-</section>
-<section id="Section28">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAME" id="bm_id3152469" localize="false"/><paragraph role="heading" id="hd_id3151340" xml-lang="en-US" level="2" l10n="U" oldref="9">Name</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_PROP_NAME" visibility="hidden">On the <emph>Properties</emph> tab page, this option specifies the name for the control field. On the <emph>Form Properties </emph>tab page, this option specifies the name for the form.</ahelp>Each control field and each form has a <emph>Name </emph>property through which it can be identified. The name will appear in the <link href="text/shared/02/01170600.xhp" name="Form Navigator">Form Navigator</link> and, using the name, the control field can be referred to from a macro. The default settings already specify a name which is constructed from using the field's label and number.</paragraph>
-<paragraph role="note" id="par_id3153025" xml-lang="en-US" l10n="U" oldref="191">If you work with macros, make sure that the names of the controls are unique.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MIN" id="bm_id3649403" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152866" role="heading" level="2" l10n="U"
+                    oldref="133">Value min</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147505" role="paragraph" l10n="U" oldref="134"><ahelp hid="HID_PROP_EFFECTIVEMIN" visibility="hidden">You can determine here a value for the control field to prevent the user from entering a smaller value.</ahelp>For numerical and currency fields you can determine a minimum value to prevent the user from entering a smaller value.</paragraph>
+      </section>
+      <section id="Section30">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMIN" id="bm_id3148825" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2" l10n="U"
+                    oldref="135">Time min</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148831" role="paragraph" l10n="U" oldref="136"><ahelp hid="HID_PROP_TIMEMIN" visibility="hidden">Determines the minimum time that a user can enter.</ahelp>Determines the minimum time that a user can enter.</paragraph>
+      </section>
+      <section id="Section29">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DECIMAL_ACCURACY" id="bm_id3154402" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155746" role="heading" level="2" l10n="U"
+                    oldref="137">Decimal accuracy</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146096" role="paragraph" l10n="U" oldref="138"><ahelp hid="HID_PROP_DECIMAL_ACCURACY" visibility="hidden">Determines the number of digits displayed to the right of the decimal point.</ahelp>With numerical and currency fields you can determine the number of digits displayed to the right of the decimal point.</paragraph>
+      </section>
+      <section id="Section28">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAME" id="bm_id3152469" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151340" role="heading" level="2" l10n="U" oldref="9">Name</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_PROP_NAME" visibility="hidden">On the <emph>Properties</emph> tab page, this option specifies the name for the control field. On the <emph>Form Properties </emph>tab page, this option specifies the name for the form.</ahelp>Each control field and each form has a <emph>Name </emph>property through which it can be identified. The name will appear in the <link href="text/shared/02/01170600.xhp" name="Form Navigator">Form Navigator</link> and, using the name, the control field can be referred to from a macro. The default settings already specify a name which is constructed from using the field's label and number.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153025" role="note" l10n="U" oldref="191">If you work with macros, make sure that the names of the controls are unique.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146325"><bookmark_value>controls; grouping</bookmark_value>
-<bookmark_value>groups;of controls</bookmark_value>
-<bookmark_value>forms; grouping controls</bookmark_value>
-</bookmark><comment>mw changed "grouping;" to "groups;"</comment><paragraph role="paragraph" id="par_id3146325" xml-lang="en-US" l10n="U" oldref="192">The name is also used to group different controls that belong together functionally, such as radio buttons. To do so, give the same name to all members of the group: controls with identical names form a group. Grouped controls can be represented visually by using a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link>.</paragraph>
-</section>
-<section id="Section27">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAVIGATIONBAR" id="bm_id3153020" localize="false"/><paragraph role="heading" id="hd_id3149720" xml-lang="en-US" level="2" l10n="U" oldref="197">Navigation bar</paragraph>
-<paragraph role="paragraph" id="par_id3149918" xml-lang="en-US" l10n="U" oldref="198"><ahelp hid="HID_PROP_NAVIGATIONBAR" visibility="hidden">Specifies whether to display the navigation bar on the lower border of the table control.</ahelp>Specifies whether to display the navigation bar on the lower border of table controls.</paragraph>
-</section>
-<section id="Section26">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_READONLY" id="bm_id3151173" localize="false"/><paragraph role="heading" id="hd_id3158426" xml-lang="en-US" level="2" l10n="U" oldref="42">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3153215" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_PROP_READONLY" visibility="hidden">Determines if the control is read-only (Yes) or if it can be edited (No).</ahelp>The<emph> Read-only </emph>property can be assigned to all controls in which the user can enter text. If you assign the read-only property to an image field which uses graphics from a database, the user will not be able to insert new graphics into the database.</paragraph>
-</section>
-<section id="Section25">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDER" id="bm_id3154414" localize="false"/><paragraph role="heading" id="hd_id3148912" xml-lang="en-US" level="2" l10n="U" oldref="139">Border</paragraph>
-<paragraph role="paragraph" id="par_id3145637" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_PROP_BORDER" visibility="hidden">Determines if the field's border should be displayed "Without frame", with a "3-D look" or "Flat".</ahelp>With control fields that have a frame, you can determine the border display on the form using the <emph>Border </emph>property. You can select among the "Without frame", "3-D look" or "Flat" options.</paragraph>
-</section>
-<section id="Section24">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABINDEX" id="bm_id3157872" localize="false"/><paragraph role="heading" id="hd_id3149266" xml-lang="en-US" level="2" l10n="CHG" oldref="44">Tab order</paragraph>
-<paragraph role="paragraph" id="par_id3147483" xml-lang="en-US" l10n="CHG" oldref="45"><ahelp hid="HID_PROP_TABINDEX">The <emph>Tab order</emph> property determines the order in which the controls are focused in the form when you press the Tab key.</ahelp> In a form that contains more than one control, the focus moves to the next control when you press the Tab key. You can specify the order in which the focus changes with an index under <emph>Tab order</emph>.</paragraph>
-<paragraph role="note" id="par_id3156207" xml-lang="en-US" l10n="CHG" oldref="193">The <emph>Tab order</emph> property is not available to <link href="text/shared/02/01170600.xhp" name="Hidden Controls">Hidden Controls</link>. If you want, you can also set this property for image buttons and image controls, so that you can select these controls with the Tab key.</paragraph>
-<paragraph role="paragraph" id="par_id3150378" xml-lang="en-US" l10n="U" oldref="46">When creating a form, an index is automatically assigned to the control fields that are added to this form; every control field added is assigned an index increased by 1. If you change the index of a control, the indices of the other controls are updated automatically. Elements that cannot be focused (Tabstop = No) are also assigned a value. However, these controls are skipped when using the Tab key.</paragraph>
-<paragraph role="paragraph" id="par_id3150640" xml-lang="en-US" l10n="U" oldref="47">You can also easily define the indices of the different controls in the <link href="text/shared/02/01170300.xhp" name="Tab Order"><emph>Tab Order</emph></link> dialog.</paragraph>
-</section>
-<section id="Section22">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_CHECKED" id="bm_id3109847" localize="false"/><paragraph role="heading" id="hd_id3154049" xml-lang="en-US" level="2" l10n="U" oldref="34">Default status</paragraph>
-<paragraph role="paragraph" id="par_id3150837" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_PROP_DEFAULT_CHECKED">Specifies whether an option or a check box is selected by default.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149242" xml-lang="en-US" l10n="U" oldref="201">For a reset type button, you can define the status of the control if the reset button is activated by the user.</paragraph>
-<paragraph role="paragraph" id="par_id3156266" xml-lang="en-US" l10n="U" oldref="202">For grouped option fields, the status of the group corresponding to the default setting is defined by the <emph>Default Status</emph> property.<comment>UFI: what does this mean? Cannot understand that sentence.</comment></paragraph>
-</section>
-<section id="Section21">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SELECT_SEQ" id="bm_id3147220" localize="false"/><paragraph role="heading" id="hd_id3156150" xml-lang="en-US" level="2" l10n="U" oldref="36">Default selection</paragraph>
-<paragraph role="paragraph" id="par_id3148730" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="HID_PROP_DEFAULT_SELECT_SEQ" visibility="hidden">Specifies the list box entry to mark as the default entry.</ahelp>Specifies the list box entry to mark as the default entry.</paragraph>
-<paragraph role="paragraph" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="203">For a Reset type button, the<emph> Default selection</emph> entry defines the status of the list box if the reset button is activated by the user.</paragraph>
-<paragraph role="paragraph" id="par_id919217" xml-lang="en-US" l10n="NEW">For a List box that contains a value list, you can click the <emph>...</emph> button to open the <emph>Default selection</emph> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id50050" xml-lang="en-US" l10n="NEW">In the <emph>Default selection</emph> dialog, select the entries that you want to mark as selected when you open the form that contains the list box.</paragraph>
-</section>
-<section id="Section20">
+         <bookmark_value>groups;of controls</bookmark_value>
+         <bookmark_value>forms; grouping controls</bookmark_value>
+</bookmark><comment>mw changed "grouping;" to "groups;"</comment>
+<paragraph xml-lang="en-US" id="par_id3146325" role="paragraph" l10n="U" oldref="192">The name is also used to group different controls that belong together functionally, such as radio buttons. To do so, give the same name to all members of the group: controls with identical names form a group. Grouped controls can be represented visually by using a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link>.</paragraph>
+      </section>
+      <section id="Section27">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAVIGATIONBAR" id="bm_id3153020" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149720" role="heading" level="2" l10n="U"
+                    oldref="197">Navigation bar</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149918" role="paragraph" l10n="U" oldref="198"><ahelp hid="HID_PROP_NAVIGATIONBAR" visibility="hidden">Specifies whether to display the navigation bar on the lower border of the table control.</ahelp>Specifies whether to display the navigation bar on the lower border of table controls.</paragraph>
+      </section>
+      <section id="Section26">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_READONLY" id="bm_id3151173" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158426" role="heading" level="2" l10n="U"
+                    oldref="42">Read-only</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153215" role="paragraph" l10n="U" oldref="43"><ahelp hid="HID_PROP_READONLY" visibility="hidden">Determines if the control is read-only (Yes) or if it can be edited (No).</ahelp>The<emph> Read-only </emph>property can be assigned to all controls in which the user can enter text. If you assign the read-only property to an image field which uses graphics from a database, the user will not be able to insert new graphics into the database.</paragraph>
+      </section>
+      <section id="Section25">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDER" id="bm_id3154414" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148912" role="heading" level="2" l10n="U"
+                    oldref="139">Border</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145637" role="paragraph" l10n="U" oldref="140"><ahelp hid="HID_PROP_BORDER" visibility="hidden">Determines if the field's border should be displayed "Without frame", with a "3-D look" or "Flat".</ahelp>With control fields that have a frame, you can determine the border display on the form using the <emph>Border </emph>property. You can select among the "Without frame", "3-D look" or "Flat" options.</paragraph>
+      </section>
+      <section id="Section24">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABINDEX" id="bm_id3157872" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149266" role="heading" level="2" l10n="CHG"
+                    oldref="44">Tab order</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147483" role="paragraph" l10n="CHG" oldref="45"><ahelp hid="HID_PROP_TABINDEX">The <emph>Tab order</emph> property determines the order in which the controls are focused in the form when you press the Tab key.</ahelp> In a form that contains more than one control, the focus moves to the next control when you press the Tab key. You can specify the order in which the focus changes with an index under <emph>Tab order</emph>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156207" role="note" l10n="CHG" oldref="193">The <emph>Tab order</emph> property is not available to <link href="text/shared/02/01170600.xhp" name="Hidden Controls">Hidden Controls</link>. If you want, you can also set this property for image buttons and image controls, so that you can select these controls with the Tab key.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150378" role="paragraph" l10n="U" oldref="46">When creating a form, an index is automatically assigned to the control fields that are added to this form; every control field added is assigned an index increased by 1. If you change the index of a control, the indices of the other controls are updated automatically. Elements that cannot be focused (Tabstop = No) are also assigned a value. However, these controls are skipped when using the Tab key.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150640" role="paragraph" l10n="U" oldref="47">You can also easily define the indices of the different controls in the <link href="text/shared/02/01170300.xhp" name="Tab Order"><emph>Tab Order</emph></link> dialog.</paragraph>
+      </section>
+      <section id="Section89">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WHEEL_BEHAVIOR" id="bm_id0509200912044845" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0509200912114423" role="heading" level="2" l10n="NEW">Mouse wheel scroll</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0509200912114566" role="paragraph" l10n="NEW"><ahelp hid=".">Sets whether the value changes when the user scrolls a mouse wheel. Never: No change of the value. When focused: (default) The value changes when the control has the focus and the wheel is pointing at the control and gets scrolled. Always: The value changes when the wheel is pointing at the control and gets scrolled, no matter which control has the focus.</ahelp></paragraph>
+      </section>
+      <section id="Section22">
+<!-- removed HID HID_PROP_DEFAULT_CHECKED -->
+<paragraph xml-lang="en-US" id="hd_id3154049" role="heading" level="2" l10n="U"
+                    oldref="34">Default status</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150837" role="paragraph" l10n="U" oldref="35"><ahelp hid="HID_PROP_DEFAULT_CHECKED">Specifies whether an option or a check box is selected by default.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149242" role="paragraph" l10n="U" oldref="201">For a reset type button, you can define the status of the control if the reset button is activated by the user.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156266" role="paragraph" l10n="U" oldref="202">For grouped option fields, the status of the group corresponding to the default setting is defined by the <emph>Default Status</emph> property.<comment>UFI: what does this mean? Cannot understand that sentence.</comment></paragraph>
+      </section>
+      <section id="Section21">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SELECT_SEQ" id="bm_id3147220" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156150" role="heading" level="2" l10n="U"
+                    oldref="36">Default selection</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148730" role="paragraph" l10n="CHG" oldref="37"><ahelp hid="HID_PROP_DEFAULT_SELECT_SEQ" visibility="hidden">Specifies the list box entry to mark as the default entry.</ahelp>Specifies the list box entry to mark as the default entry.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="203">For a Reset type button, the<emph> Default selection</emph> entry defines the status of the list box if the reset button is activated by the user.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id919217" role="paragraph" l10n="NEW">For a List box that contains a value list, you can click the <emph>...</emph> button to open the <emph>Default selection</emph> dialog.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id50050" role="paragraph" l10n="NEW">In the <emph>Default selection</emph> dialog, select the entries that you want to mark as selected when you open the form that contains the list box.</paragraph>
+      </section>
+      <section id="Section20">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULTVALUE" id="bm_id3153100" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEDEFAULT" id="bm_id3143231" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SPINVALUE" id="bm_id4093447" localize="false"/><paragraph role="heading" id="hd_id3150460" xml-lang="en-US" level="2" l10n="U" oldref="38">Default value</paragraph>
-<paragraph role="paragraph" id="par_id3154222" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_PROP_EFFECTIVEDEFAULT">Sets the default value for the control field.</ahelp> For example, the default value will be entered when a form is opened.</paragraph>
-<paragraph role="paragraph" id="par_id3150740" xml-lang="en-US" l10n="U" oldref="199">For a Reset type button, the<emph> Default value entry </emph>defines the status of the control if the reset button is activated by the user.</paragraph>
-</section>
-<section id="Section45">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SCROLLVALUE" id="bm_id6967986" localize="false"/><paragraph role="heading" id="par_idN11B70" xml-lang="en-US" level="2" l10n="NEW">Default scroll value</paragraph>
-<paragraph role="paragraph" id="par_idN11B74" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_DEFAULT_SCROLLVALUE">Sets the default value for the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section72">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MAX" id="bm_id3148873" localize="false"/><paragraph role="heading" id="hd_id3155440" xml-lang="en-US" level="2" l10n="U" oldref="252">Scroll value max.</paragraph>
-<paragraph role="paragraph" id="par_id3148877" xml-lang="en-US" l10n="U" oldref="251"><ahelp hid="HID_PROP_SCROLLVALUE_MAX">Specify the maximum value of a scrollbar control.</ahelp></paragraph>
-</section>
-<section id="Section71">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MIN" id="bm_id6626483" localize="false"/><paragraph role="heading" id="par_idN111E4" xml-lang="en-US" level="2" l10n="NEW">Scroll value min.</paragraph>
-<paragraph role="paragraph" id="par_idN111E8" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_SCROLLVALUE_MIN">Specify the minimum value of a scrollbar control.</ahelp></paragraph>
-</section>
-<section id="Section80">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEINCREMENT" id="bm_id6233100" localize="false"/><paragraph role="heading" id="par_idN11B51" xml-lang="en-US" level="2" l10n="NEW">Small change</paragraph>
-<paragraph role="paragraph" id="par_idN11B55" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks the arrow icon on the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section81">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BLOCKINCREMENT" id="bm_id1151463" localize="false"/><paragraph role="heading" id="par_idN11B6F" xml-lang="en-US" level="2" l10n="NEW">Large change</paragraph>
-<paragraph role="paragraph" id="par_idN11B73" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks next to the slider on the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section19">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_TIME" id="bm_id3146878" localize="false"/><paragraph role="heading" id="hd_id7215491" xml-lang="en-US" level="2" l10n="NEW">Default time</paragraph>
-<paragraph role="paragraph" id="par_id2299874" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets the default time.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150482" xml-lang="en-US" l10n="CHG" oldref="200">If you do not enter a value, the current time is inserted.</paragraph>
-</section>
-<section id="Section18">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_DATE" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id1727347" xml-lang="en-US" level="2" l10n="NEW">Default date</paragraph>
-<paragraph role="paragraph" id="par_id2545548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets the default date.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2360911" xml-lang="en-US" l10n="NEW">If you do not enter a value, the current date is inserted.</paragraph>
-</section>
-<section id="Section17">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXT" id="bm_id8406628" localize="false"/><paragraph role="heading" id="hd_id9207434" xml-lang="en-US" level="2" l10n="NEW">Default text</paragraph>
-<paragraph role="paragraph" id="par_id4563127" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Sets the default text for a text box or a combo box.</ahelp></paragraph>
-</section>
-<section id="Section16">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_BUTTON" id="bm_id3156300" localize="false"/><paragraph role="heading" id="hd_id3145206" xml-lang="en-US" level="2" l10n="U" oldref="144">Default button</paragraph>
-<paragraph role="paragraph" id="par_id3154681" xml-lang="en-US" l10n="U" oldref="145"><ahelp hid="HID_PROP_DEFAULT_BUTTON" visibility="hidden">The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key.</ahelp>The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key. If you open the dialog or form and do not carry out any further action, the button with this property is the default button.</paragraph>
-<paragraph role="note" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="175">This property should be assigned only to a single button within the document.</paragraph>
-<paragraph role="paragraph" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="177">When using Web page forms, you might come across this property in search masks. These are edit masks that contain a text field and a Submit type button. The search term is entered in the text field and the search is started by activating the button. If the button is defined as the default button, however, simply hit Enter after entering the search term in order to start the search.</paragraph>
-</section>
-<section id="Section15">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRSYM_POSITION" id="bm_id3150265" localize="false"/><paragraph role="heading" id="hd_id3153389" xml-lang="en-US" level="2" l10n="U" oldref="221">Prefix symbol</paragraph>
-<paragraph role="paragraph" id="par_id3150271" xml-lang="en-US" l10n="U" oldref="222"><ahelp hid="HID_PROP_CURRSYM_POSITION">Determines if the currency symbol is displayed before or after the number when using currency fields.</ahelp> The default setting is currency symbols are not prefixed.</paragraph>
-</section>
-<section id="Section14">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABSTOP" id="bm_id3148938" localize="false"/><paragraph role="heading" id="hd_id3154548" xml-lang="en-US" level="2" l10n="U" oldref="48">Tabstop</paragraph>
-<paragraph role="paragraph" id="par_id3155361" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_PROP_TABSTOP">The <emph>Tabstop </emph>property determines if a control field can be selected with the tab key.</ahelp> The following options are available:<comment>UFI: Default entry row deleted from table</comment></paragraph>
-<table id="tbl_id3154843">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148627" xml-lang="en-US" l10n="U" oldref="52">No</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161673" xml-lang="en-US" l10n="U" oldref="53">When using the tab key, focusing skips the control.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159323" xml-lang="en-US" l10n="U" oldref="50">Yes</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148584" xml-lang="en-US" l10n="U" oldref="51">The control can be selected with the Tab key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<section id="Section13">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWTHOUSANDSEP" id="bm_id3154931" localize="false"/><paragraph role="heading" id="hd_id3146909" xml-lang="en-US" level="2" l10n="U" oldref="147">Thousands separator</paragraph>
-<paragraph role="paragraph" id="par_id3154936" xml-lang="en-US" l10n="U" oldref="148"><ahelp hid="HID_PROP_SHOWTHOUSANDSEP" visibility="hidden">Inserts a thousands separator.</ahelp>With numerical and currency fields you can determine whether thousands separators are used.</paragraph>
-</section>
-<section id="Section12">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LABEL" id="bm_id3159212" localize="false"/><paragraph role="heading" id="hd_id3156256" xml-lang="en-US" level="2" l10n="U" oldref="7">Label</paragraph>
-<paragraph role="paragraph" id="par_id3156432" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_PROP_LABEL" visibility="hidden">The Label property sets the label of the control field that is displayed in the form.</ahelp>The Label property sets the label of the control field that is displayed in the form. This property determines the visible label or the column header of the data field in table control forms.</paragraph>
-<paragraph role="paragraph" id="par_id3154568" xml-lang="en-US" l10n="U" oldref="54">When you create a new control, the description predefined in the <emph>Name</emph> property is used as the default for labeling the control. The label consists of the control field name and an integer numbering the control (for example, CommandButton1). With the <emph>Title</emph> property, you can assign another description to the control so that the label reflects the function of the control. Change this entry in order to assign an expressive label to the control that is visible to the user.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SPINVALUE" id="bm_id4093447" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150460" role="heading" level="2" l10n="U"
+                    oldref="38">Default value</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_PROP_EFFECTIVEDEFAULT">Sets the default value for the control field.</ahelp> For example, the default value will be entered when a form is opened.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150740" role="paragraph" l10n="U" oldref="199">For a Reset type button, the<emph> Default value entry </emph>defines the status of the control if the reset button is activated by the user.</paragraph>
+      </section>
+      <section id="Section45">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SCROLLVALUE" id="bm_id6967986" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B70" role="heading" level="2" l10n="NEW">Default scroll value</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11B74" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_DEFAULT_SCROLLVALUE">Sets the default value for the scrollbar.</ahelp></paragraph>
+      </section>
+      <section id="Section72">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MAX" id="bm_id3148873" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155440" role="heading" level="2" l10n="U"
+                    oldref="252">Scroll value max.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148877" role="paragraph" l10n="U" oldref="251"><ahelp hid="HID_PROP_SCROLLVALUE_MAX">Specify the maximum value of a scrollbar control.</ahelp></paragraph>
+      </section>
+      <section id="Section71">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MIN" id="bm_id6626483" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN111E4" role="heading" level="2" l10n="NEW">Scroll value min.</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN111E8" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_SCROLLVALUE_MIN">Specify the minimum value of a scrollbar control.</ahelp></paragraph>
+      </section>
+      <section id="Section80">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEINCREMENT" id="bm_id6233100" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B51" role="heading" level="2" l10n="NEW">Small change</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11B55" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks the arrow icon on the scrollbar.</ahelp></paragraph>
+      </section>
+      <section id="Section81">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BLOCKINCREMENT" id="bm_id1151463" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B6F" role="heading" level="2" l10n="NEW">Large change</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11B73" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks next to the slider on the scrollbar.</ahelp></paragraph>
+      </section>
+      <section id="Section19">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_TIME" id="bm_id3146878" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7215491" role="heading" level="2" l10n="NEW">Default time</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2299874" role="paragraph" l10n="NEW"><ahelp hid=".">Sets the default time.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150482" role="note" l10n="CHG" oldref="200">If you do not enter a value, the current time is inserted.</paragraph>
+      </section>
+      <section id="Section18">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_DATE" id="bm_id3146874" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1727347" role="heading" level="2" l10n="NEW">Default date</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2545548" role="paragraph" l10n="NEW"><ahelp hid=".">Sets the default date.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id2360911" role="paragraph" l10n="NEW">If you do not enter a value, the current date is inserted.</paragraph>
+      </section>
+      <section id="Section17">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXT" id="bm_id8406628" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9207434" role="heading" level="2" l10n="NEW">Default text</paragraph>
+         <paragraph xml-lang="en-US" id="par_id4563127" role="paragraph" l10n="CHG"><ahelp hid=".">Sets the default text for a text box or a combo box.</ahelp></paragraph>
+      </section>
+      <section id="Section16">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_BUTTON" id="bm_id3156300" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145206" role="heading" level="2" l10n="U"
+                    oldref="144">Default button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154681" role="paragraph" l10n="U" oldref="145"><ahelp hid="HID_PROP_DEFAULT_BUTTON" visibility="hidden">The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key.</ahelp>The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key. If you open the dialog or form and do not carry out any further action, the button with this property is the default button.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149750" role="note" l10n="U" oldref="175">This property should be assigned only to a single button within the document.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150931" role="paragraph" l10n="U" oldref="177">When using Web page forms, you might come across this property in search masks. These are edit masks that contain a text field and a Submit type button. The search term is entered in the text field and the search is started by activating the button. If the button is defined as the default button, however, simply hit Enter after entering the search term in order to start the search.</paragraph>
+      </section>
+      <section id="Section15">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRSYM_POSITION" id="bm_id3150265" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153389" role="heading" level="2" l10n="U"
+                    oldref="221">Prefix symbol</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150271" role="paragraph" l10n="U" oldref="222"><ahelp hid="HID_PROP_CURRSYM_POSITION">Determines if the currency symbol is displayed before or after the number when using currency fields.</ahelp> The default setting is currency symbols are not prefixed.</paragraph>
+      </section>
+      <section id="Section14">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABSTOP" id="bm_id3148938" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154548" role="heading" level="2" l10n="U"
+                    oldref="48">Tabstop</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_PROP_TABSTOP">The <emph>Tabstop </emph>property determines if a control field can be selected with the tab key.</ahelp> The following options are available:<comment>UFI: Default entry row deleted from table</comment></paragraph>
+         <table id="tbl_id3154843">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148627" role="paragraph" l10n="U" oldref="52">No</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3161673" role="paragraph" l10n="U" oldref="53">When using the tab key, focusing skips the control.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159323" role="paragraph" l10n="U" oldref="50">Yes</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148584" role="paragraph" l10n="U" oldref="51">The control can be selected with the Tab key.</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+      <section id="Section13">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWTHOUSANDSEP" id="bm_id3154931" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146909" role="heading" level="2" l10n="U"
+                    oldref="147">Thousands separator</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154936" role="paragraph" l10n="U" oldref="148"><ahelp hid="HID_PROP_SHOWTHOUSANDSEP" visibility="hidden">Inserts a thousands separator.</ahelp>With numerical and currency fields you can determine whether thousands separators are used.</paragraph>
+      </section>
+      <section id="Section12">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LABEL" id="bm_id3159212" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156256" role="heading" level="2" l10n="U" oldref="7">Label</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156432" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_PROP_LABEL" visibility="hidden">The Label property sets the label of the control field that is displayed in the form.</ahelp>The Label property sets the label of the control field that is displayed in the form. This property determines the visible label or the column header of the data field in table control forms.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="54">When you create a new control, the description predefined in the <emph>Name</emph> property is used as the default for labeling the control. The label consists of the control field name and an integer numbering the control (for example, CommandButton1). With the <emph>Title</emph> property, you can assign another description to the control so that the label reflects the function of the control. Change this entry in order to assign an expressive label to the control that is visible to the user.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163820"><bookmark_value>multi-line titles in forms</bookmark_value>
-<bookmark_value>names; multi-line titles</bookmark_value>
-<bookmark_value>controls; multi-line titles</bookmark_value>
+         <bookmark_value>names; multi-line titles</bookmark_value>
+         <bookmark_value>controls; multi-line titles</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
-<paragraph role="note" id="par_id3159407" xml-lang="en-US" l10n="U" oldref="55">The <emph>Title</emph> property is only used for labeling a form element in the interface visible to the user. If you work with macros, note that at runtime, a control is always addressed through the <emph>Name</emph> property.</paragraph>
-</section>
-<section id="Section11">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_URL" id="bm_id3154726" localize="false"/><paragraph role="heading" id="hd_id3150293" xml-lang="en-US" level="2" l10n="U" oldref="56">URL</paragraph>
-<paragraph role="paragraph" id="par_id3154358" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="HID_PROP_TARGET_URL" visibility="hidden">Specifies the URL address that opens when you click an "Open document / web page" button.</ahelp>Enter the URL address for a Open document or web page button type in the <emph>URL</emph> box. The address opens when you click the button.</paragraph>
-<paragraph role="paragraph" id="par_id3146074" xml-lang="en-US" l10n="U" oldref="211">If you move the mouse over the button in User mode, the URL appears as the extended tip, provided that no other Help text was entered.</paragraph>
-</section>
-<section id="Section10">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRENCYSYMBOL" id="bm_id3145154" localize="false"/><paragraph role="heading" id="hd_id3147134" xml-lang="en-US" level="2" l10n="U" oldref="149">Currency symbol</paragraph>
-<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="150"><ahelp hid="HID_PROP_CURRENCYSYMBOL" visibility="hidden">You can enter a character or a string for the currency symbol.</ahelp>In a currency field, you can pre-define the currency symbol by entering the character or string in the <emph>Currency symbol</emph> property.</paragraph>
-</section>
-<section id="Section9">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDDEN_VALUE" id="bm_id3156100" localize="false"/><paragraph role="heading" id="hd_id3144444" xml-lang="en-US" level="2" l10n="U" oldref="154">Value</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="155"><ahelp hid="HID_PROP_HIDDEN_VALUE" visibility="hidden">You can enter the data that is inherited by the hidden control.</ahelp>In a <link href="text/shared/02/01170600.xhp" name="hidden control">hidden control</link>, under <emph>Value</emph>, you can enter the data which is inherited by the hidden control. This data will be transferred when sending the form.</paragraph>
-</section>
-<section id="Section8">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ECHO_CHAR" id="bm_id3148694" localize="false"/><paragraph role="heading" id="hd_id3157315" xml-lang="en-US" level="2" l10n="U" oldref="156">Password characters</paragraph>
-<paragraph role="paragraph" id="par_id3155323" xml-lang="en-US" l10n="U" oldref="157"><ahelp hid="HID_PROP_ECHO_CHAR" visibility="hidden">If the text box is used as a password input, enter the ASCII-code of the display character. This character is displayed instead of the characters typed by the user for the password.</ahelp>If the user enters a password, you can determine the characters that will be displayed instead of the characters typed by the user. Under <emph>Password character</emph>, enter the ASCII code of the desired character. You can use the values from 0 to 255.</paragraph>
-<paragraph role="tip" id="par_id3152493" xml-lang="en-US" l10n="CHG" oldref="158">The characters and their ASCII codes can be seen in the <emph>Special Characters</emph> dialog (Insert - Special Character).</paragraph>
-</section>
-<section id="Section7">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LITERALMASK" id="bm_id3157547" localize="false"/><paragraph role="heading" id="hd_id3157884" xml-lang="en-US" level="2" l10n="U" oldref="159">Literal mask</paragraph>
-<paragraph role="paragraph" id="par_id3157557" xml-lang="en-US" l10n="U" oldref="160"><ahelp hid="HID_PROP_LITERALMASK" visibility="hidden">Defines the literal mask. The literal mask contains the initial values and is always visible after downloading a form.</ahelp>With masked fields you can specify a literal mask. A literal mask contains the initial values of a form, and is always visible after downloading a form. Using a character code for the Edit mask, you can determine the entries that the user can type into the masked field.</paragraph>
-<paragraph role="note" id="par_id3148513" xml-lang="en-US" l10n="U" oldref="161">The length of the literal mask should always correspond to the length of the edit mask. If this is not the case, the edit mask is either cut off or filled with blanks up to the length of the edit mask.</paragraph>
-</section>
-<section id="Section6">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FONT" id="bm_id3151032" localize="false"/><paragraph role="heading" id="hd_id3146762" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Font<comment>UFI: dba.features "Character set property renamed to Font"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3151037" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_PROP_FONT" visibility="hidden">Select the font for the text that is in the control field.</ahelp>For control fields which have visible text or titles, select the display font that you want to use. To open the <link href="text/shared/01/05020100.xhp" name="Font"><emph>Font</emph></link> dialog, click the <emph>...</emph> button. The selected font is used in control fields names and to display data in table control fields.</paragraph>
-</section>
-<section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ROWHEIGHT" id="bm_id3160449" localize="false"/><paragraph role="heading" id="hd_id3156734" xml-lang="en-US" level="2" l10n="U" oldref="162">Row height</paragraph>
-<paragraph role="paragraph" id="par_id3160455" xml-lang="en-US" l10n="CHG" oldref="163"><ahelp hid="HID_PROP_ROWHEIGHT" visibility="hidden">Specifies the row height of a table control field.</ahelp>In table controls, enter a value for the row height. If you want, you can enter a value followed by valid measurement unit, for example, 2 cm.</paragraph>
-</section>
-<section id="Section77">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEEND_FORMAT" id="bm_id396130" localize="false"/><paragraph role="heading" id="par_idN11FB6" xml-lang="en-US" level="2" l10n="NEW">Text lines end with</paragraph>
-<paragraph role="paragraph" id="par_idN11FBA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For text fields, select the line end code to be used when writing text into a database column.</ahelp><comment>UFI: spec dba-features: "form text fields: New property Text lines end with"</comment></paragraph>
-</section>
-<section id="Section4">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEFORMAT" id="bm_id3145181" localize="false"/><paragraph role="heading" id="hd_id3160477" xml-lang="en-US" level="2" l10n="U" oldref="168">Time format</paragraph>
-<paragraph role="paragraph" id="par_id3145187" xml-lang="en-US" l10n="U" oldref="169"><ahelp hid="HID_PROP_TIMEFORMAT" visibility="hidden">You can define the desired format for the time display.</ahelp>You can define the desired format for the time display.</paragraph>
-</section>
-<section id="Section3">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TAG" id="bm_id3158205" localize="false"/><paragraph role="heading" id="hd_id3158195" xml-lang="en-US" level="2" l10n="U" oldref="170">Help text</paragraph>
-<paragraph role="paragraph" id="par_id3146823" xml-lang="en-US" l10n="U" oldref="171"><ahelp hid="HID_PROP_TAG" visibility="hidden">Specifies additional information or a descriptive text for the control field.</ahelp>In each control field you can specify additional information or a descriptive text for the control field. This property helps the programmer to save additional information that can be used in the program code. This field can be used, for example, for variables or other evaluation parameters.</paragraph>
-</section>
-<section id="Section2">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FORMATKEY" id="bm_id3157839" localize="false"/><paragraph role="heading" id="hd_id3157828" xml-lang="en-US" level="2" l10n="U" oldref="232">Formatting</paragraph>
-<paragraph role="paragraph" id="par_id3146843" xml-lang="en-US" l10n="U" oldref="233"><ahelp hid="HID_PROP_FORMATKEY">Specifies the format code for the control. Click the <emph>...</emph> button to select the format code.</ahelp></paragraph>
-</section>
-<section id="Section69">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCALEIMAGE" id="bm_id1145054" localize="false"/><paragraph role="heading" id="par_idN122C4" xml-lang="en-US" level="2" l10n="NEW">Scale</paragraph>
-<paragraph role="paragraph" id="par_idN122C8" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_SCALEIMAGE">Resizes the image to fit the size of the control.</ahelp></paragraph>
-</section>
-<section id="Section23">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_RECORDACTIONS" id="bm_id7442243" localize="false"/><paragraph role="heading" id="par_idN1209F" xml-lang="en-US" level="2" l10n="NEW">Acting on a record</paragraph>
-<paragraph role="paragraph" id="par_idN120B1" xml-lang="en-US" l10n="NEW"><ahelp hid="37930">Specifies to show or hide the action items in a selected Navigation Bar control.</ahelp> Action items are the following: Save record, Undo, New record, Delete record, Refresh.</paragraph>
-</section>
-<section id="Section70">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_POSITION" id="bm_id9985961" localize="false"/><paragraph role="heading" id="par_idN120BE" xml-lang="en-US" level="2" l10n="NEW">Positioning</paragraph>
-<paragraph role="paragraph" id="par_idN120D9" xml-lang="en-US" l10n="NEW"><ahelp hid="37928">Specifies to show or hide the positioning items in a selected Navigation Bar control.</ahelp> Positioning items are the following: Record label, Record position, Record count label, Record count.</paragraph>
-</section>
-<section id="Section74">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_NAVIGATION" id="bm_id1122775" localize="false"/><paragraph role="heading" id="par_idN120D7" xml-lang="en-US" level="2" l10n="NEW">Navigation</paragraph>
-<paragraph role="paragraph" id="par_idN120DB" xml-lang="en-US" l10n="NEW"><ahelp hid="37929">Specifies to show or hide the navigation items in a selected Navigation Bar control.</ahelp> Navigation items are the following: First record, Previous record, Next record, Last record.</paragraph>
-</section>
-<section id="Section75">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_FILTERSORT" id="bm_id7137363" localize="false"/><paragraph role="heading" id="par_idN12156" xml-lang="en-US" level="2" l10n="NEW">Filtering / Sorting</paragraph>
-<paragraph role="paragraph" id="par_idN1215A" xml-lang="en-US" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Remove filter/sort.</paragraph>
-</section>
-<section id="Section76">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ICONSIZE" id="bm_id7815790" localize="false"/><paragraph role="heading" id="par_idN12175" xml-lang="en-US" level="2" l10n="NEW">Icon Size</paragraph>
-<paragraph role="paragraph" id="par_idN12179" xml-lang="en-US" l10n="NEW"><ahelp hid="37927">Specifies whether the icons in a selected Navigation Bar should be small or large.</ahelp></paragraph>
-</section>
-<section id="Section82">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISIBLESIZE" id="bm_id5840937" localize="false"/><paragraph role="heading" id="par_idN12314" xml-lang="en-US" level="2" l10n="NEW">Visible size</paragraph>
-<paragraph role="paragraph" id="par_idN12318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the size of scrollbar thumb in "value units". A value of ("Scroll value max." minus "Scroll value min." ) / 2 would result in a thumb which occupies half of the background area.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN12375" xml-lang="en-US" l10n="NEW">If set to 0, then the thumb's width will equal its height.</paragraph>
-</section>
-<section id="Section83">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ORIENTATION" id="bm_id4076967" localize="false"/><paragraph role="heading" id="par_idN12332" xml-lang="en-US" level="2" l10n="NEW">Orientation</paragraph>
-<paragraph role="paragraph" id="par_idN12336" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the horizontal or vertical orientation for a scrollbar or spin button.</ahelp></paragraph>
-</section>
-</sort></body>
+<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159407" role="note" l10n="U" oldref="55">The <emph>Title</emph> property is only used for labeling a form element in the interface visible to the user. If you work with macros, note that at runtime, a control is always addressed through the <emph>Name</emph> property.</paragraph>
+      </section>
+      <section id="Section11">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_URL" id="bm_id3154726" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150293" role="heading" level="2" l10n="U"
+                    oldref="56">URL</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154358" role="paragraph" l10n="CHG" oldref="57"><ahelp hid="HID_PROP_TARGET_URL" visibility="hidden">Specifies the URL address that opens when you click an "Open document / web page" button.</ahelp>Enter the URL address for a Open document or web page button type in the <emph>URL</emph> box. The address opens when you click the button.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146074" role="paragraph" l10n="U" oldref="211">If you move the mouse over the button in User mode, the URL appears as the extended tip, provided that no other Help text was entered.</paragraph>
+      </section>
+      <section id="Section10">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRENCYSYMBOL" id="bm_id3145154" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147134" role="heading" level="2" l10n="U"
+                    oldref="149">Currency symbol</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145160" role="paragraph" l10n="U" oldref="150"><ahelp hid="HID_PROP_CURRENCYSYMBOL" visibility="hidden">You can enter a character or a string for the currency symbol.</ahelp>In a currency field, you can pre-define the currency symbol by entering the character or string in the <emph>Currency symbol</emph> property.</paragraph>
+      </section>
+      <section id="Section9">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDDEN_VALUE" id="bm_id3156100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144444" role="heading" level="2" l10n="U"
+                    oldref="154">Value</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152417" role="paragraph" l10n="U" oldref="155"><ahelp hid="HID_PROP_HIDDEN_VALUE" visibility="hidden">You can enter the data that is inherited by the hidden control.</ahelp>In a <link href="text/shared/02/01170600.xhp" name="hidden control">hidden control</link>, under <emph>Value</emph>, you can enter the data which is inherited by the hidden control. This data will be transferred when sending the form.</paragraph>
+      </section>
+      <section id="Section8">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ECHO_CHAR" id="bm_id3148694" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157315" role="heading" level="2" l10n="U"
+                    oldref="156">Password characters</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155323" role="paragraph" l10n="U" oldref="157"><ahelp hid="HID_PROP_ECHO_CHAR" visibility="hidden">If the text box is used as a password input, enter the ASCII-code of the display character. This character is displayed instead of the characters typed by the user for the password.</ahelp>If the user enters a password, you can determine the characters that will be displayed instead of the characters typed by the user. Under <emph>Password character</emph>, enter the ASCII code of the desired character. You can use the values from 0 to 255.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152493" role="tip" l10n="CHG" oldref="158">The characters and their ASCII codes can be seen in the <emph>Special Characters</emph> dialog (Insert - Special Character).</paragraph>
+      </section>
+      <section id="Section7">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LITERALMASK" id="bm_id3157547" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157884" role="heading" level="2" l10n="U"
+                    oldref="159">Literal mask</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157557" role="paragraph" l10n="U" oldref="160"><ahelp hid="HID_PROP_LITERALMASK" visibility="hidden">Defines the literal mask. The literal mask contains the initial values and is always visible after downloading a form.</ahelp>With masked fields you can specify a literal mask. A literal mask contains the initial values of a form, and is always visible after downloading a form. Using a character code for the Edit mask, you can determine the entries that the user can type into the masked field.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148513" role="note" l10n="U" oldref="161">The length of the literal mask should always correspond to the length of the edit mask. If this is not the case, the edit mask is either cut off or filled with blanks up to the length of the edit mask.</paragraph>
+      </section>
+      <section id="Section6">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FONT" id="bm_id3151032" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146762" role="heading" level="2" l10n="CHG"
+                    oldref="5">Font<comment>UFI: dba.features "Character set property renamed to Font"</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151037" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="HID_PROP_FONT" visibility="hidden">Select the font for the text that is in the control field.</ahelp>For control fields which have visible text or titles, select the display font that you want to use. To open the <link href="text/shared/01/05020100.xhp" name="Font"><emph>Font</emph></link> dialog, click the <emph>...</emph> button. The selected font is used in control fields names and to display data in table control fields.</paragraph>
+      </section>
+      <section id="Section5">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ROWHEIGHT" id="bm_id3160449" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156734" role="heading" level="2" l10n="U"
+                    oldref="162">Row height</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3160455" role="paragraph" l10n="CHG" oldref="163"><ahelp hid="HID_PROP_ROWHEIGHT" visibility="hidden">Specifies the row height of a table control field.</ahelp>In table controls, enter a value for the row height. If you want, you can enter a value followed by valid measurement unit, for example, 2 cm.</paragraph>
+      </section>
+      <section id="Section77">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEEND_FORMAT" id="bm_id396130" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11FB6" role="heading" level="2" l10n="NEW">Text lines end with</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN11FBA" role="paragraph" l10n="NEW"><ahelp hid=".">For text fields, select the line end code to be used when writing text into a database column.</ahelp><comment>UFI: spec dba-features: "form text fields: New property Text lines end with"</comment></paragraph>
+      </section>
+      <section id="Section4">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEFORMAT" id="bm_id3145181" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3160477" role="heading" level="2" l10n="U"
+                    oldref="168">Time format</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145187" role="paragraph" l10n="U" oldref="169"><ahelp hid="HID_PROP_TIMEFORMAT" visibility="hidden">You can define the desired format for the time display.</ahelp>You can define the desired format for the time display.</paragraph>
+      </section>
+      <section id="Section3">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TAG" id="bm_id3158205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158195" role="heading" level="2" l10n="U"
+                    oldref="170">Help text</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146823" role="paragraph" l10n="U" oldref="171"><ahelp hid="HID_PROP_TAG" visibility="hidden">Specifies additional information or a descriptive text for the control field.</ahelp>In each control field you can specify additional information or a descriptive text for the control field. This property helps the programmer to save additional information that can be used in the program code. This field can be used, for example, for variables or other evaluation parameters.</paragraph>
+      </section>
+      <section id="Section2">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FORMATKEY" id="bm_id3157839" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157828" role="heading" level="2" l10n="U"
+                    oldref="232">Formatting</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146843" role="paragraph" l10n="U" oldref="233"><ahelp hid="HID_PROP_FORMATKEY">Specifies the format code for the control. Click the <emph>...</emph> button to select the format code.</ahelp></paragraph>
+      </section>
+      <section id="Section69">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCALEIMAGE" id="bm_id1145054" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN122C4" role="heading" level="2" l10n="NEW">Scale</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN122C8" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_SCALEIMAGE">Resizes the image to fit the size of the control.</ahelp></paragraph>
+      </section>
+      <section id="Section23">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_RECORDACTIONS" id="bm_id7442243" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1209F" role="heading" level="2" l10n="NEW">Acting on a record</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN120B1" role="paragraph" l10n="NEW"><ahelp hid="37930">Specifies to show or hide the action items in a selected Navigation Bar control.</ahelp> Action items are the following: Save record, Undo, New record, Delete record, Refresh.</paragraph>
+      </section>
+      <section id="Section70">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_POSITION" id="bm_id9985961" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN120BE" role="heading" level="2" l10n="NEW">Positioning</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN120D9" role="paragraph" l10n="NEW"><ahelp hid="37928">Specifies to show or hide the positioning items in a selected Navigation Bar control.</ahelp> Positioning items are the following: Record label, Record position, Record count label, Record count.</paragraph>
+      </section>
+      <section id="Section74">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_NAVIGATION" id="bm_id1122775" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN120D7" role="heading" level="2" l10n="NEW">Navigation</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN120DB" role="paragraph" l10n="NEW"><ahelp hid="37929">Specifies to show or hide the navigation items in a selected Navigation Bar control.</ahelp> Navigation items are the following: First record, Previous record, Next record, Last record.</paragraph>
+      </section>
+      <section id="Section75">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_FILTERSORT" id="bm_id7137363" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12156" role="heading" level="2" l10n="NEW">Filtering / Sorting</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1215A" role="paragraph" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Remove filter/sort.</paragraph>
+      </section>
+      <section id="Section76">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ICONSIZE" id="bm_id7815790" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12175" role="heading" level="2" l10n="NEW">Icon Size</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN12179" role="paragraph" l10n="NEW"><ahelp hid="37927">Specifies whether the icons in a selected Navigation Bar should be small or large.</ahelp></paragraph>
+      </section>
+      <section id="Section73">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLE_VISIBLE" id="bm_id7815890" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200920593864" role="heading" level="2" l10n="NEW">Visible</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200920593851" role="paragraph" l10n="NEW"><ahelp hid=".">Defines whether the control will be visible in live mode. In design mode, the control is always visible.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921154683" role="paragraph" l10n="NEW">Note that if this property is set to "Yes" (the default), this does not necessarily mean the control will really appear on the screen. Additional constraints are applied when calculating a control's effective visibility. For instance, a control placed in a hidden section in Writer will never be visible at all, until at least the section itself becomes visible.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921154691" role="paragraph" l10n="NEW">If the property is set to "No", then the control will always be hidden in live mode.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0409200921154614" role="paragraph" l10n="NEW">Older OpenOffice.org versions up to 3.1 will silently ignore this property when reading documents which make use of it.</paragraph>
+      </section>
+      <section id="Section82">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISIBLESIZE" id="bm_id5840937" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12314" role="heading" level="2" l10n="NEW">Visible size</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN12318" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the size of scrollbar thumb in "value units". A value of ("Scroll value max." minus "Scroll value min." ) / 2 would result in a thumb which occupies half of the background area.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN12375" role="paragraph" l10n="NEW">If set to 0, then the thumb's width will equal its height.</paragraph>
+      </section>
+      <section id="Section83">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ORIENTATION" id="bm_id4076967" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12332" role="heading" level="2" l10n="NEW">Orientation</paragraph>
+         <paragraph xml-lang="en-US" id="par_idN12336" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the horizontal or vertical orientation for a scrollbar or spin button.</ahelp></paragraph>
+      </section>
+</sort>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170102.xhp b/helpcontent2/source/text/shared/02/01170102.xhp
index 4343301582..5fec40802b 100644
--- a/helpcontent2/source/text/shared/02/01170102.xhp
+++ b/helpcontent2/source/text/shared/02/01170102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170102.xhp,v $
- * $Revision: 1.15.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170103.xhp b/helpcontent2/source/text/shared/02/01170103.xhp
index c42ce96d80..93d7b59b45 100755..100644
--- a/helpcontent2/source/text/shared/02/01170103.xhp
+++ b/helpcontent2/source/text/shared/02/01170103.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01170103.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,59 +31,87 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Events</title>
-<filename>/text/shared/02/01170103.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="ereignisse">
+      <topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Events</title>
+         <filename>/text/shared/02/01170103.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="ereignisse">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148643"><bookmark_value>controls; events</bookmark_value>
-<bookmark_value>events; controls</bookmark_value>
-<bookmark_value>macros; assigning to events in forms</bookmark_value>
+         <bookmark_value>events; controls</bookmark_value>
+         <bookmark_value>macros; assigning to events in forms</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3148643" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170103.xhp" name="Events">Events</link></paragraph>
-<paragraph role="paragraph" id="par_id3152350" xml-lang="en-US" l10n="U" oldref="2">On the<emph> Events </emph>tab page you can link macros to events that occur in a form's control fields.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="40">When the event occurs, the linked macro will be called. To assign a macro to an event, press the <emph>...</emph> button. An <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05060700.xhp" name="Assign Macro">Assign Macro</link>
+<paragraph xml-lang="en-US" id="hd_id3148643" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170103.xhp" name="Events">Events</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152350" role="paragraph" l10n="U" oldref="2">On the<emph> Events </emph>tab page you can link macros to events that occur in a form's control fields.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="40">When the event occurs, the linked macro will be called. To assign a macro to an event, press the <emph>...</emph> button. An <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05060700.xhp" name="Assign Macro">Assign Macro</link>
 </caseinline><defaultinline>dialog</defaultinline></switchinline> opens.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00040501.xhp#controleigenschaftenereignisse"/>
-</section>
-<paragraph role="paragraph" id="par_id3149732" xml-lang="en-US" l10n="U" oldref="3">Depending on the control, different events are available. Only the available events for the selected control and context are listed on the <emph>Events</emph> tab page. The following events are defined:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEACTIONPERFORMED" id="bm_id3153252" localize="false"/><paragraph role="heading" id="hd_id3149191" xml-lang="en-US" level="2" l10n="U" oldref="12">Before commencing</paragraph>
-<paragraph role="paragraph" id="par_id3153717" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_EVT_APPROVEACTIONPERFORMED">This event takes place before an action is triggered by clicking the control.</ahelp> For example, clicking a "Submit" button initiates a send action; however, the actual "send" process is started only when the <emph>When initiating</emph> event occurs. The <emph>Before commencing</emph> event allows you to kill the process. If the linked method sends back FALSE, <emph>When initiating</emph> will not be executed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_ACTIONPERFORMED" id="bm_id3155923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="36">When initiating</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_EVT_ACTIONPERFORMED">The<emph> When initiating </emph>event occurs when an action is started.</ahelp> For example, if you have a "Submit" button in your form, the send process represents the action to be initiated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_CHANGED" id="bm_id3154924" localize="false"/><paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="41">Changed</paragraph>
-<paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="HID_EVT_CHANGED">The<emph> Changed </emph>event takes place when the control loses the focus and the content of the control has changed since it lost the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_TEXTCHANGED" id="bm_id3147084" localize="false"/><paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="10">Text modified</paragraph>
-<paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_EVT_TEXTCHANGED">The<emph> Text modified </emph>event takes place if you enter or modify a text in an input field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_ITEMSTATECHANGED" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2" l10n="U" oldref="8">Item status changed</paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_EVT_ITEMSTATECHANGED" visibility="hidden">The<emph> Item status changed </emph>event takes place if the status of the control field has changed.</ahelp>The<emph> Item status changed</emph> event takes place if he status of the control field has changed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSGAINED" id="bm_id3158407" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="16">When receiving focus</paragraph>
-<paragraph role="paragraph" id="par_id3154218" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_EVT_FOCUSGAINED">The<emph> When receiving focus </emph>event takes place if a control field receives the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSLOST" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="2" l10n="U" oldref="18">When losing focus</paragraph>
-<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_EVT_FOCUSLOST">The<emph> When losing focus </emph>event takes place if a control field looses the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYTYPED" id="bm_id3145787" localize="false"/><paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="2" l10n="U" oldref="20">Key pressed</paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_EVT_KEYTYPED">The <emph>Key pressed </emph>event occurs when the user presses any key while the control has the focus.</ahelp> This event may be linked to a macro for checking entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYUP" id="bm_id3145264" localize="false"/><paragraph role="heading" id="hd_id3154127" xml-lang="en-US" level="2" l10n="U" oldref="43">Key released</paragraph>
-<paragraph role="paragraph" id="par_id3154150" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_EVT_KEYUP">The<emph> Key released </emph>event occurs when the user releases any key while the control has the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEENTERED" id="bm_id3155368" localize="false"/><paragraph role="heading" id="hd_id3154921" xml-lang="en-US" level="2" l10n="U" oldref="26">Mouse inside</paragraph>
-<paragraph role="paragraph" id="par_id3148618" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_EVT_MOUSEENTERED">The<emph> Mouse inside </emph>event takes place if the mouse is inside the control field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEDRAGGED" id="bm_id3159180" localize="false"/><paragraph role="heading" id="hd_id3148576" xml-lang="en-US" level="2" l10n="U" oldref="30">Mouse moved while key pressed</paragraph>
-<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_EVT_MOUSEDRAGGED">The<emph> Mouse moved while key pressed </emph>event takes place when the mouse is dragged while a key is pressed.</ahelp> An example is when, during drag-and-drop, an additional key determines the mode (move or copy).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEMOVED" id="bm_id3147443" localize="false"/><paragraph role="heading" id="hd_id3149262" xml-lang="en-US" level="2" l10n="U" oldref="32">Mouse moved</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_EVT_MOUSEMOVED">The<emph> Mouse moved </emph>event occurs if the mouse moves over the control.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEPRESSED" id="bm_id3145366" localize="false"/><paragraph role="heading" id="hd_id3159197" xml-lang="en-US" level="2" l10n="U" oldref="22">Mouse button pressed</paragraph>
-<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_EVT_MOUSEPRESSED">The<emph> Mouse button pressed </emph>event occurs if the mouse button is pressed while the mouse pointer is on the control.</ahelp></paragraph>
-<paragraph role="note" id="par_idN108BD" xml-lang="en-US" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control. If you are using this event by a program macro, you find more information in the "StarOffice 8 Programming Guide for BASIC".<comment>UFI: see #i40558#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSERELEASED" id="bm_id3144766" localize="false"/><paragraph role="heading" id="hd_id3148880" xml-lang="en-US" level="2" l10n="U" oldref="24">Mouse button released</paragraph>
-<paragraph role="paragraph" id="par_id3150659" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_EVT_MOUSERELEASED">The<emph> Mouse button released </emph>event occurs if the mouse button is released while the mouse pointer is on the control.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEEXITED" id="bm_id3150094" localize="false"/><paragraph role="heading" id="hd_id3156286" xml-lang="en-US" level="2" l10n="U" oldref="28">Mouse outside</paragraph>
-<paragraph role="paragraph" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_EVT_MOUSEEXITED">The<emph> Mouse outside </emph>event takes place when the mouse is outside the control field.</ahelp></paragraph>
-<embed href="text/shared/02/01170202.xhp#reset_update"/>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040501.xhp#controleigenschaftenereignisse"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149732" role="paragraph" l10n="U" oldref="3">Depending on the control, different events are available. Only the available events for the selected control and context are listed on the <emph>Events</emph> tab page. The following events are defined:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEACTIONPERFORMED" id="bm_id3153252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149191" role="heading" level="2" l10n="CHG"
+                 oldref="12">Approve action<comment>renamed from Before commencing, issue 97356</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153717" role="paragraph" l10n="CHG" oldref="13"><ahelp hid="HID_EVT_APPROVEACTIONPERFORMED">This event takes place before an action is triggered by clicking the control.</ahelp> For example, clicking a "Submit" button initiates a send action; however, the actual "send" process is started only when the <emph>When initiating</emph> event occurs. The <emph>Approve action</emph> event allows you to kill the process. If the linked method sends back FALSE, <emph>When initiating</emph> will not be executed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_ACTIONPERFORMED" id="bm_id3155923" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156024" role="heading" level="2" l10n="CHG"
+                 oldref="36">Execute action<comment>renamed from When initiated, issue 97356</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145609" role="paragraph" l10n="CHG" oldref="37"><ahelp hid="HID_EVT_ACTIONPERFORMED">The <emph>Execute action</emph> event occurs when an action is started.</ahelp> For example, if you have a "Submit" button in your form, the send process represents the action to be initiated.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_CHANGED" id="bm_id3154924" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156343" role="heading" level="2" l10n="U"
+                 oldref="41">Changed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148755" role="paragraph" l10n="U" oldref="42"><ahelp hid="HID_EVT_CHANGED">The<emph> Changed </emph>event takes place when the control loses the focus and the content of the control has changed since it lost the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_TEXTCHANGED" id="bm_id3147084" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="U"
+                 oldref="10">Text modified</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150495" role="paragraph" l10n="U" oldref="11"><ahelp hid="HID_EVT_TEXTCHANGED">The<emph> Text modified </emph>event takes place if you enter or modify a text in an input field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_ITEMSTATECHANGED" id="bm_id3154910" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2" l10n="U" oldref="8">Item status changed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150870" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_EVT_ITEMSTATECHANGED" visibility="hidden">The<emph> Item status changed </emph>event takes place if the status of the control field has changed.</ahelp>The<emph> Item status changed</emph> event takes place if he status of the control field has changed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSGAINED" id="bm_id3158407" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151176" role="heading" level="2" l10n="U"
+                 oldref="16">When receiving focus</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154218" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_EVT_FOCUSGAINED">The<emph> When receiving focus </emph>event takes place if a control field receives the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSLOST" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150447" role="heading" level="2" l10n="U"
+                 oldref="18">When losing focus</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_EVT_FOCUSLOST">The<emph> When losing focus </emph>event takes place if a control field looses the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYTYPED" id="bm_id3145787" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="2" l10n="U"
+                 oldref="20">Key pressed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152940" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_EVT_KEYTYPED">The <emph>Key pressed </emph>event occurs when the user presses any key while the control has the focus.</ahelp> This event may be linked to a macro for checking entries.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYUP" id="bm_id3145264" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154127" role="heading" level="2" l10n="U"
+                 oldref="43">Key released</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U" oldref="44"><ahelp hid="HID_EVT_KEYUP">The<emph> Key released </emph>event occurs when the user releases any key while the control has the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEENTERED" id="bm_id3155368" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154921" role="heading" level="2" l10n="U"
+                 oldref="26">Mouse inside</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148618" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_EVT_MOUSEENTERED">The<emph> Mouse inside </emph>event takes place if the mouse is inside the control field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEDRAGGED" id="bm_id3159180" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148576" role="heading" level="2" l10n="U"
+                 oldref="30">Mouse moved while key pressed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155411" role="paragraph" l10n="U" oldref="31"><ahelp hid="HID_EVT_MOUSEDRAGGED">The<emph> Mouse moved while key pressed </emph>event takes place when the mouse is dragged while a key is pressed.</ahelp> An example is when, during drag-and-drop, an additional key determines the mode (move or copy).</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEMOVED" id="bm_id3147443" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149262" role="heading" level="2" l10n="U"
+                 oldref="32">Mouse moved</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="33"><ahelp hid="HID_EVT_MOUSEMOVED">The<emph> Mouse moved </emph>event occurs if the mouse moves over the control.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEPRESSED" id="bm_id3145366" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159197" role="heading" level="2" l10n="U"
+                 oldref="22">Mouse button pressed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_EVT_MOUSEPRESSED">The<emph> Mouse button pressed </emph>event occurs if the mouse button is pressed while the mouse pointer is on the control.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108BD" role="note" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSERELEASED" id="bm_id3144766" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148880" role="heading" level="2" l10n="U"
+                 oldref="24">Mouse button released</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150659" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_EVT_MOUSERELEASED">The<emph> Mouse button released </emph>event occurs if the mouse button is released while the mouse pointer is on the control.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEEXITED" id="bm_id3150094" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156286" role="heading" level="2" l10n="U"
+                 oldref="28">Mouse outside</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149582" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_EVT_MOUSEEXITED">The<emph> Mouse outside </emph>event takes place when the mouse is outside the control field.</ahelp></paragraph>
+      <embed href="text/shared/02/01170202.xhp#reset_update"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170200.xhp b/helpcontent2/source/text/shared/02/01170200.xhp
index 6c8f560e4c..3b7be0119b 100644
--- a/helpcontent2/source/text/shared/02/01170200.xhp
+++ b/helpcontent2/source/text/shared/02/01170200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170201.xhp b/helpcontent2/source/text/shared/02/01170201.xhp
index 04c549430a..c596d9f2a0 100755
--- a/helpcontent2/source/text/shared/02/01170201.xhp
+++ b/helpcontent2/source/text/shared/02/01170201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170201.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170202.xhp b/helpcontent2/source/text/shared/02/01170202.xhp
index fc0441e815..55bfee19bb 100755
--- a/helpcontent2/source/text/shared/02/01170202.xhp
+++ b/helpcontent2/source/text/shared/02/01170202.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170202.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,143 +29,155 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0201170202xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Events</title>
-<filename>/text/shared/02/01170202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T16:48:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="ereignisse">
+      <topic id="textshared0201170202xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Events</title>
+         <filename>/text/shared/02/01170202.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="ereignisse">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>forms; events</bookmark_value>
-<bookmark_value>events;in forms</bookmark_value>
+         <bookmark_value>events;in forms</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170202.xhp" name="Events">Events</link></paragraph>
-<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="2">The<emph> Events </emph>tab page, allows you to assign a macro to certain events which occur in a form.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040501.xhp#formulareigenschaftenereignisse"/>
-</section>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="3">To link an event with a macro, first write a macro that contains all the commands to be executed when the event happens. Then assign this macro to the respective event by clicking the <emph>... </emph>button beside the corresponding event. The<emph> Assign Macro </emph>dialog opens, where you can select the macro.</paragraph>
-<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="29">The following actions can be configured individually, meaning that you can use your own dialogs to depict an action:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="30">Displaying an error message,</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="31">Confirming a delete process (for data records),</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="32">Querying parameters,</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155261" xml-lang="en-US" l10n="U" oldref="33">Checking input when saving a data record.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="34">For example, you can issue a "confirm deletion" request such as "Really delete customer xyz?" when deleting a data record.</paragraph>
-<paragraph role="paragraph" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="4">The following lists and describes all events in a form that can be linked to a macro:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170202.xhp" name="Events">Events</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147043" role="paragraph" l10n="U" oldref="2">The<emph> Events </emph>tab page, allows you to assign a macro to certain events which occur in a form.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040501.xhp#formulareigenschaftenereignisse"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="3">To link an event with a macro, first write a macro that contains all the commands to be executed when the event happens. Then assign this macro to the respective event by clicking the <emph>... </emph>button beside the corresponding event. The<emph> Assign Macro </emph>dialog opens, where you can select the macro.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149182" role="paragraph" l10n="U" oldref="29">The following actions can be configured individually, meaning that you can use your own dialogs to depict an action:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166460" role="listitem" l10n="U" oldref="30">Displaying an error message,</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152996" role="listitem" l10n="U" oldref="31">Confirming a delete process (for data records),</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153541" role="listitem" l10n="U" oldref="32">Querying parameters,</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155261" role="listitem" l10n="U" oldref="33">Checking input when saving a data record.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153127" role="paragraph" l10n="U" oldref="34">For example, you can issue a "confirm deletion" request such as "Really delete customer xyz?" when deleting a data record.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0409200920562590" role="note" l10n="NEW">The events that are shown in the Events dialog cannot be edited directly. You can delete an event from the list by pressing the Del key.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150986" role="paragraph" l10n="U" oldref="4">The following lists and describes all events in a form that can be linked to a macro:</paragraph>
 <sort order="asc">
-<section id="reset_update"><comment>UFI: removed help id</comment>
-<paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="2" l10n="U" oldref="17">Before update</paragraph>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid=".">The Before update event occurs before the control content changed by the user is written into the data source.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
+<section id="reset_update">
+         <paragraph xml-lang="en-US" id="hd_id3147559" role="heading" level="2" l10n="U"
+                    oldref="17">Before update</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="56"><ahelp hid=".">The Before update event occurs before the control content changed by the user is written into the data source.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_AFTERUPDATE" id="bm_id3154073" localize="false"/>
-<paragraph role="heading" id="hd_id3153779" xml-lang="en-US" level="2" l10n="U" oldref="19">After update</paragraph>
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_EVT_AFTERUPDATE">The After update event occurs after the control content changed by the user has been written into the data source.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153779" role="heading" level="2" l10n="U"
+                    oldref="19">After update</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_EVT_AFTERUPDATE">The After update event occurs after the control content changed by the user has been written into the data source.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVERESETTED" id="bm_id3154851" localize="false"/>
-<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="2" l10n="U" oldref="36">Prior to reset</paragraph>
-<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_EVT_APPROVERESETTED">The<emph> Prior to reset </emph>event occurs before a form is reset.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
-<paragraph role="paragraph" id="par_id3149236" xml-lang="en-US" l10n="U" oldref="52">A form is reset if one of the following conditions is met:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="53">The user presses an (HTML) button that is defined as a reset button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="54">A new and empty record is created in a form that is linked to a data source. For example, in the last record, the <emph>Next Record</emph> button may be pressed.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="2" l10n="U"
+                    oldref="36">Prior to reset</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="U" oldref="51"><ahelp hid="HID_EVT_APPROVERESETTED">The<emph> Prior to reset </emph>event occurs before a form is reset.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149236" role="paragraph" l10n="U" oldref="52">A form is reset if one of the following conditions is met:</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="U" oldref="53">The user presses an (HTML) button that is defined as a reset button.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153666" role="listitem" l10n="U" oldref="54">A new and empty record is created in a form that is linked to a data source. For example, in the last record, the <emph>Next Record</emph> button may be pressed.</paragraph>
+            </listitem>
+         </list>
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_RESETTED" id="bm_id3152473" localize="false"/>
-<paragraph role="heading" id="hd_id3156119" xml-lang="en-US" level="2" l10n="U" oldref="37">After resetting</paragraph>
-<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_EVT_RESETTED">The<emph> After resetting </emph>event occurs after a form has been reset.</ahelp></paragraph>
-</section>
-<section id="Section13">
+<paragraph xml-lang="en-US" id="hd_id3156119" role="heading" level="2" l10n="U"
+                    oldref="37">After resetting</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_EVT_RESETTED">The<emph> After resetting </emph>event occurs after a form has been reset.</ahelp></paragraph>
+      </section>
+      <section id="Section13">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_SUBMITTED" id="bm_id3147084" localize="false"/>
-<paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="2" l10n="U" oldref="27">Before submitting</paragraph>
-<paragraph role="paragraph" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_EVT_SUBMITTED">The<emph> Before submitting </emph>event occurs before the form data is sent.</ahelp></paragraph>
-</section>
-<section id="Section12">
+<paragraph xml-lang="en-US" id="hd_id3150870" role="heading" level="2" l10n="U"
+                    oldref="27">Before submitting</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159152" role="paragraph" l10n="U" oldref="28"><ahelp hid="HID_EVT_SUBMITTED">The<emph> Before submitting </emph>event occurs before the form data is sent.</ahelp></paragraph>
+      </section>
+      <section id="Section12">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_LOADED" id="bm_id3151383" localize="false"/>
-<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="2" l10n="U" oldref="5">When loading</paragraph>
-<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_EVT_LOADED">The<emph> When loading </emph>event occurs directly after the form has been loaded.</ahelp></paragraph>
-</section>
-<section id="Section11">
+<paragraph xml-lang="en-US" id="hd_id3149167" role="heading" level="2" l10n="U" oldref="5">When loading</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156423" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_EVT_LOADED">The<emph> When loading </emph>event occurs directly after the form has been loaded.</ahelp></paragraph>
+      </section>
+      <section id="Section11">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_RELOADING" id="bm_id3157320" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="38">Before reloading</paragraph>
-<paragraph role="paragraph" id="par_id3154218" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_EVT_RELOADING">The<emph> Before reloading </emph>event occurs before the form is reloaded.</ahelp> The data content has not yet been refreshed.</paragraph>
-</section>
-<section id="Section10">
+<paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2" l10n="U"
+                    oldref="38">Before reloading</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154218" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_EVT_RELOADING">The<emph> Before reloading </emph>event occurs before the form is reloaded.</ahelp> The data content has not yet been refreshed.</paragraph>
+      </section>
+      <section id="Section10">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_RELOADED" id="bm_id3154946" localize="false"/>
-<paragraph role="heading" id="hd_id3155102" xml-lang="en-US" level="2" l10n="U" oldref="40">When reloading</paragraph>
-<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="HID_EVT_RELOADED">The<emph> When reloading </emph>event occurs directly after the form has been reloaded.</ahelp> The data content has already been refreshed.</paragraph>
-</section>
-<section id="Section9">
+<paragraph xml-lang="en-US" id="hd_id3155102" role="heading" level="2" l10n="U"
+                    oldref="40">When reloading</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="41"><ahelp hid="HID_EVT_RELOADED">The<emph> When reloading </emph>event occurs directly after the form has been reloaded.</ahelp> The data content has already been refreshed.</paragraph>
+      </section>
+      <section id="Section9">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_UNLOADING" id="bm_id3151116" localize="false"/>
-<paragraph role="heading" id="hd_id3152792" xml-lang="en-US" level="2" l10n="U" oldref="42">Before unloading</paragraph>
-<paragraph role="paragraph" id="par_id3152598" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_EVT_UNLOADING">The<emph> Before unloading </emph>event occurs before the form is unloaded; that is, separated from its data source.</ahelp></paragraph>
-</section>
-<section id="Section8">
+<paragraph xml-lang="en-US" id="hd_id3152792" role="heading" level="2" l10n="U"
+                    oldref="42">Before unloading</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152598" role="paragraph" l10n="U" oldref="43"><ahelp hid="HID_EVT_UNLOADING">The<emph> Before unloading </emph>event occurs before the form is unloaded; that is, separated from its data source.</ahelp></paragraph>
+      </section>
+      <section id="Section8">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_UNLOADED" id="bm_id3152938" localize="false"/>
-<paragraph role="heading" id="hd_id3154145" xml-lang="en-US" level="2" l10n="U" oldref="44">When unloading</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_EVT_UNLOADED">The<emph> When unloading </emph>event occurs directly after the form has been unloaded; that is, separated from its data source.</ahelp></paragraph>
-</section>
-<section id="Section7">
+<paragraph xml-lang="en-US" id="hd_id3154145" role="heading" level="2" l10n="U"
+                    oldref="44">When unloading</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_EVT_UNLOADED">The<emph> When unloading </emph>event occurs directly after the form has been unloaded; that is, separated from its data source.</ahelp></paragraph>
+      </section>
+      <section id="Section7">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_CONFIRMDELETE" id="bm_id3154127" localize="false"/>
-<paragraph role="heading" id="hd_id3147426" xml-lang="en-US" level="2" l10n="U" oldref="25">Confirm deletion</paragraph>
-<paragraph role="paragraph" id="par_id3154988" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_EVT_CONFIRMDELETE">The<emph> Confirm deletion </emph>event occurs as soon as data has been deleted from the form.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
-</section>
-<section id="Section6">
+<paragraph xml-lang="en-US" id="hd_id3147426" role="heading" level="2" l10n="U"
+                    oldref="25">Confirm deletion</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154988" role="paragraph" l10n="U" oldref="26"><ahelp hid="HID_EVT_CONFIRMDELETE">The<emph> Confirm deletion </emph>event occurs as soon as data has been deleted from the form.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
+      </section>
+      <section id="Section6">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEROWCHANGE" id="bm_id3151351" localize="false"/>
-<paragraph role="heading" id="hd_id3149481" xml-lang="en-US" level="2" l10n="U" oldref="46">Before record action</paragraph>
-<paragraph role="paragraph" id="par_id3156007" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_EVT_APPROVEROWCHANGE">The<emph> Before record action </emph>event occurs before the current record is changed.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
-</section>
-<section id="Section5">
+<paragraph xml-lang="en-US" id="hd_id3149481" role="heading" level="2" l10n="U"
+                    oldref="46">Before record action</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156007" role="paragraph" l10n="U" oldref="58"><ahelp hid="HID_EVT_APPROVEROWCHANGE">The<emph> Before record action </emph>event occurs before the current record is changed.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
+      </section>
+      <section id="Section5">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_ROWCHANGE" id="bm_id3150685" localize="false"/>
-<paragraph role="heading" id="hd_id3145749" xml-lang="en-US" level="2" l10n="U" oldref="47">After record action</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_EVT_ROWCHANGE">The<emph> After record action </emph>event occurs directly after the current record has been changed.</ahelp></paragraph>
-</section>
-<section id="Section4">
+<paragraph xml-lang="en-US" id="hd_id3145749" role="heading" level="2" l10n="U"
+                    oldref="47">After record action</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="59"><ahelp hid="HID_EVT_ROWCHANGE">The<emph> After record action </emph>event occurs directly after the current record has been changed.</ahelp></paragraph>
+      </section>
+      <section id="Section4">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_POSITIONING" id="bm_id3155413" localize="false"/>
-<paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="2" l10n="U" oldref="48">Before record change</paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_EVT_POSITIONING">The<emph> Before record change </emph>event occurs before the current record pointer is changed.</ahelp>. For example, the linked macro can prevent this action by returning "FALSE".</paragraph>
-</section>
-<section id="Section3">
+<paragraph xml-lang="en-US" id="hd_id3154012" role="heading" level="2" l10n="U"
+                    oldref="48">Before record change</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="60"><ahelp hid="HID_EVT_POSITIONING">The<emph> Before record change </emph>event occurs before the current record pointer is changed.</ahelp>. For example, the linked macro can prevent this action by returning "FALSE".</paragraph>
+      </section>
+      <section id="Section3">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_POSITIONED" id="bm_id3150420" localize="false"/>
-<paragraph role="heading" id="hd_id3157975" xml-lang="en-US" level="2" l10n="U" oldref="49">After record change</paragraph>
-<paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_EVT_POSITIONED">The<emph> After record change </emph>event occurs directly after the current record pointer has been changed.</ahelp>.</paragraph>
-</section>
-<section id="Section2">
+<paragraph xml-lang="en-US" id="hd_id3157975" role="heading" level="2" l10n="U"
+                    oldref="49">After record change</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154098" role="paragraph" l10n="U" oldref="61"><ahelp hid="HID_EVT_POSITIONED">The<emph> After record change </emph>event occurs directly after the current record pointer has been changed.</ahelp>.</paragraph>
+      </section>
+      <section id="Section2">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEPARAMETER" id="bm_id3149298" localize="false"/>
-<paragraph role="heading" id="hd_id3151076" xml-lang="en-US" level="2" l10n="U" oldref="50">Fill parameters</paragraph>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_EVT_APPROVEPARAMETER">The<emph> Fill parameters </emph>event occurs when the form to be loaded has parameters that must be filled out.</ahelp> For example, the data source of the form can be the following SQL command:</paragraph>
-<paragraph role="paragraph" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="63">SELECT * FROM address WHERE name=:name</paragraph>
-<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="64">Here :name is a parameter that must be filled out when loading. The parameter is automatically filled out from the parent form if possible. If the parameter cannot be filled out, this event is called and a linked macro can fill out the parameter.</paragraph>
-</section>
-<section id="Section1">
+<paragraph xml-lang="en-US" id="hd_id3151076" role="heading" level="2" l10n="U"
+                    oldref="50">Fill parameters</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147396" role="paragraph" l10n="U" oldref="62"><ahelp hid="HID_EVT_APPROVEPARAMETER">The<emph> Fill parameters </emph>event occurs when the form to be loaded has parameters that must be filled out.</ahelp> For example, the data source of the form can be the following SQL command:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148773" role="paragraph" l10n="U" oldref="63">SELECT * FROM address WHERE name=:name</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149581" role="paragraph" l10n="U" oldref="64">Here :name is a parameter that must be filled out when loading. The parameter is automatically filled out from the parent form if possible. If the parameter cannot be filled out, this event is called and a linked macro can fill out the parameter.</paragraph>
+      </section>
+      <section id="Section1">
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_ERROROCCURED" id="bm_id3148387" localize="false"/>
-<paragraph role="heading" id="hd_id3146926" xml-lang="en-US" level="2" l10n="U" oldref="9">Error occurred</paragraph>
-<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3146926" role="heading" level="2" l10n="U" oldref="9">Error occurred</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
+      </section>
 </sort>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170203.xhp b/helpcontent2/source/text/shared/02/01170203.xhp
index f7d90b0d5e..c3340b3f86 100644
--- a/helpcontent2/source/text/shared/02/01170203.xhp
+++ b/helpcontent2/source/text/shared/02/01170203.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170203.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,7 +73,7 @@
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="106"><ahelp hid="HID_PROP_ESCAPE_PROCESSING">Specifies whether the SQL statement is to be analyzed by %PRODUCTNAME.</ahelp> If set to Yes, you can click the <emph>...</emph> button next to the <emph>Content</emph> list box. This will open a window where you can graphically create a database query. When you close that window, the SQL statement for the created query will be inserted in the <emph>Content</emph> list box.</paragraph>
 </section>
 <section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTER_CRITERIA" id="bm_id3149810" localize="false"/><paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="81">Filter</paragraph>
+<!-- removed HID HID_PROP_FILTER_CRITERIA --><paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="81">Filter</paragraph>
 <paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="CHG" oldref="82"><ahelp hid="HID_PROP_FILTER_CRITERIA">Enter the required conditions for filtering the data in the form. The filter specifications follow SQL rules without using the WHERE clause.</ahelp> For example, if you want to display all records with the "Mike" forename, type into the data field: Forename = 'Mike'. You can also combine conditions: Forename = 'Mike' OR Forename = 'Peter'. All records matching either of these two conditions will be displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="CHG" oldref="83">The filter function is available in user mode through the <link href="text/shared/02/12030000.xhp" name="AutoFilter"><emph>AutoFilter</emph></link> and <link href="text/shared/02/12090000.xhp" name="Default Filter"><emph>Default Filter</emph></link> icons on the <link href="text/shared/main0213.xhp" name="Form Navigation Bar"><emph>Form Navigation</emph> Bar</link>.</paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/02/01170300.xhp b/helpcontent2/source/text/shared/02/01170300.xhp
index bad329e00b..8411c40e2f 100644
--- a/helpcontent2/source/text/shared/02/01170300.xhp
+++ b/helpcontent2/source/text/shared/02/01170300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170300.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,14 +54,14 @@
 <paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="CHG" oldref="13">A radio button inside a group can only be accessed by the Tab key when one of the radio buttons is set to "selected". If you have designed a group of radio buttons where no button is set to "selected", then the user will not be able to access the group or any of the radio buttons by keyboard.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TABORDER_CONTROLS" id="bm_id3153114" localize="false"/><paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="4">Controls</paragraph>
 <paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_TABORDER_CONTROLS">Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom.</ahelp> Select a control from the <emph>Controls </emph>list to assign the desired position in the tab order.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP" id="bm_id3147399" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_UP" id="bm_id5646229" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="6">Move Up</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_UP --><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="6">Move Up</paragraph>
 <paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP">Click the<emph> Move Up</emph> button to shift the selected control one position higher in the tab order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN" id="bm_id3149389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_DOWN" id="bm_id4586016" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="8">Move Down</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_DOWN --><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="8">Move Down</paragraph>
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN">Click the<emph> Move Down</emph> button to shift the selected control one position lower in the tab order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER" id="bm_id3153312" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_AUTO_ORDER" id="bm_id6983245" localize="false"/><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="U" oldref="10">Automatic Sort</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_AUTO_ORDER --><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="U" oldref="10">Automatic Sort</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER">Click the<emph> Automatic Sort</emph> button to automatically sort the controls according to their position in the document.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170400.xhp b/helpcontent2/source/text/shared/02/01170400.xhp
index 7f5d364371..17b94ac63a 100644
--- a/helpcontent2/source/text/shared/02/01170400.xhp
+++ b/helpcontent2/source/text/shared/02/01170400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170500.xhp b/helpcontent2/source/text/shared/02/01170500.xhp
index a038eca54c..4f66c0fa85 100644
--- a/helpcontent2/source/text/shared/02/01170500.xhp
+++ b/helpcontent2/source/text/shared/02/01170500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170600.xhp b/helpcontent2/source/text/shared/02/01170600.xhp
index 1ac56f776a..89ba2de7d4 100644
--- a/helpcontent2/source/text/shared/02/01170600.xhp
+++ b/helpcontent2/source/text/shared/02/01170600.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170600.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170700.xhp b/helpcontent2/source/text/shared/02/01170700.xhp
index d5c96e01a1..f97e6538c8 100755
--- a/helpcontent2/source/text/shared/02/01170700.xhp
+++ b/helpcontent2/source/text/shared/02/01170700.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170800.xhp b/helpcontent2/source/text/shared/02/01170800.xhp
index d1a6c6f317..7fcc850bb0 100644
--- a/helpcontent2/source/text/shared/02/01170800.xhp
+++ b/helpcontent2/source/text/shared/02/01170800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170800.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170801.xhp b/helpcontent2/source/text/shared/02/01170801.xhp
index 274ce9dd60..3c1b9f082c 100755
--- a/helpcontent2/source/text/shared/02/01170801.xhp
+++ b/helpcontent2/source/text/shared/02/01170801.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170801.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,10 +47,10 @@
 <section id="howtoget">
   <embed href="text/shared/00/00040501.xhp#aupitab1"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE" id="bm_id3149205" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE -->
 <paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="5">Data source</paragraph>
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE">Specifies the data source that contains the desired table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE" id="bm_id3147291" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE -->
 <paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="7">Table</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE">Specifies the desired table.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01170802.xhp b/helpcontent2/source/text/shared/02/01170802.xhp
index f39cf41664..9caade7109 100755
--- a/helpcontent2/source/text/shared/02/01170802.xhp
+++ b/helpcontent2/source/text/shared/02/01170802.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170802.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernen"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS" id="bm_id3157958" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS -->
 <paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="11">Selected Fields</paragraph>
 <paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS">Displays the data fields that are accepted into the form field.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01170900.xhp b/helpcontent2/source/text/shared/02/01170900.xhp
index 7affd3f45b..ac859e7763 100644
--- a/helpcontent2/source/text/shared/02/01170900.xhp
+++ b/helpcontent2/source/text/shared/02/01170900.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170900.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170901.xhp b/helpcontent2/source/text/shared/02/01170901.xhp
index 3360275c92..1197f128d7 100755
--- a/helpcontent2/source/text/shared/02/01170901.xhp
+++ b/helpcontent2/source/text/shared/02/01170901.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170901.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 </section>
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="8">For list boxes, a table that can be linked with the current form table is indicated. The link table must have at least one field in common with the table of the current form. This makes it possible to establish an unambiguous reference.</paragraph>
 <paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">For combo boxes, there must be a relationship between the form table and the table containing the data to be displayed in the combo box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE" id="bm_id3154751" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE -->
 <paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="6">Table</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE">In the<emph> Table </emph>field, select the table containing the data field whose content should be displayed in the control field.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="10">The table given here appears in the <link href="text/shared/02/01170102.xhp" name="Control properties">Control properties</link> as an element of an SQL statement in the <emph>List Contents</emph> field.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170902.xhp b/helpcontent2/source/text/shared/02/01170902.xhp
index b2c2c7b971..fcad12f334 100755
--- a/helpcontent2/source/text/shared/02/01170902.xhp
+++ b/helpcontent2/source/text/shared/02/01170902.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170902.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00040501.xhp#aupikomli2"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="10">Available Fields</paragraph>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD --><paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="10">Available Fields</paragraph>
 <paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD">Displays all table fields chosen on the previous Wizard page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD" id="bm_id3152425" localize="false"/><paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="12">Display Field</paragraph>
+<!-- removed HID DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD --><paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="12">Display Field</paragraph>
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD">Specifies the field whose data are to be shown in the combo or list boxes.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="19">The field name given here appears in the <link href="text/shared/02/01170102.xhp" name="Control properties">Control properties</link> as an element of an SQL statement in the <emph>List Contents</emph> field.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01170903.xhp b/helpcontent2/source/text/shared/02/01170903.xhp
index 4dcd6099ec..b6a361e4e1 100755
--- a/helpcontent2/source/text/shared/02/01170903.xhp
+++ b/helpcontent2/source/text/shared/02/01170903.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170903.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,10 +48,10 @@
 <section id="howtoget">
   <embed href="text/shared/00/00040501.xhp#aupikomli3a"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD" id="bm_id3153910" localize="false"/><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="16">Value table field</paragraph>
+<!-- removed HID DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD --><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="16">Value table field</paragraph>
 <paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD">Specifies the current form data field which should be related to a field in the linked table.</ahelp> In addition, click the desired data field in the list field below.</paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="25">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link>, the specified field will appear as an entry in the <emph>Data</emph> tab page under <emph>Data field</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="18">List table field</paragraph>
+<!-- removed HID DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD --><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="18">List table field</paragraph>
 <paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD">Specifies the linked table data field, which is related to the specified value table field.</ahelp> In addition, click the data field in the lower list field.</paragraph>
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="26">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link>, the specified field will appear in the <emph>Data</emph> tab page of a SQL statement under <emph>List Contents</emph>.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01170904.xhp b/helpcontent2/source/text/shared/02/01170904.xhp
index 49698d6be6..1912461274 100755
--- a/helpcontent2/source/text/shared/02/01170904.xhp
+++ b/helpcontent2/source/text/shared/02/01170904.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170904.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,14 +50,14 @@
 </section>
 <paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" l10n="U" oldref="3">Do you want to save the value in a database field?</paragraph>
 <paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="4">Two options are available for this question:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES" id="bm_id3154751" localize="false"/>
+<!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES -->
 <paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="3" l10n="U" oldref="5">Yes, I want to save it in the following database field</paragraph>
 <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES">Specifies whether the user's entered or selected combination field value should be saved in a database field.</ahelp> Several database table fields are offered which can be accessed in the current form.</paragraph>
 <paragraph role="paragraph" id="par_id3145212" xml-lang="en-US" l10n="U" oldref="11">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link> the selected field appears as an entry in the <emph>Data</emph> tab page under <emph>Data field</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD" id="bm_id3154318" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD -->
 <paragraph role="heading" id="hd_id3149177" xml-lang="en-US" level="3" l10n="U" oldref="7">List field</paragraph>
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD">Specifies the data field where the combination field value should be saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO" id="bm_id3147243" localize="false"/>
+<!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO -->
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="9">No, I only want to save the value in the form</paragraph>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO">Specifies that the value of this combination field will not be written in the database and will only be saved in the form.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01171000.xhp b/helpcontent2/source/text/shared/02/01171000.xhp
index 3394ebbc8d..b2d6bb7fde 100644
--- a/helpcontent2/source/text/shared/02/01171000.xhp
+++ b/helpcontent2/source/text/shared/02/01171000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01171000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171100.xhp b/helpcontent2/source/text/shared/02/01171100.xhp
index b896b84647..7bed8bd55a 100644
--- a/helpcontent2/source/text/shared/02/01171100.xhp
+++ b/helpcontent2/source/text/shared/02/01171100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01171100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171200.xhp b/helpcontent2/source/text/shared/02/01171200.xhp
index b58bebdb85..65aeeaf7bc 100644
--- a/helpcontent2/source/text/shared/02/01171200.xhp
+++ b/helpcontent2/source/text/shared/02/01171200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01171200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171300.xhp b/helpcontent2/source/text/shared/02/01171300.xhp
index 5f6bc5c943..c826b8ef13 100644
--- a/helpcontent2/source/text/shared/02/01171300.xhp
+++ b/helpcontent2/source/text/shared/02/01171300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01171300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171400.xhp b/helpcontent2/source/text/shared/02/01171400.xhp
index 613a5bbd70..032ee0e427 100644
--- a/helpcontent2/source/text/shared/02/01171400.xhp
+++ b/helpcontent2/source/text/shared/02/01171400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01171400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01220000.xhp b/helpcontent2/source/text/shared/02/01220000.xhp
index c7378a509d..8c348eb77c 100644
--- a/helpcontent2/source/text/shared/02/01220000.xhp
+++ b/helpcontent2/source/text/shared/02/01220000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="E">
-<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/01230000.xhp b/helpcontent2/source/text/shared/02/01230000.xhp
index e063651fbd..e2c73c7c2c 100644
--- a/helpcontent2/source/text/shared/02/01230000.xhp
+++ b/helpcontent2/source/text/shared/02/01230000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01230000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02010000.xhp b/helpcontent2/source/text/shared/02/02010000.xhp
index 817d01798b..a71f31abb6 100644
--- a/helpcontent2/source/text/shared/02/02010000.xhp
+++ b/helpcontent2/source/text/shared/02/02010000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,41 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Apply Style</title>
-<filename>/text/shared/02/02010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-26T08:12:45">UFI fix to #i21144# - FPE: added missing section 
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Apply Style</title>
+         <filename>/text/shared/02/02010000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/HID_STYLE_LISTBOX" id="bm_id3154232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:StyleApply" id="bm_id3154863" localize="false"/>
 <section id="benvor">
-<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
-<section id="benvortext">
-<paragraph role="paragraph" id="par_id3155351" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
-</section>
-</section>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW">To reset the selected objects to the default paragraph style , select <item type="literal">Clear formatting</item>. Select <item type="literal">More</item> to open the <emph>Styles and Formatting</emph> window.</paragraph>
-<section id="sylistenfeld">
-<table id="tbl_id3156042">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="E">
-<image id="img_id3152801" src="res/helpimg/zellvor.png" width="4.471cm" height="1.244cm" localize="true"><alt id="alt_id3152801" xml-lang="en-US">Cell Styles</alt>
+         <paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
+         <section id="benvortext">
+            <paragraph xml-lang="en-US" id="par_id3155351" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph" l10n="NEW">To reset the selected objects to the default paragraph style, select Clear formatting. Select More to open the Styles and Formatting window.</paragraph>
+      <section id="sylistenfeld">
+         <table id="tbl_id3156042">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="E">
+<image id="img_id3152801" src="res/helpimg/zellvor.png" width="1.0402in" height="0.2098in" localize="true"><alt xml-lang="en-US" id="alt_id3152801">Apply Style</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">Apply Style</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-</body>
-</helpdocument>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="3">Apply Style</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index 76100b9eaf..6695de62cf 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,60 +27,50 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
 
-
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Name</title>
-<filename>/text/shared/02/02020000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-13T09:30:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Font Name</title>
+         <filename>/text/shared/02/02020000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <section id="schriftart">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>fonts; specifying several</bookmark_value>
 <bookmark_value>alternative fonts</bookmark_value>
 <bookmark_value>characters; alternative fonts</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="E" oldref="9" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="E" oldref="9" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_FONT" id="bm_id4814517" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CharFontName" id="bm_id3150789" localize="false"/>
-<paragraph role="heading" id="hd_id3150808" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
-<paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150808" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3156414" role="paragraph" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp></variable></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
 <section id="syschriftart">
-<table id="tbl_id3159399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="E">
-<image id="img_id3154810" src="res/helpimg/swh00055.png" width="31.75mm" height="6.09mm"><alt id="alt_id3154810" xml-lang="en-US">Icon</alt>
+         <table id="tbl_id3159399">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145315" role="paragraph" l10n="E">
+<image id="img_id3154810" src="res/helpimg/swh00055.png" width="1.25in" height="0.2398in"><alt xml-lang="en-US" id="alt_id3154810">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="3">Font Name</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-<paragraph role="note" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer. 
-</caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link>. 
-</variable></paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="3">Font Name</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156024" role="note" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer. </caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link> in the Options dialog box.</variable></paragraph>
 <switch select="sys">
 <case select="WIN">
-<paragraph role="warning" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154125" role="warning" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
 </case>
 </switch>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02030000.xhp b/helpcontent2/source/text/shared/02/02030000.xhp
index 6ec7e7f43f..0a294ef755 100644
--- a/helpcontent2/source/text/shared/02/02030000.xhp
+++ b/helpcontent2/source/text/shared/02/02030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02040000.xhp b/helpcontent2/source/text/shared/02/02040000.xhp
index f62be80979..9194bb74e2 100644
--- a/helpcontent2/source/text/shared/02/02040000.xhp
+++ b/helpcontent2/source/text/shared/02/02040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02050000.xhp b/helpcontent2/source/text/shared/02/02050000.xhp
index cee1cffae3..db8a8765b3 100644
--- a/helpcontent2/source/text/shared/02/02050000.xhp
+++ b/helpcontent2/source/text/shared/02/02050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 9bd966ebbb..6af2fcdeb2 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02130000.xhp,v $
- * $Revision: 1.7.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,18 +43,17 @@
 <section id="einzvermindern">
 <bookmark xml-lang="en-US" branch="hid/SID_DEC_INDENT" id="bm_id8935294" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DecrementIndent" id="bm_id3153089" localize="false"/><paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02130000.xhp" name="Decrease Indent">Decrease Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the<emph> Decrease Indent </emph>icon to reduce the left indent of the current paragraph or cell content and set it to the previous tab position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the <emph>Decrease Indent</emph> icon to reduce the left indent of the current paragraph or cell content and set it to the previous default tab position.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs. 
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>. 
+<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
 </caseinline></switchinline></paragraph>
 <section id="syeinzvermindern">
 <table id="tbl_id3147576">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="4">Decrease Indent</paragraph>
@@ -65,7 +61,6 @@
 </tablerow>
 </table>
 </section>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 18f60c0ecb..e7397aba90 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,82 +31,77 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Increase Indent</title>
-<filename>/text/shared/02/02140000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einzerhoehen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value>
-</bookmark>
+      <topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Increase Indent</title>
+         <filename>/text/shared/02/02140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einzerhoehen">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value></bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_INC_INDENT" id="bm_id636827" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:IncrementIndent"><switchinline select="appl"><caseinline select="WRITER">Increases the left indent of the current paragraph and sets it to the next tab stop. 
-</caseinline><caseinline select="CALC">Click the<emph> Increase Indent </emph>icon to increase the indentation of the cell content of the selected cells. 
-</caseinline></switchinline></ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased. 
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>. 
-</caseinline></switchinline></paragraph>
-<section id="syeinzerhoehen">
-<table id="tbl_id3155535">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="E">
-<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149388" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="4">Increase Indent</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example: 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm: 
+<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next default tab position.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
 </caseinline></switchinline></paragraph>
+      <section id="syeinzerhoehen">
+         <table id="tbl_id3155535">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="E">
+<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt></image></paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="4">Increase Indent</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:</caseinline></switchinline></paragraph>
 <switch select="appl">
-<case select="WRITER"><table id="tbl_id3150943">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="8">Original indent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Indent increased</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11">0.25 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147265" xml-lang="en-US" l10n="U" oldref="12">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="13">2.25 cm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161657" xml-lang="en-US" l10n="U" oldref="14">0.5 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="15">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="16">2.5 cm</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<case select="WRITER">
+<table id="tbl_id3150943">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154047" role="paragraph" l10n="U" oldref="8">Original indent</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Indent increased</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153126" role="paragraph" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="11">0.25 cm</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147265" role="paragraph" l10n="U" oldref="12">2 cm</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="13">2.25 cm</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3161657" role="paragraph" l10n="U" oldref="14">0.5 cm</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="U" oldref="15">2 cm</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="16">2.5 cm</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 </case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02160000.xhp b/helpcontent2/source/text/shared/02/02160000.xhp
index ffde2de3b5..f7d2e5bb61 100755
--- a/helpcontent2/source/text/shared/02/02160000.xhp
+++ b/helpcontent2/source/text/shared/02/02160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02170000.xhp b/helpcontent2/source/text/shared/02/02170000.xhp
index 7ae2829d95..e799729336 100644
--- a/helpcontent2/source/text/shared/02/02170000.xhp
+++ b/helpcontent2/source/text/shared/02/02170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02170000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03110000.xhp b/helpcontent2/source/text/shared/02/03110000.xhp
index bb5d2af571..5955ef7f12 100644
--- a/helpcontent2/source/text/shared/02/03110000.xhp
+++ b/helpcontent2/source/text/shared/02/03110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03120000.xhp b/helpcontent2/source/text/shared/02/03120000.xhp
index ff6d52d24c..6378ea83bf 100644
--- a/helpcontent2/source/text/shared/02/03120000.xhp
+++ b/helpcontent2/source/text/shared/02/03120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03130000.xhp b/helpcontent2/source/text/shared/02/03130000.xhp
index aac052774c..432b366a75 100644
--- a/helpcontent2/source/text/shared/02/03130000.xhp
+++ b/helpcontent2/source/text/shared/02/03130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03140000.xhp b/helpcontent2/source/text/shared/02/03140000.xhp
index 45aa83660f..7921d76b9e 100644
--- a/helpcontent2/source/text/shared/02/03140000.xhp
+++ b/helpcontent2/source/text/shared/02/03140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03140000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03150000.xhp b/helpcontent2/source/text/shared/02/03150000.xhp
index 0777a5db9b..fe50ab00af 100644
--- a/helpcontent2/source/text/shared/02/03150000.xhp
+++ b/helpcontent2/source/text/shared/02/03150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03150000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp
index 14d1ac51d0..74a654065b 100644
--- a/helpcontent2/source/text/shared/02/03200000.xhp
+++ b/helpcontent2/source/text/shared/02/03200000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03200000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/04210000.xhp b/helpcontent2/source/text/shared/02/04210000.xhp
index 00ea6c78bc..734b5357fe 100644
--- a/helpcontent2/source/text/shared/02/04210000.xhp
+++ b/helpcontent2/source/text/shared/02/04210000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04210000.xhp,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/05020000.xhp b/helpcontent2/source/text/shared/02/05020000.xhp
index b34c081445..26f9f308bb 100644
--- a/helpcontent2/source/text/shared/02/05020000.xhp
+++ b/helpcontent2/source/text/shared/02/05020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/05090000.xhp b/helpcontent2/source/text/shared/02/05090000.xhp
index 6dca701913..77aa28b3cb 100644
--- a/helpcontent2/source/text/shared/02/05090000.xhp
+++ b/helpcontent2/source/text/shared/02/05090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/05110000.xhp b/helpcontent2/source/text/shared/02/05110000.xhp
index 95b009ebc8..958f09aea5 100644
--- a/helpcontent2/source/text/shared/02/05110000.xhp
+++ b/helpcontent2/source/text/shared/02/05110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06050000.xhp b/helpcontent2/source/text/shared/02/06050000.xhp
index d40cd39f0d..7e8525cf66 100644
--- a/helpcontent2/source/text/shared/02/06050000.xhp
+++ b/helpcontent2/source/text/shared/02/06050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06060000.xhp b/helpcontent2/source/text/shared/02/06060000.xhp
index 66b9749b50..492bd13470 100644
--- a/helpcontent2/source/text/shared/02/06060000.xhp
+++ b/helpcontent2/source/text/shared/02/06060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06100000.xhp b/helpcontent2/source/text/shared/02/06100000.xhp
index e1331c755b..739abc6ae3 100644
--- a/helpcontent2/source/text/shared/02/06100000.xhp
+++ b/helpcontent2/source/text/shared/02/06100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06110000.xhp b/helpcontent2/source/text/shared/02/06110000.xhp
index d4bb49c6b2..740bfc4264 100644
--- a/helpcontent2/source/text/shared/02/06110000.xhp
+++ b/helpcontent2/source/text/shared/02/06110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06110000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06120000.xhp b/helpcontent2/source/text/shared/02/06120000.xhp
index 0853e98a99..8079ea3a09 100644
--- a/helpcontent2/source/text/shared/02/06120000.xhp
+++ b/helpcontent2/source/text/shared/02/06120000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06120000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07010000.xhp b/helpcontent2/source/text/shared/02/07010000.xhp
index 9f66388a0b..5280cca7f7 100644
--- a/helpcontent2/source/text/shared/02/07010000.xhp
+++ b/helpcontent2/source/text/shared/02/07010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07010000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 <section id="urlladen">
 <bookmark xml-lang="en-US" branch="hid/SID_OPENURL" id="bm_id7760961" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OpenUrl" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3149119" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/07010000.xhp" name="Load URL">Load URL</link></paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL or select one that is already registered. %PRODUCTNAME automatically converts file paths into URL notation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL or select one from the list. %PRODUCTNAME automatically converts file paths into URL notation.</ahelp></paragraph>
 <paragraph role="tip" id="par_idN108C6" xml-lang="en-US" l10n="CHG">Enable Load URL with the Visible Buttons command (click the arrow at the end of the toolbar).<comment>i73505</comment></paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/02/07060000.xhp b/helpcontent2/source/text/shared/02/07060000.xhp
index 31f5465aef..23d833537d 100644
--- a/helpcontent2/source/text/shared/02/07060000.xhp
+++ b/helpcontent2/source/text/shared/02/07060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07060000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070000.xhp b/helpcontent2/source/text/shared/02/07070000.xhp
index a4b1d277b9..566c614eea 100644
--- a/helpcontent2/source/text/shared/02/07070000.xhp
+++ b/helpcontent2/source/text/shared/02/07070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07070000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070100.xhp b/helpcontent2/source/text/shared/02/07070100.xhp
index 77a1267f25..c08ce49b16 100644
--- a/helpcontent2/source/text/shared/02/07070100.xhp
+++ b/helpcontent2/source/text/shared/02/07070100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07070100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070200.xhp b/helpcontent2/source/text/shared/02/07070200.xhp
index 993b79f90c..5df5eb265a 100755
--- a/helpcontent2/source/text/shared/02/07070200.xhp
+++ b/helpcontent2/source/text/shared/02/07070200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07070200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07080000.xhp b/helpcontent2/source/text/shared/02/07080000.xhp
index 34375cc137..d1dbc2ae86 100644
--- a/helpcontent2/source/text/shared/02/07080000.xhp
+++ b/helpcontent2/source/text/shared/02/07080000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07090000.xhp b/helpcontent2/source/text/shared/02/07090000.xhp
index ac2f143901..4ef9301e41 100644
--- a/helpcontent2/source/text/shared/02/07090000.xhp
+++ b/helpcontent2/source/text/shared/02/07090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 07090000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/08010000.xhp b/helpcontent2/source/text/shared/02/08010000.xhp
index 8bf2a94b37..051a8878da 100644
--- a/helpcontent2/source/text/shared/02/08010000.xhp
+++ b/helpcontent2/source/text/shared/02/08010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/08020000.xhp b/helpcontent2/source/text/shared/02/08020000.xhp
index 9731bff28f..312183a218 100644
--- a/helpcontent2/source/text/shared/02/08020000.xhp
+++ b/helpcontent2/source/text/shared/02/08020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08020000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09010000.xhp b/helpcontent2/source/text/shared/02/09010000.xhp
index c1a80a3010..983671dfcc 100644
--- a/helpcontent2/source/text/shared/02/09010000.xhp
+++ b/helpcontent2/source/text/shared/02/09010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09020000.xhp b/helpcontent2/source/text/shared/02/09020000.xhp
index 553071b68f..90bb3dead9 100755
--- a/helpcontent2/source/text/shared/02/09020000.xhp
+++ b/helpcontent2/source/text/shared/02/09020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09020000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09030000.xhp b/helpcontent2/source/text/shared/02/09030000.xhp
index e9b1aff2ee..027a5dc659 100644
--- a/helpcontent2/source/text/shared/02/09030000.xhp
+++ b/helpcontent2/source/text/shared/02/09030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09050000.xhp b/helpcontent2/source/text/shared/02/09050000.xhp
index 5db8b89a3c..23221d0fee 100644
--- a/helpcontent2/source/text/shared/02/09050000.xhp
+++ b/helpcontent2/source/text/shared/02/09050000.xhp
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09050000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,29 +25,21 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0209050000xml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Find</title>
 <filename>/text/shared/02/09050000.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>
-  
-  
   <section id="search">
   <bookmark branch="hid/HID_OFA_HYPERLINK_SEARCH" xml-lang="en-US" id="bm_id3156211"/><paragraph id="hd_id3154228" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/09050000.xhp" name="Find">Find</link></paragraph>
-  <paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find </emph>submenu is defined in <link href="text/shared/optionen/01020200.xhp" name="Tools - Options - Internet - Search"><emph>Tools - Options - Internet - Search</emph></link>.</paragraph>
+<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find</emph> submenu is defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Internet - Search">Internet - Search</link></emph>.</paragraph>
   </section>
   <section id="sysearch">
   <table id="tbl_id3147261">
-   
-   
-   
     <tablerow>
      <tablecell>
       <paragraph l10n="E" role="paragraph" id="par_id3152801" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_recsearch.png" id="img_id3153750"><alt xml-lang="en-US" id="alt_id3153750">Icon</alt></image></paragraph>
@@ -60,11 +48,9 @@
       <paragraph role="paragraph" id="par_id3147008" l10n="U" xml-lang="en-US" oldref="3">Find</paragraph>
      </tablecell>
     </tablerow>
-   
   </table>
   </section>
   <paragraph role="heading" level="2" id="hd_id3153683" l10n="U" xml-lang="en-US" oldref="4">List of search engines</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3147576" l10n="U" oldref="5">When you have selected a search engine, $[officename] transfers the search request to your standard web browser, which then establishes an Internet connection to the search engine and displays the result. See also <link href="text/shared/02/09010000.xhp" name="URL Name">URL Name</link>.</paragraph>
-  
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/09060000.xhp b/helpcontent2/source/text/shared/02/09060000.xhp
index eeec8f370e..75178bc75c 100644
--- a/helpcontent2/source/text/shared/02/09060000.xhp
+++ b/helpcontent2/source/text/shared/02/09060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09060000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09070000.xhp b/helpcontent2/source/text/shared/02/09070000.xhp
index 8ddd24ce4c..b0aa90d2ce 100644
--- a/helpcontent2/source/text/shared/02/09070000.xhp
+++ b/helpcontent2/source/text/shared/02/09070000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09070000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,69 +27,73 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Dialog</title>
-<filename>/text/shared/02/09070000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-02T12:01:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
+      <topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Hyperlink Dialog</title>
+         <filename>/text/shared/02/09070000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="hyperlink">
 <bookmark xml-lang="en-US" branch="hid/SID_HYPERLINK_DIALOG" id="bm_id4087126" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HyperlinkDialog" id="bm_id3149748" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_EDIT_HYPERLINK" id="bm_id6121214" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id3151097" localize="false"/>
-<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
+<paragraph xml-lang="en-US" id="hd_id3145759" role="heading" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
+         <paragraph xml-lang="en-US" id="par_id3156183" role="paragraph" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
 </variable></paragraph>
-</section>
-<section id="syhyperdia">
-<table id="tbl_id3158405">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="E">
-<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3093440" xml-lang="en-US">Icon</alt>
+      </section>
+      <section id="syhyperdia">
+         <table id="tbl_id3158405">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154927" role="paragraph" l10n="E">
+<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CHOICECTRL" id="bm_id3149177" localize="false"/>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155391" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_OPEN_HYPERLINK" id="bm_id7868083" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OpenHyperlinkOnCursor" id="bm_id3145345" localize="false"/>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/09070100.xhp#internet"/>
-<embed href="text/shared/02/09070200.xhp#mailnews"/>
-<embed href="text/shared/02/09070300.xhp#dokument"/>
-<embed href="text/shared/02/09070400.xhp#neuesdokument"/>
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="CHG" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in your default web browser.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_EDIT_HYPERLINK" id="bm_id0122200902201484" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id0122200902201587" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231573" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Hyperlink dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_COPY_HYPERLINK_LOCATION" id="bm_id0122200902224858" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231660" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Copies the URL to the clipboard.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REMOVE_HYPERLINK" id="bm_id0122200902230774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231630" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the hyperlink, leaving plain text.</ahelp></paragraph>
+      <embed href="text/shared/02/09070100.xhp#internet"/>
+      <embed href="text/shared/02/09070200.xhp#mailnews"/>
+      <embed href="text/shared/02/09070300.xhp#dokument"/>
+      <embed href="text/shared/02/09070400.xhp#neuesdokument"/>
 <bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_OK_BTN" id="bm_id3149811" localize="false"/>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="7">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3166410" role="heading" level="3" l10n="U" oldref="7">Apply</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CANCEL_BTN" id="bm_id3159166" localize="false"/>
-<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="9">Close</paragraph>
-<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153700" xml-lang="en-US" level="3" l10n="U" oldref="11">Help</paragraph>
-<paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="12">Opens the Help.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="3" l10n="U" oldref="9">Close</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149734" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153700" role="heading" level="3" l10n="U"
+                 oldref="11">Help</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150943" role="paragraph" l10n="U" oldref="12">Opens the Help.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_RESET_BTN" id="bm_id3155434" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="13">Back</paragraph>
-<paragraph role="paragraph" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="3" l10n="U"
+                 oldref="13">Back</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149234" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp
index f3428e310c..a3583f2ebf 100755
--- a/helpcontent2/source/text/shared/02/09070100.xhp
+++ b/helpcontent2/source/text/shared/02/09070100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09070100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,53 +49,53 @@
 </section>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="3">The fields for the login name, password and anonymous user are only available for FTP addresses.</paragraph>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="4">Type of hyperlink</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET" id="bm_id3154823" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="CHG" oldref="6">Web</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET" id="bm_id3154823" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="CHG" oldref="6">Web</paragraph>
 <paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET">Creates an http hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="8">FTP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="8">FTP</paragraph>
 <paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP">Creates an FTP hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" id="bm_id3154749" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="10">Telnet</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" id="bm_id3154749" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="10">Telnet</paragraph>
 <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET">Creates a Telnet hyperlink.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_INET_PATH" id="bm_id3146797" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="12">Target</paragraph>
 <paragraph role="paragraph" id="par_id9887081" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp><comment>see i48946</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE" id="bm_id3158432" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="13">WWW Browser</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE" id="bm_id3158432" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="13">WWW Browser</paragraph>
 <paragraph role="paragraph" id="par_id3153760" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE">Opens a web browser, into which you can load the desired URL.</ahelp> You can then copy and paste the URL into the <emph>Target</emph> field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="31">Target in document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="31">Target in document</paragraph>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET">Opens the <emph>Target in Document</emph> dialog.</ahelp> There you can select the destination within a document and add it to the target URL with the <emph>Insert</emph> button.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_TREE" id="bm_id3159167" localize="false"/><paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_HYPERLINK_MARKWND_TREE" visibility="hidden">Specifies the position in the target document where you wish to jump to.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_APPLY" id="bm_id3159177" localize="false"/><paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_HYPERLINK_MARKWND_APPLY" visibility="hidden">Inserts the target in the <emph>Target</emph> field of the <emph>Hyperlink</emph> dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_CLOSE" id="bm_id3145416" localize="false"/><paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_HYPERLINK_MARKWND_CLOSE" visibility="hidden">Once the hyperlink has been completely entered, click on <emph>Close</emph> to set the link and leave the dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="15">Login name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="15">Login name</paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN">Specifies your login name, if you are working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="17">Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="17">Password</paragraph>
 <paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD">Specifies your password, if you are working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="19">Anonymous user</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="19">Anonymous user</paragraph>
 <paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS">Allows you to log in to the FTP address as an anonymous user.</ahelp></paragraph>
 <section id="weitere">
 <paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="2" l10n="U" oldref="21">Further settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME" id="bm_id3153778" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME" id="bm_id3154072" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME" id="bm_id3154138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME" id="bm_id7259437" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="23">Frame</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME" id="bm_id3153778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME" id="bm_id3154072" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME" id="bm_id7259437" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="23">Frame</paragraph>
 <paragraph role="paragraph" id="par_id2052980" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM" id="bm_id3154819" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM" id="bm_id3144433" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM" id="bm_id3156424" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3155101" xml-lang="en-US" level="3" l10n="U" oldref="24">Form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM" id="bm_id3154819" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM" id="bm_id3144433" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM" id="bm_id3156424" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3155101" xml-lang="en-US" level="3" l10n="U" oldref="24">Form</paragraph>
 <paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM">Specifies whether the hyperlink is inserted as text or as a button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT" id="bm_id3150871" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT" id="bm_id3157321" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT" id="bm_id3148678" localize="false"/><paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="26">Events</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT" id="bm_id3125863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT" id="bm_id3157321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT" id="bm_id3148678" localize="false"/><paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="26">Events</paragraph>
 <paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT">Opens the <emph>Assign Macro</emph> dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION" id="bm_id3151383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION" id="bm_id3154685" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION" id="bm_id3149983" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="28">Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION" id="bm_id3151383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION" id="bm_id3154685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION" id="bm_id3154684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION" id="bm_id3149983" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="28">Text</paragraph>
 <paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION">Specifies the visible text or button caption for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT" id="bm_id3152598" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT" id="bm_id3159198" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT" id="bm_id3146121" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_HYPERLINK_INTERNET_ED_TEXT" id="bm_id2681356" localize="false"/><paragraph role="heading" id="hd_id3147354" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT" id="bm_id3152598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT" id="bm_id3159198" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT" id="bm_id3146121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT" id="bm_id2681356" localize="false"/><paragraph role="heading" id="hd_id3147354" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
 <paragraph role="paragraph" id="par_id2801599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink.</paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/02/09070200.xhp b/helpcontent2/source/text/shared/02/09070200.xhp
index fde0e22fca..4944267d6b 100755
--- a/helpcontent2/source/text/shared/02/09070200.xhp
+++ b/helpcontent2/source/text/shared/02/09070200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09070200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,15 +48,15 @@
   <embed href="text/shared/00/00000403.xhp#hypdiamailnews"/>
 </section>
 <paragraph role="heading" id="hd_id3153528" xml-lang="en-US" level="2" l10n="U" oldref="3">Mail &amp; News</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="4">E-mail</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="4">E-mail</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL">Assigns the specified e-mail address to the hyperlink.</ahelp> Clicking the new hyperlink in the document will open a new message document, addressed to the receiver specified in the <emph>E-mail</emph> field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS" id="bm_id3145673" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="6">News</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS" id="bm_id3145673" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="6">News</paragraph>
 <paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS">Assigns a news address to the hyperlink.</ahelp> Clicking the hyperlink in the document will open a new message document to the news group you entered in the <emph>Receiver</emph> field.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_MAIL_PATH" id="bm_id3144438" localize="false"/><paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="3" l10n="U" oldref="8">Receiver</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_HYPERDLG_MAIL_PATH">Specifies the full URL of the addressee, in the form mailto:name@provider.com or news:group.server.com.</ahelp> You can also use drag-and-drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_BTN_ADRESSBOOK" id="bm_id3155449" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="14">Data Sources</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK" id="bm_id3155449" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="14">Data Sources</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_BTN_ADRESSBOOK">Hides or shows the data source browser.</ahelp> Drag the receiver's <emph>E-mail</emph> data field from the data source browser into the <emph>Receiver</emph> text field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_HYPERLINK_MAIL_ED_SUBJECT" id="bm_id3154852" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="12">Subject</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT" id="bm_id3154852" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="12">Subject</paragraph>
 <paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX_EDIT_RID_SVXPAGE_HYPERLINK_MAIL_ED_SUBJECT">Specifies the subject that is inserted in the subject line of the new message document.</ahelp></paragraph>
 <embed href="text/shared/02/09070100.xhp#weitere"/>
 </body>
diff --git a/helpcontent2/source/text/shared/02/09070300.xhp b/helpcontent2/source/text/shared/02/09070300.xhp
index 59524f12f9..7198da82aa 100755
--- a/helpcontent2/source/text/shared/02/09070300.xhp
+++ b/helpcontent2/source/text/shared/02/09070300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09070300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,12 +50,12 @@
 <paragraph role="heading" id="hd_id3150808" xml-lang="en-US" level="2" l10n="U" oldref="3">Document</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_DOC_PATH" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3150710" xml-lang="en-US" level="3" l10n="U" oldref="5">Path</paragraph>
 <paragraph role="paragraph" id="par_id9462263" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN" id="bm_id3147571" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="3" l10n="U" oldref="6">Open File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN" id="bm_id3147571" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="3" l10n="U" oldref="6">Open File</paragraph>
 <paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN">Opens the <emph>Open dialog,</emph> where you can select a file.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149828" xml-lang="en-US" level="2" l10n="U" oldref="8">Target in document</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="3" l10n="U" oldref="10">Target</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="3" l10n="U" oldref="10">Target</paragraph>
 <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC">Specifies a target for the hyperlink into the document specified under <emph>Path</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="12">Target in Document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="12">Target in Document</paragraph>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE">Opens the <emph>Target in Document</emph> dialog.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
 <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="15">Specifies the URL, which results from the entries in <emph>Path</emph> and <emph>Destination</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/09070400.xhp b/helpcontent2/source/text/shared/02/09070400.xhp
index 5e6bb14ea3..72cc63b41e 100755
--- a/helpcontent2/source/text/shared/02/09070400.xhp
+++ b/helpcontent2/source/text/shared/02/09070400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09070400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,15 +49,15 @@
 </section>
 <paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="2" l10n="U" oldref="3">New Document</paragraph>
 <paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Specifies the name, path and type of the new document in this area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit now</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit now</paragraph>
 <paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW">Specifies that the new document is created and immediately opened for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="7">Edit later</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="7">Edit later</paragraph>
 <paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER">Specifies that the document is created but it is not immediately opened.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC" id="bm_id3149182" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC" id="bm_id3149182" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
 <paragraph role="paragraph" id="par_id8894009" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE" id="bm_id3166460" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="10">Select Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE" id="bm_id3166460" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="10">Select Path</paragraph>
 <paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE">Opens the <emph>Select Path</emph> dialog, where you can select a path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES" id="bm_id3153698" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="12">File type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES" id="bm_id3153698" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="12">File type</paragraph>
 <paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES">Specifies the file type for the new document.</ahelp></paragraph>
 <embed href="text/shared/02/09070100.xhp#weitere"/>
 </body>
diff --git a/helpcontent2/source/text/shared/02/10010000.xhp b/helpcontent2/source/text/shared/02/10010000.xhp
index bc9a90478f..d01b16450f 100644
--- a/helpcontent2/source/text/shared/02/10010000.xhp
+++ b/helpcontent2/source/text/shared/02/10010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10020000.xhp b/helpcontent2/source/text/shared/02/10020000.xhp
index 552f85be5e..0342496843 100644
--- a/helpcontent2/source/text/shared/02/10020000.xhp
+++ b/helpcontent2/source/text/shared/02/10020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10030000.xhp b/helpcontent2/source/text/shared/02/10030000.xhp
index 29d081f74f..817843f940 100644
--- a/helpcontent2/source/text/shared/02/10030000.xhp
+++ b/helpcontent2/source/text/shared/02/10030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10040000.xhp b/helpcontent2/source/text/shared/02/10040000.xhp
index 266da49ca3..4b26aa7b03 100644
--- a/helpcontent2/source/text/shared/02/10040000.xhp
+++ b/helpcontent2/source/text/shared/02/10040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index 79a756ebfa..bd88cf0aae 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10100000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 7e50fc04b7..581fbbc704 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12000000.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,25 +36,20 @@
 <title id="tit" xml-lang="en-US">Explorer On/Off</title>
 <filename>/text/shared/02/12000000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-15T12:33:43">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="explorer">
 <bookmark xml-lang="en-US" branch="hid/SID_DSBROWSER_EXPLORER" id="bm_id6761446" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DSBrowserExplorer" id="bm_id3154682" localize="false"/>
 <paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/12000000.xhp" name="Explorer On/Off">Explorer On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off </emph>icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off</emph> icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
 </section>
 <section id="syexplorer">
 <table id="tbl_id3153894">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="E">
-<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">Explorer On/Off</paragraph>
@@ -67,20 +59,20 @@
 
 </section>
 <embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their links, queries and tables.</paragraph>
+<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their queries and tables.</paragraph>
 <paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="53">
 <emph>Establishing a connection</emph> - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type.</paragraph>
 <section id="kontextmenue">
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_CLOSECONN" id="bm_id3155135" localize="false"/>
-<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>%PRODUCTNAME Base - Connections</emph> in the Options dialog box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_RENAME_ENTRY" id="bm_id3156192" localize="false"/>
-<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name.. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_DSADMINISTRATE" id="bm_id189825" localize="false"/>
+<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
+<!-- removed HID HID_BROWSER_DSADMINISTRATE -->
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_EDIT_DATABASE" id="bm_id189826" localize="false"/>
 <paragraph role="paragraph" id="par_id273445" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the selected database file for editing.</ahelp></paragraph><comment>i66574 new command "Database Registrations" / but name in UI is "Registered databases"</comment>
-<bookmark xml-lang="en-US" branch="hid/39064" id="bm_id321665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id321665" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id5135044" localize="false"/>
-<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>%PRODUCTNAME Base - Databases</emph> in the Options dialog box.</ahelp></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/12010000.xhp b/helpcontent2/source/text/shared/02/12010000.xhp
index 53fde58763..04361f2275 100644
--- a/helpcontent2/source/text/shared/02/12010000.xhp
+++ b/helpcontent2/source/text/shared/02/12010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12020000.xhp b/helpcontent2/source/text/shared/02/12020000.xhp
index f97af8599f..25d6cc32c7 100644
--- a/helpcontent2/source/text/shared/02/12020000.xhp
+++ b/helpcontent2/source/text/shared/02/12020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12020000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12030000.xhp b/helpcontent2/source/text/shared/02/12030000.xhp
index 298bb0a686..6fcf44a284 100644
--- a/helpcontent2/source/text/shared/02/12030000.xhp
+++ b/helpcontent2/source/text/shared/02/12030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12040000.xhp b/helpcontent2/source/text/shared/02/12040000.xhp
index 19258942a3..2619ec6346 100644
--- a/helpcontent2/source/text/shared/02/12040000.xhp
+++ b/helpcontent2/source/text/shared/02/12040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12050000.xhp b/helpcontent2/source/text/shared/02/12050000.xhp
index 17c300f64f..10c9311116 100644
--- a/helpcontent2/source/text/shared/02/12050000.xhp
+++ b/helpcontent2/source/text/shared/02/12050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12070000.xhp b/helpcontent2/source/text/shared/02/12070000.xhp
index eb2f35db47..7eead3d52b 100644
--- a/helpcontent2/source/text/shared/02/12070000.xhp
+++ b/helpcontent2/source/text/shared/02/12070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12070100.xhp b/helpcontent2/source/text/shared/02/12070100.xhp
index 648f90c5ee..c4b631dec5 100644
--- a/helpcontent2/source/text/shared/02/12070100.xhp
+++ b/helpcontent2/source/text/shared/02/12070100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,47 +40,47 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1">Table</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156183"><bookmark_value>database contents; inserting as tables</bookmark_value>
 </bookmark>
 <paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" visibility="hidden">Inserts data selected from the data source browser into the document as a table.</ahelp>In the <emph>Insert Database Columns</emph> dialog, select the <emph>Table</emph> option to insert the selected data into the document as a table. In the dialog, you can decide which database fields or columns are transferred, and how the text table is formatted.</paragraph>
 <paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="2" l10n="U" oldref="2">Table</paragraph>
 <paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="19">In the <emph>Table</emph> area, use the arrow keys to select the columns of the database table that you want to apply to the text table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="3" l10n="U" oldref="3">Database columns</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="3" l10n="U" oldref="3">Database columns</paragraph>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN">Specifies the database columns to be inserted into the text table.</ahelp> All database table columns that have not been accepted in the <emph>Table column(s)</emph> list box are listed here. The entries are sorted alphabetically. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="3" l10n="U" oldref="4">Table column(s)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="3" l10n="U" oldref="4">Table column(s)</paragraph>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL">Lists all database columns to be inserted into the document.</ahelp> A column will be assigned to each corresponding entry in the table. The entry order in the <emph>Table column(s)</emph> list box determines the data order in the text table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO" id="bm_id3159234" localize="false"/><paragraph role="heading" id="hd_id3146958" xml-lang="en-US" level="3" l10n="U" oldref="5">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO" id="bm_id3159234" localize="false"/><paragraph role="heading" id="hd_id3146958" xml-lang="en-US" level="3" l10n="U" oldref="5">&gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO">Moves all listed database fields into the <emph>Table column(s)</emph> list box.</ahelp> All fields listed in the <emph>Table column(s)</emph> list box are inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO" id="bm_id3148539" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="6">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO" id="bm_id3148539" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="6">&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO">Moves the selected database field into the <emph>Table column(s)</emph> list box. </ahelp> You can also double click an entry to move it to the <emph>Table column(s)</emph> list box. All fields listed in the <emph>Table column(s)</emph> list box are inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM" id="bm_id3148992" localize="false"/><paragraph role="heading" id="hd_id3149732" xml-lang="en-US" level="3" l10n="U" oldref="7">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM" id="bm_id3148992" localize="false"/><paragraph role="heading" id="hd_id3149732" xml-lang="en-US" level="3" l10n="U" oldref="7">&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM">Removes the selected database field from the<emph> Table column(s)</emph> list box</ahelp> The removed field is not inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_FROM" id="bm_id3154286" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="8">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM" id="bm_id3154286" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="8">&lt;&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_FROM">Removes all database fields from the <emph>Table column(s)</emph> list box.</ahelp></paragraph>
 <section id="format">
 <paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="13">Format</paragraph>
 <paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="30">Specifies the format for inserting the database fields into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="14">From database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="14">From database</paragraph>
 <paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB">Accepts the database formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR" id="bm_id3151378" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR" id="bm_id3159177" localize="false"/><paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="3" l10n="U" oldref="15">Select</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR" id="bm_id3151378" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR" id="bm_id3159177" localize="false"/><paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="3" l10n="U" oldref="15">Select</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR">Specifies a format from the list, if the format information of certain data fields is not accepted.</ahelp> The formats supplied here are only available for certain database fields, such as numeric or Boolean fields. If you select a database field in text format, you will not be able to select any format from the selection list, since the text format will be automatically maintained.</paragraph>
 <paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="U" oldref="33">If the format you want is not listed, select "Other Formats..." and define the desired format in the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog.</paragraph>
 <paragraph role="paragraph" id="par_id3154282" xml-lang="en-US" l10n="U" oldref="34">The number format assigned using the selection list always refers to the database field selected in the <emph>Database columns</emph> list box.</paragraph>
 </section>
 <paragraph role="note" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="35">To insert the data into the document in the form of a table, the correct <emph>Table</emph> option must be active. You can then select a database field from the <emph>Table column(s)</emph> list box to define the formatting of the database field. The changes to the number formats will be applied to the last selection. It does not matter whether the database field was selected from the <emph>Database columns</emph> list box or from the <emph>Table column(s)</emph> list box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="10">Insert table heading</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="10">Insert table heading</paragraph>
 <paragraph role="paragraph" id="par_id3150497" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON">Specifies whether to insert a heading line for the columns in the text table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="11">Apply column name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="11">Apply column name</paragraph>
 <paragraph role="paragraph" id="par_id3152922" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS">Uses the field names of the database table as headings for each of the text table columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="12">Create row only</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="12">Create row only</paragraph>
 <paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY">Inserts an empty heading line into the text table.</ahelp> Using the<emph> Create row only </emph>option, you can define headings in the document, which do not correspond to the database field names.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT" id="bm_id3155133" localize="false"/><paragraph role="heading" id="hd_id3153369" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT" id="bm_id3155133" localize="false"/><paragraph role="heading" id="hd_id3153369" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05090000.xhp" name="Table Format"><emph>Table Format</emph></link>
 </caseinline><defaultinline>
 <emph>Table Format</emph></defaultinline></switchinline> dialog, which enables you to define the table properties such as borders, background, and column width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="17">AutoFormat</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="17">AutoFormat</paragraph>
 <paragraph role="paragraph" id="par_id3154988" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05150101.xhp" name="AutoFormat"><emph>AutoFormat</emph></link>
 </caseinline><defaultinline>
 <emph>AutoFormat</emph></defaultinline></switchinline> dialog, in which you can select format styles that are immediately applied when inserting the table.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/12070200.xhp b/helpcontent2/source/text/shared/02/12070200.xhp
index 1900716052..1998f310da 100644
--- a/helpcontent2/source/text/shared/02/12070200.xhp
+++ b/helpcontent2/source/text/shared/02/12070200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070200.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,21 +42,21 @@
   
   
   <switch select="appl"><case select="WRITER">
-  <bookmark branch="hid/SW_RADIOBUTTON_DLG_AP_INSERT_DB_SEL_RB_AS_FIELD" xml-lang="en-US" id="bm_id3153116"/><paragraph role="heading" level="1" id="hd_id3149991" l10n="U" xml-lang="en-US" oldref="1">Fields</paragraph>
+  <bookmark branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD" xml-lang="en-US" id="bm_id3153116"/><paragraph role="heading" level="1" id="hd_id3149991" l10n="U" xml-lang="en-US" oldref="1">Fields</paragraph>
   <bookmark xml-lang="en-US" branch="index" id="bm_id3149987"><bookmark_value>database contents; inserting as fields</bookmark_value></bookmark><paragraph l10n="U" xml-lang="en-US" oldref="8" id="par_id3149987" role="paragraph"><ahelp hid="SW_RADIOBUTTON_DLG_AP_INSERT_DB_SEL_RB_AS_FIELD" visibility="hidden">Inserts data selected from the data source browser into the document as fields.</ahelp>In the <emph>Insert Database Columns</emph> dialog, select the <link href="text/swriter/01/04090000.xhp" name="Fields">Fields</link> to insert the selected data into the document as fields. These <link href="text/swriter/01/04090006.xhp" name="database fields">database fields</link> work as wildcards for the individual database columns and can be used for form letters. Click the <link href="text/shared/02/12080000.xhp" name="Data to Fields"><emph>Data to Fields</emph></link> icon to match the contents of the fields to the currently selected record.</paragraph>
   <paragraph xml-lang="en-US" role="note" id="par_id3153114" l10n="U" oldref="9">If several records are selected when you choose the <emph>Data to Text</emph> function, the mail merge fields will be inserted according to the number of records. Also, a field command such as "Next record" will be inserted automatically between individual field command blocks.</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3145090" l10n="U" oldref="10">The <emph>Insert Database Columns</emph> dialog lets you define which database fields to insert into the document and how to format the paragraphs.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3156136" l10n="U" xml-lang="en-US" oldref="2">Fields</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3147571" l10n="U" oldref="11">In the <emph>Fields</emph> area, use the arrow button to select the database table columns into which you want to insert field contents.</paragraph>
   <section id="ankerfuertextoption">
-  <bookmark branch="hid/SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN" xml-lang="en-US" id="bm_id3156411"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="3">Database columns</paragraph>
+  <bookmark branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN" xml-lang="en-US" id="bm_id3156411"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="3">Database columns</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155535" xml-lang="en-US" oldref="12">Lists all columns of the database table, which can be accepted in the selection list box to insert them into the document. <ahelp hid="SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN" visibility="visible">Select the database columns that you want to insert it in the document.</ahelp></paragraph>
-  <bookmark branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3152551" l10n="U" xml-lang="en-US" oldref="4">&gt;</paragraph>
+  <bookmark branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3152551" l10n="U" xml-lang="en-US" oldref="4">&gt;</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145345" xml-lang="en-US" oldref="13"><ahelp visibility="visible" hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT">Moves the fields that you selected in the <emph>Database columns</emph> list box into the selection field.</ahelp> You can also double-click the entry to select it.</paragraph>
-  <bookmark branch="hid/SW_MULTILINEEDIT_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT" xml-lang="en-US" id="bm_id3152997"/><paragraph role="heading" level="3" id="hd_id3166411" l10n="U" xml-lang="en-US" oldref="5">Select</paragraph>
+  <bookmark branch="hid/sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT" xml-lang="en-US" id="bm_id3152997"/><paragraph role="heading" level="3" id="hd_id3166411" l10n="U" xml-lang="en-US" oldref="5">Select</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3163802" xml-lang="en-US" oldref="14"><ahelp hid="SW_MULTILINEEDIT_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT" visibility="visible">Lists the database columns that you selected to be inserted into the document. You can also enter text here. This text will be also inserted into the document.</ahelp> The entries' order in the selection field corresponds to the data order in the document.</paragraph>
   <embed href="text/shared/02/12070100.xhp#format"/>
-  <bookmark branch="hid/SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL" xml-lang="en-US" id="bm_id3154852"/><paragraph role="heading" level="3" id="hd_id3153257" l10n="U" xml-lang="en-US" oldref="7">Paragraph Style</paragraph>
+  <bookmark branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL" xml-lang="en-US" id="bm_id3154852"/><paragraph role="heading" level="3" id="hd_id3153257" l10n="U" xml-lang="en-US" oldref="7">Paragraph Style</paragraph>
   <paragraph xml-lang="en-US" oldref="15" id="par_id3158430" l10n="U" role="paragraph">By default, the inserted paragraphs are formatted with the current Paragraph Styles. This format corresponds to the "none" entry in the <emph>Paragraph Style</emph> list box. <ahelp hid="SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL" visibility="visible">This is where you can select other Paragraph Styles to apply to the paragraph you want to insert into the document.</ahelp> The list box displays the available Paragraph Styles defined in <item type="productname">%PRODUCTNAME</item> and managed in the <link href="text/swriter/01/05130000.xhp" name="Style Catalog">Style Catalog</link>.</paragraph>
   </section>
   </case></switch>
diff --git a/helpcontent2/source/text/shared/02/12070300.xhp b/helpcontent2/source/text/shared/02/12070300.xhp
index 482b2d0e79..4fee7f50cc 100755
--- a/helpcontent2/source/text/shared/02/12070300.xhp
+++ b/helpcontent2/source/text/shared/02/12070300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12070300.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 <body>
   
   
-  <bookmark branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" xml-lang="en-US" id="bm_id3146938"/><paragraph role="heading" level="1" id="hd_id3154873" l10n="U" xml-lang="en-US" oldref="1">Text</paragraph>
+  <bookmark branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" xml-lang="en-US" id="bm_id3146938"/><paragraph role="heading" level="1" id="hd_id3154873" l10n="U" xml-lang="en-US" oldref="1">Text</paragraph>
   <bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>database contents; inserting as text</bookmark_value></bookmark><paragraph l10n="U" xml-lang="en-US" oldref="3" role="paragraph" id="par_id3143284"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" visibility="hidden">Inserts data selected from the data source browser into the document as text.</ahelp>If you select the <emph>Text</emph> option in the <emph>Insert Database Columns</emph> dialog, the content of the data selected in the data source browser is inserted into the document as text. In the dialog, you can decide which database fields or columns are transferred, and how the text is formatted.</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3154289" l10n="U" oldref="4">If several records are selected when you choose the <emph>Data to Text</emph> function, the mail merge fields will be inserted according to the number of records.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3155392" l10n="U" xml-lang="en-US" oldref="2">Text</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12080000.xhp b/helpcontent2/source/text/shared/02/12080000.xhp
index b45f5506ef..407ab8f2e7 100644
--- a/helpcontent2/source/text/shared/02/12080000.xhp
+++ b/helpcontent2/source/text/shared/02/12080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12090000.xhp b/helpcontent2/source/text/shared/02/12090000.xhp
index 73660376e8..6a8106add7 100644
--- a/helpcontent2/source/text/shared/02/12090000.xhp
+++ b/helpcontent2/source/text/shared/02/12090000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 12090000.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,53 +29,50 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textshared0212090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Standard Filter</title>
-<filename>/text/shared/02/12090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T15:41:19">UFI: changed name, see #i39874#</lastedited>
-</history>
-</meta>
-<body>
-<section id="standardfilter1">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3109850"><bookmark_value>default filters; databases</bookmark_value>
-<bookmark_value>databases; standard filters</bookmark_value>
-<bookmark_value>standard filters in databases</bookmark_value>
-</bookmark><comment>mw made "standard filters;..." a one level entry</comment>
+      <topic id="textshared0212090000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Standard Filter</title>
+         <filename>/text/shared/02/12090000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="standardfilter1">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3109850"><bookmark_value>default filters, see standard filters</bookmark_value>
+         <bookmark_value>databases; standard filters</bookmark_value>
+         <bookmark_value>standard filters;databases</bookmark_value>
+</bookmark><comment>mw converted "standard filters..." into a two level entry and "default filters;" into a cross reference</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_FILTERCRIT" id="bm_id3154894" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_FM_FILTERCRIT" id="bm_id2784060" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FilterCrit" id="bm_id3154094" localize="false"/>
-<paragraph role="heading" id="hd_id3109850" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/12090000.xhp" name="Standard Filter">Standard Filter</link></paragraph>
-<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="2"><variable id="standardfilter"><ahelp hid=".uno:FilterCrit">Allows you to set the filtering options.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3109850" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/shared/02/12090000.xhp" name="Standard Filter">Standard Filter</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143281" role="paragraph" l10n="U" oldref="2"><variable id="standardfilter"><ahelp hid=".uno:FilterCrit">Allows you to set the filtering options.</ahelp>
 </variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="8">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</paragraph>
-<section id="systandardfilter">
-<table id="tbl_id3152924">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="E">
-<image id="img_id3147291" src="res/commandimagelist/sc_formfiltered.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="U" oldref="8">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</paragraph>
+      <section id="systandardfilter">
+         <table id="tbl_id3152924">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="E">
+<image id="img_id3147291" src="res/commandimagelist/sc_formfiltered.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147291">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149183" xml-lang="en-US" l10n="U" oldref="3">Standard Filter</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149183" role="paragraph" l10n="U" oldref="3">Standard Filter</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="filterdialog">
-<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="6">$[officename] saves the current filter settings for the next time that you open this dialog.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="C"><link href="text/shared/02/12030000.xhp" name="AutoFilter">AutoFilter</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      </section>
+      <section id="filterdialog">
+         <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="U" oldref="6">$[officename] saves the current filter settings for the next time that you open this dialog.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="C"><link href="text/shared/02/12030000.xhp" name="AutoFilter">AutoFilter</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12090100.xhp b/helpcontent2/source/text/shared/02/12090100.xhp
index 0575be96c8..7c0a8a0810 100644
--- a/helpcontent2/source/text/shared/02/12090100.xhp
+++ b/helpcontent2/source/text/shared/02/12090100.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12090100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,74 +27,72 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0212090100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Filter</title>
-<filename>/text/shared/02/12090100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T12:30:05">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textshared0212090100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Standard Filter</title>
+         <filename>/text/shared/02/12090100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_FILTER" id="bm_id9065823" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DataFilterStandardFilter" id="bm_id3154232" localize="false"/>
-<paragraph role="heading" id="hd_id3151097" xml-lang="en-US" level="1" l10n="U" oldref="1">Filter</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DataFilterStandardFilter">Specifies the logical conditions to filter your table data.</ahelp> This dialog is called <emph>Standard Filter</emph> in Spreadsheet documents and <emph>Filter</emph> in database tables or database forms. The <emph>Filter</emph> dialog does not contain the <emph>More</emph> button.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000409.xhp#dnfitdf"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1">Standard Filter</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:DataFilterStandardFilter">Specifies the logical conditions to filter your table data.</ahelp> This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the <emph>More Options</emph> button.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000409.xhp#dnfitdf"/>
+      </section>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="paragraph" id="par_idN105EE" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/guide/filters.xhp#filters"/>
-</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105EE" role="paragraph" l10n="NEW">
+         <embedvar href="text/scalc/guide/filters.xhp#filters"/>
+      </paragraph>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="3">Filter criteria</paragraph>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">You can define a filter by indicating the type of line, the name of the field, a logical condition and a value or a combination of arguments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_OP1" id="bm_id3153683" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_OP2" id="bm_id3147577" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND2" id="bm_id3155892" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3" id="bm_id3150774" localize="false"/>
-<paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Operator</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD1" id="bm_id3153682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD2" id="bm_id3155942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD3" id="bm_id3150693" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD1" id="bm_id3153345" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD2" id="bm_id3155535" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3" id="bm_id3148538" localize="false"/>
-<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="7">Field name</paragraph>
-<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND1" id="bm_id3149811" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND2" id="bm_id3153760" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND3" id="bm_id3153126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP1" id="bm_id3159270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP2" id="bm_id3148990" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3" id="bm_id3153252" localize="false"/>
-<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="3" l10n="U" oldref="9">Condition</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL1" id="bm_id3155136" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL2" id="bm_id3148492" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL3" id="bm_id3150276" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE1" id="bm_id3146949" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE2" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3" id="bm_id3159400" localize="false"/>
-<paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="11">Value</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3">Specifies a value to filter the field.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="14">The<emph> Value </emph>list box contains all possible values for the specified <emph>Field name</emph> . Choose the value to be used in the filter. You can also choose the <emph>- empty -</emph> or <emph>-not empty -</emph> entries..</paragraph>
-<paragraph role="paragraph" id="par_id3156118" xml-lang="en-US" l10n="U" oldref="15">If you use the filter function in database tables or forms, then type the value in the <emph>Value </emph>text box to be used for filtering.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155555" role="heading" level="2" l10n="U" oldref="3">Filter criteria</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="4">You can define a filter by indicating the type of line, the name of the field, a logical condition and a value or a combination of arguments.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_OP1" id="bm_id3153683" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_OP2" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2" id="bm_id3155892" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3" id="bm_id3150774" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149751" role="heading" level="2" l10n="U" oldref="5">Operator</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1" id="bm_id3153682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1" id="bm_id3153345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2" id="bm_id3155535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3" id="bm_id3148538" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="7">Field name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="8"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND1" id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND2" id="bm_id3153760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND3" id="bm_id3153126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1" id="bm_id3159270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2" id="bm_id3148990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3" id="bm_id3153252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="9">Condition</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2" id="bm_id3148492" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3" id="bm_id3150276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1" id="bm_id3146949" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2" id="bm_id3153700" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3" id="bm_id3159400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149166" role="heading" level="2" l10n="U"
+                 oldref="11">Value</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="12"><ahelp hid="DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3">Specifies a value to filter the field.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150976" role="paragraph" l10n="U" oldref="14">The<emph> Value </emph>list box contains all possible values for the specified <emph>Field name</emph> . Choose the value to be used in the filter. You can also choose the <emph>- empty -</emph> or <emph>-not empty -</emph> entries..</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156118" role="paragraph" l10n="U" oldref="15">If you use the filter function in database tables or forms, then type the value in the <emph>Value </emph>text box to be used for filtering.</paragraph>
 <switch select="appl">
 <case select="CALC">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="16">The <emph>Filter</emph> dialog does not contain the <emph>Options</emph> button.</paragraph>
-<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/scalc/01/12040201.xhp" name="More&gt;&gt;">More&gt;&gt;</link></paragraph>
-<embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
+<paragraph xml-lang="en-US" id="hd_id3153061" role="heading" level="2" l10n="U"
+                 oldref="13"><link href="text/scalc/01/12040201.xhp" name="More Options">More Options</link></paragraph>
+      <embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
 </case>
 </switch>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12090101.xhp b/helpcontent2/source/text/shared/02/12090101.xhp
index f299a8c57c..414780557e 100755
--- a/helpcontent2/source/text/shared/02/12090101.xhp
+++ b/helpcontent2/source/text/shared/02/12090101.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 12090101.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,114 +31,115 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0212090101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Comparison Operators</title>
-<filename>/text/shared/02/12090101.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>comparisons;operators in default filter dialog</bookmark_value>
-<bookmark_value>operators; default filters</bookmark_value>
-<bookmark_value>default filters; comparison operators</bookmark_value>
-<bookmark_value>filters; comparison operators</bookmark_value>
-<bookmark_value>equal sign, see also operators</bookmark_value>
-</bookmark><comment>mw added "equal sign,..."</comment><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="1" l10n="U" oldref="1">Comparison Operators</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="2">The following comparative operators can be set under <emph>Condition</emph> in the <emph>Default Filter</emph> dialog.</paragraph>
-<table id="tbl_id3149760">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="3">
-<emph>Comparative operator</emph>
-</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="4">
-<emph>Effect</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="5">Equal (=)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Shows values equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="7">Less than (&lt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153761" xml-lang="en-US" l10n="U" oldref="8">Shows values less than the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146807" xml-lang="en-US" l10n="U" oldref="9">Greater than (&gt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="U" oldref="10">Shows values greater than the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="11">Less than or equal to (&lt; =)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154381" xml-lang="en-US" l10n="U" oldref="12">Shows values that are less than or equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="13">Greater than or equal to (&gt; =)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="14">Shows values that are greater than or equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="15">Not equal (&lt; &gt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="16">Shows the values not equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="17">Largest</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="18">Shows the N (numeric value as parameter) largest values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="19">Smallest</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161657" xml-lang="en-US" l10n="U" oldref="20">Shows the N (numeric value as parameter) smallest values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="21">Largest %</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161645" xml-lang="en-US" l10n="U" oldref="22">Shows the largest N% (numeric value as parameter) of the total values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="23">Smallest %</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="24">Shows the smallest N% (numeric value as parameter) of the entire values.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</body>
-</helpdocument>
+      <topic id="textshared0212090101xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Comparison Operators</title>
+         <filename>/text/shared/02/12090101.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>comparisons;operators in standard filter dialog</bookmark_value>
+      <bookmark_value>operators;standard filters</bookmark_value>
+      <bookmark_value>standard filters;comparison operators</bookmark_value>
+      <bookmark_value>filters; comparison operators</bookmark_value>
+      <bookmark_value>equal sign, see also operators</bookmark_value>
+</bookmark><comment>mw added "equal sign,..."</comment><comment>MW changed "default filters;" into "standard filters;"</comment><comment>mw changed "comparisons;" and "operators;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3148983" role="heading" level="1" l10n="U" oldref="1">Comparison Operators</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="2">The following comparative operators can be set under <item type="menuitem">Condition</item> in the <item type="menuitem">Standard Filter</item> dialog.</paragraph>
+      <table id="tbl_id3149760">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145313" role="paragraph" l10n="U" oldref="3">
+                  <emph>Comparative operator</emph>
+               </paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147089" role="paragraph" l10n="U" oldref="4">
+                  <emph>Effect</emph>
+               </paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="5">Equal (=)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146797" role="paragraph" l10n="U" oldref="6">Shows values equal to the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="7">Less than (&lt;)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153761" role="paragraph" l10n="U" oldref="8">Shows values less than the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146807" role="paragraph" l10n="U" oldref="9">Greater than (&gt;)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154852" role="paragraph" l10n="U" oldref="10">Shows values greater than the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155342" role="paragraph" l10n="U" oldref="11">Less than or equal to (&lt; =)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154381" role="paragraph" l10n="U" oldref="12">Shows values that are less than or equal to the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153823" role="paragraph" l10n="U" oldref="13">Greater than or equal to (&gt; =)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154143" role="paragraph" l10n="U" oldref="14">Shows values that are greater than or equal to the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154811" role="paragraph" l10n="U" oldref="15">Not equal (&lt; &gt;)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="16">Shows the values not equal to the condition.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="17">Largest</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159413" role="paragraph" l10n="U" oldref="18">Shows the N (numeric value as parameter) largest values.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151054" role="paragraph" l10n="U" oldref="19">Smallest</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3161657" role="paragraph" l10n="U" oldref="20">Shows the N (numeric value as parameter) smallest values.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="21">Largest %</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3161645" role="paragraph" l10n="U" oldref="22">Shows the largest N% (numeric value as parameter) of the total values.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="23">Smallest %</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="24">Shows the smallest N% (numeric value as parameter) of the entire values.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12100000.xhp b/helpcontent2/source/text/shared/02/12100000.xhp
index af0ab19886..6952ce16b8 100644
--- a/helpcontent2/source/text/shared/02/12100000.xhp
+++ b/helpcontent2/source/text/shared/02/12100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12100000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12100100.xhp b/helpcontent2/source/text/shared/02/12100100.xhp
index 0f1a3aeb90..00246a74e1 100644
--- a/helpcontent2/source/text/shared/02/12100100.xhp
+++ b/helpcontent2/source/text/shared/02/12100100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12100100.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 82159826fd..2fab2c7ac6 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12100200.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,284 +32,301 @@
  
 	
 <meta>
-<topic id="textshared0212100200xml" indexer="include">
-<title id="tit" xml-lang="en-US">Find Record</title>
-<filename>/text/shared/02/12100200.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0212100200xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Find Record</title>
+         <filename>/text/shared/02/12100200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146936"><bookmark_value>tables in databases; searching</bookmark_value>
-<bookmark_value>forms; browsing</bookmark_value>
-<bookmark_value>records; searching in databases</bookmark_value>
-<bookmark_value>searching; databases</bookmark_value>
-<bookmark_value>databases; searching records</bookmark_value>
+      <bookmark_value>forms; browsing</bookmark_value>
+      <bookmark_value>records; searching in databases</bookmark_value>
+      <bookmark_value>searching; databases</bookmark_value>
+      <bookmark_value>databases; searching records</bookmark_value>
 </bookmark><comment>mw changed" database tables;" to "tables in databases;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_FM_SEARCH" id="bm_id9750501" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RecSearch" id="bm_id3154812" localize="false"/>
 <section id="findrecord">
-<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="datensatzsuche"><link href="text/shared/02/12100200.xhp" name="Find Record">Find Record</link>
+         <paragraph xml-lang="en-US" id="hd_id3146936" role="heading" level="1" l10n="U" oldref="1"><variable id="datensatzsuche"><link href="text/shared/02/12100200.xhp" name="Find Record">Find Record</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchentext"><ahelp hid=".uno:RecSearch" visibility="hidden">Searches database tables and forms.</ahelp>In forms or database tables, you can search through data fields, list boxes, and check boxes for specific values. 
+         <paragraph xml-lang="en-US" id="par_id3147588" role="paragraph" l10n="U" oldref="2"><variable id="suchentext"><ahelp hid=".uno:RecSearch" visibility="hidden">Searches database tables and forms.</ahelp>In forms or database tables, you can search through data fields, list boxes, and check boxes for specific values. 
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000450.xhp#datensuchen"/>
-</section>
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="U" oldref="3">When searching a table, the data fields of the current table are searched. When searching in a form, the data fields of the table linked with the form are searched.</paragraph>
-<paragraph role="tip" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="111">The search described here is carried out by <item type="productname">%PRODUCTNAME</item>. If you want to use the SQL server to search in a database, then you should use the <link href="text/shared/02/12110000.xhp" name="Form-based Filters">Form-based Filters</link> icon on the <link href="text/shared/main0213.xhp" name="Form Bar">Form Bar</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="110">The search function is also available for table controls. When calling the search function from a table control, you can search each column of the table control corresponding to the database columns of the linked database table.</paragraph>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="2" l10n="U" oldref="112">Search for</paragraph>
-<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="113">Specifies the type of search.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000450.xhp#datensuchen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="U" oldref="3">When searching a table, the data fields of the current table are searched. When searching in a form, the data fields of the table linked with the form are searched.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153394" role="tip" l10n="U" oldref="111">The search described here is carried out by <item type="productname">%PRODUCTNAME</item>. If you want to use the SQL server to search in a database, then you should use the <link href="text/shared/02/12110000.xhp" name="Form-based Filters">Form-based Filters</link> icon on the <link href="text/shared/main0213.xhp" name="Form Bar">Form Bar</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="110">The search function is also available for table controls. When calling the search function from a table control, you can search each column of the table control corresponding to the database columns of the linked database table.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="2" l10n="U"
+                 oldref="112">Search for</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153527" role="paragraph" l10n="U" oldref="113">Specifies the type of search.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_TEXT" id="bm_id3154317" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/>
-<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="6">Text:</paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT">Enter the search term in the box or select it from the list.</ahelp> The text under the cursor is already copied into the <emph>Text</emph> combo box. Note that while running a search in a form, tabs and line breaks cannot be processed.</paragraph>
-<paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8">Your search terms will be saved as long as the table or the formula document is open. If you are running more than one search and you would like to repeat the search term, you can select a previously used search term from the combo box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/>
-<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="114">Field content is NULL</paragraph>
-<paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="115"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL">Specifies that fields will be found that contain no data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="116">Field content is not NULL</paragraph>
-<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="117"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL">Specifies that fields will be found that contain data.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="2" l10n="U" oldref="9">Where to search</paragraph>
-<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="10">Specifies the fields for the search.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM" id="bm_id3150670" localize="false"/>
-<paragraph role="heading" id="hd_id3154564" xml-lang="en-US" level="3" l10n="U" oldref="105">Form</paragraph>
-<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="106"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM">Specifies the logical form in which you want the search to take place.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="107">The<emph> Form </emph>combo box is only visible if the current document is a form document with more than one logical form. It does not appear during a search in tables or queries.</paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="108">Form documents may contain multiple logical forms. These are individual form components, which are each linked to a table.</paragraph>
-<paragraph role="paragraph" id="par_id3145086" xml-lang="en-US" l10n="U" oldref="109">The <emph>Form</emph> combo box contains the names of all logical forms for which controls exist.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153683" role="heading" level="2" l10n="U" oldref="6">Text:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154823" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT">Enter the search term in the box or select it from the list.</ahelp> The text under the cursor is already copied into the <emph>Text</emph> combo box. Note that while running a search in a form, tabs and line breaks cannot be processed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148539" role="paragraph" l10n="U" oldref="8">Your search terms will be saved as long as the table or the formula document is open. If you are running more than one search and you would like to repeat the search term, you can select a previously used search term from the combo box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153662" role="heading" level="2" l10n="U"
+                 oldref="114">Field content is NULL</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153543" role="paragraph" l10n="U" oldref="115"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL">Specifies that fields will be found that contain no data.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="2" l10n="U"
+                 oldref="116">Field content is not NULL</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143270" role="paragraph" l10n="U" oldref="117"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL">Specifies that fields will be found that contain data.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156153" role="heading" level="2" l10n="U" oldref="9">Where to search</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="10">Specifies the fields for the search.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM" id="bm_id3150670" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154564" role="heading" level="2" l10n="U"
+                 oldref="105">Form</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159176" role="paragraph" l10n="U" oldref="106"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM">Specifies the logical form in which you want the search to take place.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155434" role="note" l10n="U" oldref="107">The<emph> Form </emph>combo box is only visible if the current document is a form document with more than one logical form. It does not appear during a search in tables or queries.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="108">Form documents may contain multiple logical forms. These are individual form components, which are each linked to a table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145086" role="paragraph" l10n="U" oldref="109">The <emph>Form</emph> combo box contains the names of all logical forms for which controls exist.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_ALLFIELDS" id="bm_id3149047" localize="false"/>
-<paragraph role="heading" id="hd_id3159414" xml-lang="en-US" level="3" l10n="U" oldref="11">All Fields</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_SEARCH_ALLFIELDS">Searches through all fields.</ahelp> If you are running a search in a table, all fields in the table will be searched. If you are running a search in a form, all fields of the logical form (entered under <emph>Form</emph>) will be searched. If you are running a search in a table control field, all columns that are linked to a valid database table field will be searched.</paragraph>
-<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="13">Note that the fields of the current logical form do not have to be identical to the fields of the form document. If the form document contains fields that point to multiple data sources (that is, multiple logical forms), the <emph>All Fields</emph> option will only search for the fields linked to data sources in the form document.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159414" role="heading" level="2" l10n="U"
+                 oldref="11">All Fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_SEARCH_ALLFIELDS">Searches through all fields.</ahelp> If you are running a search in a table, all fields in the table will be searched. If you are running a search in a form, all fields of the logical form (entered under <emph>Form</emph>) will be searched. If you are running a search in a table control field, all columns that are linked to a valid database table field will be searched.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151054" role="paragraph" l10n="U" oldref="13">Note that the fields of the current logical form do not have to be identical to the fields of the form document. If the form document contains fields that point to multiple data sources (that is, multiple logical forms), the <emph>All Fields</emph> option will only search for the fields linked to data sources in the form document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FIELDSELECTION" id="bm_id3153524" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD" id="bm_id3150400" localize="false"/>
-<paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="15">Single field</paragraph>
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD">Searches through a specified data field.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="2" l10n="U" oldref="17">Settings</paragraph>
-<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="U" oldref="18">Defines settings to control the search.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD" id="bm_id3150400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150865" role="heading" level="2" l10n="U"
+                 oldref="15">Single field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD">Searches through a specified data field.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="2" l10n="U"
+                 oldref="17">Settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="U" oldref="18">Defines settings to control the search.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_POSITION" id="bm_id3143233" localize="false"/>
-<paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="19">Position</paragraph>
-<paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_SEARCH_POSITION">Specifies the relationship of the search term and the field contents.</ahelp> The following options are available:</paragraph>
-<table id="tbl_id3155994">
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="21">anywhere in the field</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="22">Returns all fields containing the search pattern anywhere in the field.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="23">beginning of field</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="24">Returns all fields containing the search pattern at the beginning of the field.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="74">end of field</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="75">Returns all fields containing the search pattern at the end of the field.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="25">entire field</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="26">Returns all fields containing the search pattern as an exact match to the contents of the field.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3149809" role="heading" level="2" l10n="U"
+                 oldref="19">Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_SEARCH_POSITION">Specifies the relationship of the search term and the field contents.</ahelp> The following options are available:</paragraph>
+      <table id="tbl_id3155994">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156280" role="tablecontent" l10n="U" oldref="21">anywhere in the field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145744" role="tablecontent" l10n="U" oldref="22">Returns all fields containing the search pattern anywhere in the field.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148451" role="tablecontent" l10n="U" oldref="23">beginning of field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155429" role="tablecontent" l10n="U" oldref="24">Returns all fields containing the search pattern at the beginning of the field.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155131" role="tablecontent" l10n="U" oldref="74">end of field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153726" role="tablecontent" l10n="U" oldref="75">Returns all fields containing the search pattern at the end of the field.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="U" oldref="25">entire field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154127" role="tablecontent" l10n="U" oldref="26">Returns all fields containing the search pattern as an exact match to the contents of the field.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="27">If the <emph>Wildcard expression</emph> check box is marked, this function is not available.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152886" role="note" l10n="U" oldref="27">If the <emph>Wildcard expression</emph> check box is marked, this function is not available.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FORMATTER" id="bm_id3154147" localize="false"/>
-<paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="28">Apply field format</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SEARCH_FORMATTER">Specifies that all field formats are considered when searching in the current document.</ahelp> Field formats are all visible formats that are created using the following possibilities:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="78">in table design mode for field properties,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="79">in data source view on column formatting,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152941" xml-lang="en-US" l10n="U" oldref="80">in forms on control properties.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3156736" xml-lang="en-US" l10n="U" oldref="81">If the <emph>Apply field format</emph> box is marked, the data source view of the table or form is searched using the formatting set there. If the box is not marked, the database is searched using the formatting saved in the database.</paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="82">Example:</paragraph>
-<paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="83">You have a date field, which is saved in "DD.MM.YY" format in the database (for example, 17.02.65). The format of the entry is changed in the data source view to "DD. MMM YYYY" (17 Feb 1965). Following this example, a record containing February 17 is only found when the <emph>Apply field format</emph> option is on:</paragraph>
-<table id="tbl_id3151076">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="84">Apply field format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="85">Search pattern</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3083279" xml-lang="en-US" l10n="U" oldref="86">on</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155850" xml-lang="en-US" l10n="U" oldref="87">"Feb" is returned, but not "2".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148590" xml-lang="en-US" l10n="U" oldref="88">off</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="89">"2" is returned, but not "Feb".</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3149664" role="heading" level="2" l10n="U"
+                 oldref="28">Apply field format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_SEARCH_FORMATTER">Specifies that all field formats are considered when searching in the current document.</ahelp> Field formats are all visible formats that are created using the following possibilities:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150103" role="listitem" l10n="U" oldref="78">in table design mode for field properties,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150488" role="listitem" l10n="U" oldref="79">in data source view on column formatting,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152941" role="listitem" l10n="U" oldref="80">in forms on control properties.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3156736" role="paragraph" l10n="U" oldref="81">If the <emph>Apply field format</emph> box is marked, the data source view of the table or form is searched using the formatting set there. If the box is not marked, the database is searched using the formatting saved in the database.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="82">Example:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149959" role="paragraph" l10n="CHG" oldref="83">You have a date field, which is saved in "DD.MM.YY" format in the database (for example, 17.02.65). The format of the entry is changed in the data source view to "DD MMM YYYY" (17 Feb 1965). Following this example, a record containing February 17 is only found when the <emph>Apply field format</emph> option is on:</paragraph>
+      <table id="tbl_id3151076">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150593" role="tablehead" l10n="U" oldref="84">Apply field format</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145253" role="tablehead" l10n="U" oldref="85">Search pattern</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3083279" role="tablecontent" l10n="U" oldref="86">on</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155850" role="tablecontent" l10n="U" oldref="87">"Feb" is returned, but not "2".</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148590" role="tablecontent" l10n="U" oldref="88">off</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153418" role="tablecontent" l10n="U" oldref="89">"2" is returned, but not "Feb".</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="90">It is recommended that you always search using field formatting.</paragraph>
-<paragraph role="paragraph" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="91">The following examples show possible issues when searching without field formatting. These issues depend on the database used and only occur for certain internal default formatting:</paragraph>
-<table id="tbl_id3156320">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="92">Search results</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="93">Cause</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="94">"5" returns "14:00:00" as a time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="95">Time fields are not defined for dBASE databases and must be simulated. To internally display the time "14:00:00", a 5 is necessary.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="96">"00:00:00" returns all records of a standard date field</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="97">The database stores a date value internally using a combined date/time field.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="98">"45.79" does not return "45.79" although the <emph>entire field</emph> option is selected under <emph>Position</emph>.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155518" xml-lang="en-US" l10n="U" oldref="99">The view shown does not match what is stored internally. For example, if value 45.789 is stored in the database as a field of type Number/Double and the shown formatting is set to display only two decimals, "45.79" is only returned in searches with field formatting.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3151321" role="paragraph" l10n="U" oldref="90">It is recommended that you always search using field formatting.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149401" role="paragraph" l10n="U" oldref="91">The following examples show possible issues when searching without field formatting. These issues depend on the database used and only occur for certain internal default formatting:</paragraph>
+      <table id="tbl_id3156320">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152971" role="tablehead" l10n="U" oldref="92">Search results</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154273" role="tablehead" l10n="U" oldref="93">Cause</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153836" role="tablecontent" l10n="U" oldref="94">"5" returns "14:00:00" as a time</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156332" role="tablecontent" l10n="U" oldref="95">Time fields are not defined for dBASE databases and must be simulated. To internally display the time "14:00:00", a 5 is necessary.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157965" role="tablecontent" l10n="U" oldref="96">"00:00:00" returns all records of a standard date field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146081" role="tablecontent" l10n="U" oldref="97">The database stores a date value internally using a combined date/time field.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155764" role="tablecontent" l10n="U" oldref="98">"45.79" does not return "45.79" although the <emph>entire field</emph> option is selected under <emph>Position</emph>.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155518" role="tablecontent" l10n="U" oldref="99">The view shown does not match what is stored internally. For example, if value 45.789 is stored in the database as a field of type Number/Double and the shown formatting is set to display only two decimals, "45.79" is only returned in searches with field formatting.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="100">In this case, standard formatting is formatting that refers to the internally stored data. It is not always visible to the user, especially if it is used for simulating data types (for example, time fields in dBASE databases). This depends on the database used and the individual data type. Searching with field formatting is appropriate if you only want to find what is actually shown. This includes fields of type Date, Time, Date/Time and Number/Double.</paragraph>
-<paragraph role="paragraph" id="par_id3154507" xml-lang="en-US" l10n="U" oldref="31">However, searching without <emph>Apply field format </emph>is appropriate for larger databases with no formatting issues, because it is faster.</paragraph>
-<paragraph role="paragraph" id="par_id3153355" xml-lang="en-US" l10n="CHG" oldref="118">If you are searching the values of check boxes, and <emph>Apply field format</emph> is on, then you will receive a "1" for marked check boxes, a "0" for unmarked check boxes, and an empty string for undefined (tristate) check boxes. If the search has been carried out with <emph>Apply field format</emph> set to off, you will see the language-dependent default values "TRUE" or "FALSE".</paragraph>
-<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US" l10n="U" oldref="119">If you use <emph>Apply field format</emph> when searching in list boxes, you find the text displayed in list boxes. If you do not use <emph>Apply field format,</emph> you will find the contents corresponding to the standard field format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148481" role="paragraph" l10n="U" oldref="100">In this case, standard formatting is formatting that refers to the internally stored data. It is not always visible to the user, especially if it is used for simulating data types (for example, time fields in dBASE databases). This depends on the database used and the individual data type. Searching with field formatting is appropriate if you only want to find what is actually shown. This includes fields of type Date, Time, Date/Time and Number/Double.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154507" role="paragraph" l10n="U" oldref="31">However, searching without <emph>Apply field format </emph>is appropriate for larger databases with no formatting issues, because it is faster.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153355" role="paragraph" l10n="CHG" oldref="118">If you are searching the values of check boxes, and <emph>Apply field format</emph> is on, then you will receive a "1" for marked check boxes, a "0" for unmarked check boxes, and an empty string for undefined (tristate) check boxes. If the search has been carried out with <emph>Apply field format</emph> set to off, you will see the language-dependent default values "TRUE" or "FALSE".</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150995" role="paragraph" l10n="U" oldref="119">If you use <emph>Apply field format</emph> when searching in list boxes, you find the text displayed in list boxes. If you do not use <emph>Apply field format,</emph> you will find the contents corresponding to the standard field format.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_CASE" id="bm_id3156717" localize="false"/>
-<paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
-<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_SEARCH_CASE">Specifies that upper and lower case are taken into consideration during the search.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150387" role="heading" level="2" l10n="U"
+                 oldref="32">Match case</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159267" role="paragraph" l10n="U" oldref="33"><ahelp hid="HID_SEARCH_CASE">Specifies that upper and lower case are taken into consideration during the search.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BACKWARD" id="bm_id3151101" localize="false"/>
-<paragraph role="heading" id="hd_id3145297" xml-lang="en-US" level="3" l10n="U" oldref="34">Search backwards</paragraph>
-<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SEARCH_BACKWARD">Specifies that the search process will run in reverse direction, from the last to the first record.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145297" role="heading" level="2" l10n="U"
+                 oldref="34">Search backwards</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151249" role="paragraph" l10n="U" oldref="35"><ahelp hid="HID_SEARCH_BACKWARD">Specifies that the search process will run in reverse direction, from the last to the first record.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_STARTOVER" id="bm_id3166447" localize="false"/>
-<paragraph role="heading" id="hd_id3152484" xml-lang="en-US" level="3" l10n="U" oldref="36">From top / From bottom</paragraph>
-<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_SEARCH_STARTOVER">Restarts the search. A forward search restarts with the first record. A backwards search restarts with the last record.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152484" role="heading" level="2" l10n="U"
+                 oldref="36">From top / From bottom</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156316" role="paragraph" l10n="U" oldref="37"><ahelp hid="HID_SEARCH_STARTOVER">Restarts the search. A forward search restarts with the first record. A backwards search restarts with the last record.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_WILDCARD" id="bm_id3156713" localize="false"/>
-<paragraph role="heading" id="hd_id3163724" xml-lang="en-US" level="3" l10n="U" oldref="38">Wildcard expression</paragraph>
-<paragraph role="paragraph" id="par_id3149255" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="HID_SEARCH_WILDCARD" visibility="hidden">Allows a search with a * or ? wildcard.</ahelp> You can use the following wildcards:</paragraph>
-<table id="tbl_id3151187">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3146317" xml-lang="en-US" l10n="U" oldref="39">Wildcards</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="40">Meaning</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="41">Example</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="42">?</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148874" xml-lang="en-US" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="44">"?loppy" returns "Floppy"</paragraph>
-<paragraph role="tablecontent" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="65">"M?ller" returns, for example, Miller and Moller</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148803" xml-lang="en-US" l10n="U" oldref="45">*</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="47">"*-*" returns "ZIP-Drive" and "CD-ROM"</paragraph>
-<paragraph role="tablecontent" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="66">"M*er" returns all entries starting with an "M" and ending in "er" (for example, Miller, Moller, Mather)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3163724" role="heading" level="2" l10n="U"
+                 oldref="38">Wildcard expression</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149255" role="paragraph" l10n="U" oldref="64"><ahelp hid="HID_SEARCH_WILDCARD" visibility="hidden">Allows a search with a * or ? wildcard.</ahelp> You can use the following wildcards:</paragraph>
+      <table id="tbl_id3151187">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146317" role="tablehead" l10n="U" oldref="39">Wildcards</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150298" role="tablehead" l10n="U" oldref="40">Meaning</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153919" role="tablehead" l10n="U" oldref="41">Example</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3158411" role="tablecontent" l10n="U" oldref="42">?</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148874" role="tablecontent" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150365" role="tablecontent" l10n="U" oldref="44">"?loppy" returns "Floppy"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3166426" role="tablecontent" l10n="U" oldref="65">"M?ller" returns, for example, Miller and Moller</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148803" role="tablecontent" l10n="U" oldref="45">*</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156138" role="tablecontent" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146135" role="tablecontent" l10n="U" oldref="47">"*-*" returns "ZIP-Drive" and "CD-ROM"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155582" role="tablecontent" l10n="U" oldref="66">"M*er" returns all entries starting with an "M" and ending in "er" (for example, Miller, Moller, Mather)</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression </emph>is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression</emph> is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/>
-<paragraph role="heading" id="hd_id3147130" xml-lang="en-US" level="3" l10n="U" oldref="49">Regular expression</paragraph>
-<paragraph role="paragraph" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154718" xml-lang="en-US" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
-<table id="tbl_id3148682">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153705" xml-lang="en-US" l10n="U" oldref="68">Search with wildcard expression</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="69">Search with regular expressions</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151045" xml-lang="en-US" l10n="U" oldref="70">?</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150384" xml-lang="en-US" l10n="U" oldref="71">.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153793" xml-lang="en-US" l10n="U" oldref="72">*</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="73">.*</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
-<embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
-<embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
-<embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
-<embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
-<embed href="text/shared/optionen/01150200.xhp#asia"/>
-<paragraph role="heading" id="hd_id3150861" xml-lang="en-US" level="2" l10n="U" oldref="101">State</paragraph>
-<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="102">The <emph>State</emph> line shows the records returned by the search. If the search reaches the end (or the beginning) of a table, the search is automatically continued at the other end.</paragraph>
-<paragraph role="paragraph" id="par_id3163720" xml-lang="en-US" l10n="U" oldref="103">In very large databases, finding the record in reverse search order can take some time. In this case, the status bar informs you that the records are still being counted.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147130" role="heading" level="2" l10n="U"
+                 oldref="49">Regular expression</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item> <link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154718" role="paragraph" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
+      <table id="tbl_id3148682">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153705" role="tablehead" l10n="U" oldref="68">Search with wildcard expression</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149209" role="tablehead" l10n="U" oldref="69">Search with regular expressions</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151045" role="tablecontent" l10n="U" oldref="70">?</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150384" role="tablecontent" l10n="U" oldref="71">.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153793" role="tablecontent" l10n="U" oldref="72">*</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150428" role="tablecontent" l10n="U" oldref="73">.*</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+      <embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
+      <embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
+      <embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
+      <embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
+      <embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
+      <embed href="text/shared/optionen/01150200.xhp#asia"/>
+      <paragraph xml-lang="en-US" id="hd_id3150861" role="heading" level="2" l10n="U"
+                 oldref="101">State</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154477" role="paragraph" l10n="U" oldref="102">The <emph>State</emph> line shows the records returned by the search. If the search reaches the end (or the beginning) of a table, the search is automatically continued at the other end.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163720" role="paragraph" l10n="U" oldref="103">In very large databases, finding the record in reverse search order can take some time. In this case, the status bar informs you that the records are still being counted.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_SEARCH" id="bm_id3149494" localize="false"/>
-<paragraph role="heading" id="hd_id3147389" xml-lang="en-US" level="2" l10n="U" oldref="51">Search / Cancel</paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_SEARCH_BTN_SEARCH" visibility="hidden">Starts or cancels the search.</ahelp> If the search is successfully completed, the corresponding field in the table is highlighted. You can continue the search by clicking the <emph>Search</emph> button again. You can cancel a search process by clicking the <emph>Cancel</emph> button.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147389" role="heading" level="2" l10n="U"
+                 oldref="51">Search / Cancel</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="52"><ahelp hid="HID_SEARCH_BTN_SEARCH" visibility="hidden">Starts or cancels the search.</ahelp> If the search is successfully completed, the corresponding field in the table is highlighted. You can continue the search by clicking the <emph>Search</emph> button again. You can cancel a search process by clicking the <emph>Cancel</emph> button.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_CLOSE" id="bm_id3152453" localize="false"/>
-<paragraph role="heading" id="hd_id3145080" xml-lang="en-US" level="2" l10n="U" oldref="53">Close</paragraph>
-<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="HID_SEARCH_BTN_CLOSE">Closes the dialog. The settings of the last search will be saved until you quit <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="104">If several tables or forms are open, you can set different search options for each document. When you close the documents only the search options of the document last closed are saved.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145080" role="heading" level="2" l10n="U"
+                 oldref="53">Close</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" l10n="U" oldref="54"><ahelp hid="HID_SEARCH_BTN_CLOSE">Closes the dialog. The settings of the last search will be saved until you quit <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151183" role="paragraph" l10n="U" oldref="104">If several tables or forms are open, you can set different search options for each document. When you close the documents only the search options of the document last closed are saved.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12110000.xhp b/helpcontent2/source/text/shared/02/12110000.xhp
index 0263216768..c835a135e0 100644
--- a/helpcontent2/source/text/shared/02/12110000.xhp
+++ b/helpcontent2/source/text/shared/02/12110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12110000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12120000.xhp b/helpcontent2/source/text/shared/02/12120000.xhp
index a8f1bfcac0..1ee9d126d9 100644
--- a/helpcontent2/source/text/shared/02/12120000.xhp
+++ b/helpcontent2/source/text/shared/02/12120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12120000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12130000.xhp b/helpcontent2/source/text/shared/02/12130000.xhp
index 2275c7525f..41d370180c 100644
--- a/helpcontent2/source/text/shared/02/12130000.xhp
+++ b/helpcontent2/source/text/shared/02/12130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12130000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12140000.xhp b/helpcontent2/source/text/shared/02/12140000.xhp
index 9b44d8458b..ef08b06a09 100644
--- a/helpcontent2/source/text/shared/02/12140000.xhp
+++ b/helpcontent2/source/text/shared/02/12140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 12140000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/13010000.xhp b/helpcontent2/source/text/shared/02/13010000.xhp
index 28f452b222..a91fe00d7e 100755
--- a/helpcontent2/source/text/shared/02/13010000.xhp
+++ b/helpcontent2/source/text/shared/02/13010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13010000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/13020000.xhp b/helpcontent2/source/text/shared/02/13020000.xhp
index 2bc26884c0..ad69f45dae 100644
--- a/helpcontent2/source/text/shared/02/13020000.xhp
+++ b/helpcontent2/source/text/shared/02/13020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13020000.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14010000.xhp b/helpcontent2/source/text/shared/02/14010000.xhp
index f9120ec222..77d64ecb0e 100644
--- a/helpcontent2/source/text/shared/02/14010000.xhp
+++ b/helpcontent2/source/text/shared/02/14010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 <section id="abfrage">
 <bookmark xml-lang="en-US" branch="hid/SID_FM_EXECUTE" id="bm_id940934" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:SbaExecuteSql" id="bm_id3149495" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12307" id="bm_id9750968" localize="false"/>
+<!-- removed HID 12307 -->
 <paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/14010000.xhp" name="Run">Run Query</link></paragraph>
 <paragraph role="paragraph" id="par_id3109850" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:SbaExecuteSql">Runs the SQL query and displays the query result.</ahelp> The <emph>Run Query</emph> function does not save the query.</paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/02/14020000.xhp b/helpcontent2/source/text/shared/02/14020000.xhp
index 42bd207bf1..164963140e 100644
--- a/helpcontent2/source/text/shared/02/14020000.xhp
+++ b/helpcontent2/source/text/shared/02/14020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14020100.xhp b/helpcontent2/source/text/shared/02/14020100.xhp
index b49029ba74..99d09c82c1 100644
--- a/helpcontent2/source/text/shared/02/14020100.xhp
+++ b/helpcontent2/source/text/shared/02/14020100.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14020100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,40 +27,43 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Add Tables</title>
-<filename>/text/shared/02/14020100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-10T15:05:14">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Add Tables</title>
+         <filename>/text/shared/02/14020100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154788"><bookmark_value>tables in databases; adding to queries</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AddTable" id="bm_id3143284" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_TABLELIST" id="bm_id3159224" localize="false"/>
-<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="1" l10n="U" oldref="1">Add Tables</paragraph>
-<paragraph role="paragraph" id="par_id3152821" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task. 
+<paragraph xml-lang="en-US" id="hd_id3154788" role="heading" level="1" l10n="U" oldref="1">Add Tables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152821" role="paragraph" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task. 
 </variable> When creating a query or a new table presentation, select the corresponding table to which the query or table presentation should refer. When working with relational databases, select the tables between which you want to build relationships.</paragraph>
-<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
-</section>
-<paragraph role="heading" id="hd_id3154927" xml-lang="en-US" level="2" l10n="U" oldref="5">Table</paragraph>
-<paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="9">Table name</paragraph>
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE" id="bm_id3155941" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="11">Add</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154927" role="heading" level="2" l10n="U" oldref="5">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES" id="bm_id0305200912070094" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id030520091208059" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only tables.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES" id="bm_id0305200912074475" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0305200912080616" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only queries.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150713" role="heading" level="3" l10n="U" oldref="9">Table name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE" id="bm_id3155941" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+                 oldref="11">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_CLOSE" id="bm_id3153311" localize="false"/>
-<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="13">Close</paragraph>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153527" role="heading" level="2" l10n="U"
+                 oldref="13">Close</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/14020200.xhp b/helpcontent2/source/text/shared/02/14020200.xhp
index 592ff5b847..c46c88b2ff 100644
--- a/helpcontent2/source/text/shared/02/14020200.xhp
+++ b/helpcontent2/source/text/shared/02/14020200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14020200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14030000.xhp b/helpcontent2/source/text/shared/02/14030000.xhp
index e887adfff2..5da2dc8e1c 100644
--- a/helpcontent2/source/text/shared/02/14030000.xhp
+++ b/helpcontent2/source/text/shared/02/14030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14040000.xhp b/helpcontent2/source/text/shared/02/14040000.xhp
index 9cc903a54e..253bbf6328 100644
--- a/helpcontent2/source/text/shared/02/14040000.xhp
+++ b/helpcontent2/source/text/shared/02/14040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14050000.xhp b/helpcontent2/source/text/shared/02/14050000.xhp
index 8df9b1689a..eacee49500 100644
--- a/helpcontent2/source/text/shared/02/14050000.xhp
+++ b/helpcontent2/source/text/shared/02/14050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14060000.xhp b/helpcontent2/source/text/shared/02/14060000.xhp
index d9829c8c83..1daff45803 100644
--- a/helpcontent2/source/text/shared/02/14060000.xhp
+++ b/helpcontent2/source/text/shared/02/14060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14070000.xhp b/helpcontent2/source/text/shared/02/14070000.xhp
index ee40c40ab5..0244bf3695 100644
--- a/helpcontent2/source/text/shared/02/14070000.xhp
+++ b/helpcontent2/source/text/shared/02/14070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14070000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/18010000.xhp b/helpcontent2/source/text/shared/02/18010000.xhp
index d13ffb8d4d..09f06322df 100644
--- a/helpcontent2/source/text/shared/02/18010000.xhp
+++ b/helpcontent2/source/text/shared/02/18010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/18030000.xhp b/helpcontent2/source/text/shared/02/18030000.xhp
index 379998d6e9..de1f8f1be8 100644
--- a/helpcontent2/source/text/shared/02/18030000.xhp
+++ b/helpcontent2/source/text/shared/02/18030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/19090000.xhp b/helpcontent2/source/text/shared/02/19090000.xhp
index ec8e91268d..1d26d700fc 100644
--- a/helpcontent2/source/text/shared/02/19090000.xhp
+++ b/helpcontent2/source/text/shared/02/19090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19090000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20020000.xhp b/helpcontent2/source/text/shared/02/20020000.xhp
index 850be4885d..d9e667b450 100644
--- a/helpcontent2/source/text/shared/02/20020000.xhp
+++ b/helpcontent2/source/text/shared/02/20020000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20020000.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,22 +27,18 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0220020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Current Page Style</title>
-<filename>/text/shared/02/20020000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-29T11:51:24">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="aktuelleseitenvorlage">
+      <topic id="textshared0220020000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Current Page Style</title>
+         <filename>/text/shared/02/20020000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="aktuelleseitenvorlage">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>page styles;editing/applying with statusbar</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/FN_STAT_TEMPLATE" id="bm_id5848088" localize="false"/>
@@ -53,16 +47,16 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:StatusPageStyle" id="bm_id3154840" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_STATUS_LAYOUT" id="bm_id2005580" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:LayoutStatus" id="bm_id3155934" localize="false"/>
-<paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/20020000.xhp" name="Current Page Style">Current Page Style</link></paragraph>
-<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:LayoutStatus">Displays the current Page Style. Double-click to edit the style, right-click to select another style.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="3"><switchinline select="appl"><caseinline select="WRITER">Double-click the<emph> Page Style field </emph>to open the <link href="text/swriter/01/05040000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. In the context menu of this field, you can apply a Page Style. 
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/20020000.xhp" name="Current Page Style">Current Page Style</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:LayoutStatus">Displays the current Page Style. Double-click to edit the style, right-click to select another style.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149283" role="paragraph" l10n="CHG" oldref="3"><switchinline select="appl"><caseinline select="WRITER">Double-click the<emph> Page Style field </emph>to open the <link href="text/swriter/01/05040000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. In the context menu of this field, you can apply a Page Style. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="appl"><caseinline select="CALC">Double-click the <emph>Page Style</emph> field to open the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. 
+      <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="4"><switchinline select="appl"><caseinline select="CALC">Double-click the <emph>Page Style</emph> field to open the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="IMPRESS">Double-click the<emph> Page Style </emph>field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Page Style</link> dialog in which you can select the style for the active page. You can select a different paper format or background. 
+      <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="IMPRESS">Double-click this field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Slide Design</link> dialog in which you can select the style for the current slide. You can select a different paper format or background. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="DRAW">Double-click the<emph> Page Style </emph>field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Page Style</link> dialog in which you select the style for the current page. You can select a different paper format or background. 
+      <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="DRAW">Double-click this field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Slide Design</link> dialog in which you select the style for the current page. You can select a different paper format or background. 
 </caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/20030000.xhp b/helpcontent2/source/text/shared/02/20030000.xhp
index 748db9ef6b..f8aaa67d89 100644
--- a/helpcontent2/source/text/shared/02/20030000.xhp
+++ b/helpcontent2/source/text/shared/02/20030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20040000.xhp b/helpcontent2/source/text/shared/02/20040000.xhp
index a33473129f..2593488be0 100644
--- a/helpcontent2/source/text/shared/02/20040000.xhp
+++ b/helpcontent2/source/text/shared/02/20040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20050000.xhp b/helpcontent2/source/text/shared/02/20050000.xhp
index 397d6b02d4..770f55655f 100644
--- a/helpcontent2/source/text/shared/02/20050000.xhp
+++ b/helpcontent2/source/text/shared/02/20050000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20050000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20060000.xhp b/helpcontent2/source/text/shared/02/20060000.xhp
index 71bbdb4056..edbc99323c 100644
--- a/helpcontent2/source/text/shared/02/20060000.xhp
+++ b/helpcontent2/source/text/shared/02/20060000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20060000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20090000.xhp b/helpcontent2/source/text/shared/02/20090000.xhp
index 2f2bf853a4..ccab10a4d1 100644
--- a/helpcontent2/source/text/shared/02/20090000.xhp
+++ b/helpcontent2/source/text/shared/02/20090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20090000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 <body>
   
   
-  <bookmark xml-lang="en-US" branch="hid/SID_CURRENTTIME" id="bm_id5594664" localize="false"/><!-- HID added by script -->
+  <!-- removed HID SID_CURRENTTIME --><!-- HID added by script -->
 <bookmark branch="hid/.uno:CurrentTime" xml-lang="en-US" id="bm_id3150620"/><paragraph id="hd_id3152823" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/20090000.xhp" name="Time">Time</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3151299" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CurrentTime" visibility="visible">Displays the current time.</ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/02/20100000.xhp b/helpcontent2/source/text/shared/02/20100000.xhp
index 9e4b6e83a9..f60f6511b9 100644
--- a/helpcontent2/source/text/shared/02/20100000.xhp
+++ b/helpcontent2/source/text/shared/02/20100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 20100000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 <body>
   
   
-  <bookmark xml-lang="en-US" branch="hid/SID_CURRENTDATE" id="bm_id2884865" localize="false"/><!-- HID added by script -->
+  <!-- removed HID SID_CURRENTDATE --><!-- HID added by script -->
 <bookmark branch="hid/.uno:CurrentDate" xml-lang="en-US" id="bm_id3156045"/><paragraph id="hd_id3146902" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/20100000.xhp" name="Date">Date</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154926" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CurrentDate" visibility="visible">Displays the current date.</ahelp></paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/02/24010000.xhp b/helpcontent2/source/text/shared/02/24010000.xhp
index 14bd7c2dd0..f8a3f26025 100644
--- a/helpcontent2/source/text/shared/02/24010000.xhp
+++ b/helpcontent2/source/text/shared/02/24010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24010000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 </meta>
 <body>
 <section id="filter">
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFTBX_FILTERS" id="bm_id3154840" localize="false"/>
+<!-- removed HID SID_GRAFTBX_FILTERS -->
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterToolbox" id="bm_id3153255" localize="false"/>
 <paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/24010000.xhp" name="Graphic Filter Bar">Graphic Filter Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:GraphicFilterToolbox">This icon on the <emph>Picture</emph> bar opens the <emph>Graphic Filter</emph> bar, where you can use various filters on the selected picture.</ahelp></paragraph>
@@ -66,7 +63,7 @@
 </table>
 
 </section>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_INVERT" id="bm_id3155941" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_INVERT -->
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_INVERT" id="bm_id6161795" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterInvert" id="bm_id3156426" localize="false"/>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="C">Invert</paragraph>
@@ -84,7 +81,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_SMOOTH" id="bm_id3156192" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_SMOOTH -->
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SMOOTH" id="bm_id6076636" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterSmooth" id="bm_id3149578" localize="false"/>
 <paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="C">Smooth</paragraph>
@@ -102,7 +99,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_SHARPEN" id="bm_id3153320" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_SHARPEN -->
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SHARPEN" id="bm_id4973428" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterSharpen" id="bm_id3155449" localize="false"/>
 <paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="2" l10n="C">Sharpen</paragraph>
@@ -120,7 +117,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_REMOVENOISE" id="bm_id3147560" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_REMOVENOISE -->
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_REMOVENOISE" id="bm_id4672819" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterRemoveNoise" id="bm_id3156435" localize="false"/>
 <paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2" l10n="C">Remove Noise</paragraph>
@@ -157,10 +154,10 @@
 
 <paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="76">Parameters</paragraph>
 <paragraph role="paragraph" id="par_id3147352" xml-lang="en-US" l10n="U" oldref="77">Specifies the degree and type of solarization.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD" id="bm_id3151353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD" id="bm_id3151353" localize="false"/>
 <paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="78">Threshold Value</paragraph>
 <paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD">Specifies the degree of brightness, in percent, above which the pixels are to be solarized.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_CBX_INVERT" id="bm_id3147318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT" id="bm_id3147318" localize="false"/>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="80">Invert</paragraph>
 <paragraph role="paragraph" id="par_id3146921" xml-lang="en-US" l10n="CHG" oldref="81"><ahelp hid="SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_CBX_INVERT">Specifies to also invert all pixels.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SEPIA" id="bm_id2629364" localize="false"/>
@@ -180,7 +177,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA" id="bm_id3151116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA" id="bm_id3151116" localize="false"/>
 <paragraph role="heading" id="hd_id3156443" xml-lang="en-US" level="3" l10n="U" oldref="84">Aging Degree</paragraph>
 <paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA">Defines the intensity of aging, in percent. At 0% you see the gray values of all pixels. At 100% only the red color channel remains.</ahelp><comment>ufi: cannot see any difference between 0% and 100% aging here...</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_POSTER" id="bm_id6359144" localize="false"/>
@@ -200,7 +197,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER" id="bm_id3148878" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER" id="bm_id3148878" localize="false"/>
 <paragraph role="heading" id="hd_id3156736" xml-lang="en-US" level="3" l10n="U" oldref="89">Poster Colors</paragraph>
 <paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="90"><ahelp hid="SVX_NUMERICFIELD_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER">Specifies the number of colors to which the image is to be reduced.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_POPART" id="bm_id5192722" localize="false"/>
@@ -275,13 +272,13 @@
 
 <paragraph role="heading" id="hd_id3153922" xml-lang="en-US" level="3" l10n="U" oldref="106">Element resolution</paragraph>
 <paragraph role="paragraph" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="107">Determines the number of pixels to be joined into rectangles.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH" id="bm_id3145790" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH" id="bm_id3145790" localize="false"/>
 <paragraph role="heading" id="hd_id3159336" xml-lang="en-US" level="3" l10n="U" oldref="108">Width</paragraph>
 <paragraph role="paragraph" id="par_id3150939" xml-lang="en-US" l10n="U" oldref="109"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH">Defines the width of the individual tiles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT" id="bm_id3147131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT" id="bm_id3147131" localize="false"/>
 <paragraph role="heading" id="hd_id3150827" xml-lang="en-US" level="3" l10n="U" oldref="110">Height</paragraph>
 <paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT">Defines the height of the individual tiles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_CBX_EDGES" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES" id="bm_id3154573" localize="false"/>
 <paragraph role="heading" id="hd_id3157972" xml-lang="en-US" level="3" l10n="U" oldref="121">Enhance edges</paragraph>
 <paragraph role="paragraph" id="par_id3151216" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_CBX_EDGES">Enhances, or sharpens, the edges of the object.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/02/24020000.xhp b/helpcontent2/source/text/shared/02/24020000.xhp
index c1f93e3e6e..080e169841 100644
--- a/helpcontent2/source/text/shared/02/24020000.xhp
+++ b/helpcontent2/source/text/shared/02/24020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24020000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24030000.xhp b/helpcontent2/source/text/shared/02/24030000.xhp
index f45672d9a3..2ae9b5ff66 100644
--- a/helpcontent2/source/text/shared/02/24030000.xhp
+++ b/helpcontent2/source/text/shared/02/24030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24040000.xhp b/helpcontent2/source/text/shared/02/24040000.xhp
index 71e02a903e..3bf60938e9 100644
--- a/helpcontent2/source/text/shared/02/24040000.xhp
+++ b/helpcontent2/source/text/shared/02/24040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24050000.xhp b/helpcontent2/source/text/shared/02/24050000.xhp
index 3ad8758c97..6d6817b70b 100644
--- a/helpcontent2/source/text/shared/02/24050000.xhp
+++ b/helpcontent2/source/text/shared/02/24050000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24060000.xhp b/helpcontent2/source/text/shared/02/24060000.xhp
index 410dc42f16..2b7546f4a3 100644
--- a/helpcontent2/source/text/shared/02/24060000.xhp
+++ b/helpcontent2/source/text/shared/02/24060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24070000.xhp b/helpcontent2/source/text/shared/02/24070000.xhp
index 93eee4e35f..a97f6bc36d 100644
--- a/helpcontent2/source/text/shared/02/24070000.xhp
+++ b/helpcontent2/source/text/shared/02/24070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24070000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24080000.xhp b/helpcontent2/source/text/shared/02/24080000.xhp
index 326e9fbab2..598c9fd41c 100644
--- a/helpcontent2/source/text/shared/02/24080000.xhp
+++ b/helpcontent2/source/text/shared/02/24080000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24090000.xhp b/helpcontent2/source/text/shared/02/24090000.xhp
index 5d2a9badbe..a206fda9a2 100644
--- a/helpcontent2/source/text/shared/02/24090000.xhp
+++ b/helpcontent2/source/text/shared/02/24090000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24090000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24100000.xhp b/helpcontent2/source/text/shared/02/24100000.xhp
index 1c864313c4..e25adbf071 100644
--- a/helpcontent2/source/text/shared/02/24100000.xhp
+++ b/helpcontent2/source/text/shared/02/24100000.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 24100000.xhp,v $
- *
- * $Revision: 1.6.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/basicshapes.xhp b/helpcontent2/source/text/shared/02/basicshapes.xhp
index 7dd7844728..1aa9b0178e 100644
--- a/helpcontent2/source/text/shared/02/basicshapes.xhp
+++ b/helpcontent2/source/text/shared/02/basicshapes.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicshapes.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/blockarrows.xhp b/helpcontent2/source/text/shared/02/blockarrows.xhp
index 0bee68f501..52d6f61665 100644
--- a/helpcontent2/source/text/shared/02/blockarrows.xhp
+++ b/helpcontent2/source/text/shared/02/blockarrows.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: blockarrows.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/callouts.xhp b/helpcontent2/source/text/shared/02/callouts.xhp
index cdb4298224..0a72393e00 100644
--- a/helpcontent2/source/text/shared/02/callouts.xhp
+++ b/helpcontent2/source/text/shared/02/callouts.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: callouts.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/colortoolbar.xhp b/helpcontent2/source/text/shared/02/colortoolbar.xhp
index 470007dd21..848abad730 100755
--- a/helpcontent2/source/text/shared/02/colortoolbar.xhp
+++ b/helpcontent2/source/text/shared/02/colortoolbar.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colortoolbar.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/flowcharts.xhp b/helpcontent2/source/text/shared/02/flowcharts.xhp
index f1f34aa4ee..43130a0157 100644
--- a/helpcontent2/source/text/shared/02/flowcharts.xhp
+++ b/helpcontent2/source/text/shared/02/flowcharts.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flowcharts.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/fontwork.xhp b/helpcontent2/source/text/shared/02/fontwork.xhp
index e5a0d5d73e..befc720f87 100644
--- a/helpcontent2/source/text/shared/02/fontwork.xhp
+++ b/helpcontent2/source/text/shared/02/fontwork.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index 73c361ee7c..52463f6be3 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -197,4 +193,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/02/more_controls.xhp b/helpcontent2/source/text/shared/02/more_controls.xhp
index b7420ce9c4..bf050a937c 100644
--- a/helpcontent2/source/text/shared/02/more_controls.xhp
+++ b/helpcontent2/source/text/shared/02/more_controls.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: more_controls.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index 57ac1e1dd8..bd7f629612 100755
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
 <paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting.</ahelp><comment>i93691</comment></paragraph>
 <section id="howtoget">
 <paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW">Click the <emph>Format Paintbrush</emph> icon 
-<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Standard</emph> toolbar. </paragraph>
 </section>
 <section id="sypaintbrush">
@@ -56,7 +53,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">
-<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/stars.xhp b/helpcontent2/source/text/shared/02/stars.xhp
index 3ee781c658..663befa35e 100644
--- a/helpcontent2/source/text/shared/02/stars.xhp
+++ b/helpcontent2/source/text/shared/02/stars.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stars.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/symbolshapes.xhp b/helpcontent2/source/text/shared/02/symbolshapes.xhp
index 4a6a75f968..8b6f641433 100644
--- a/helpcontent2/source/text/shared/02/symbolshapes.xhp
+++ b/helpcontent2/source/text/shared/02/symbolshapes.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: symbolshapes.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 5f7dfe45ce..56b326df25 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.12.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,1006 +32,1023 @@
  
 	
 <meta>
-<topic id="textshared0401010000xml" indexer="include">
-<title id="tit" xml-lang="en-US">General Shortcut Keys in $[officename]</title>
-<filename>/text/shared/04/01010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="allgemeine">
+      <topic id="textshared0401010000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">General Shortcut Keys in $[officename]</title>
+         <filename>/text/shared/04/01010000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="allgemeine">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149991"><bookmark_value>keyboard;general commands</bookmark_value>
-<bookmark_value>shortcut keys;general</bookmark_value>
-<bookmark_value>text input fields</bookmark_value>
-<bookmark_value>AutoComplete function in text and list boxes</bookmark_value>
-<bookmark_value>macros; interrupting</bookmark_value>
+         <bookmark_value>shortcut keys;general</bookmark_value>
+         <bookmark_value>text input fields</bookmark_value>
+         <bookmark_value>AutoComplete function in text and list boxes</bookmark_value>
+         <bookmark_value>macros; interrupting</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="common_keys"><link href="text/shared/04/01010000.xhp" name="General Shortcut Keys in $[officename]">General Shortcut Keys in $[officename]</link>
+<paragraph xml-lang="en-US" id="hd_id3149991" role="heading" level="1" l10n="U" oldref="1"><variable id="common_keys"><link href="text/shared/04/01010000.xhp" name="General Shortcut Keys in $[officename]">General Shortcut Keys in $[officename]</link>
 </variable></paragraph>
-</section>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
+      </section>
+      <embed href="text/shared/00/00000099.xhp#keys"/>
+      <paragraph xml-lang="en-US" id="hd_id3150702" role="heading" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151299" role="paragraph" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
 </caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then press the O key. Release both keys after the dialog appears.</paragraph>
-<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="5">When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available.</paragraph>
-<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
+      <paragraph xml-lang="en-US" id="par_id3153894" role="paragraph" l10n="U" oldref="5">When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Calling Menus With Shortcut Keys</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">
+      <paragraph xml-lang="en-US" id="par_id3152425" role="paragraph" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Some of the characters shown on the menu bar are underlined. You can access these menus directly by pressing the underlined character together with the ALT key. Once the menu is opened, you will again find underlined characters. You can access these menu items directly by simply pressing the underlined character key.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="2" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="10">There is always one element highlighted in any given dialog - usually shown by a broken frame. This element, which can be either a button, an option field, an entry in a list box or a check box, is said to have the focus on it. If the focal point is a button, pressing Enter runs it as if you had clicked it. A check box is toggled by pressing the spacebar. If an option field has the focus, use the arrow keys to change the activated option field in that area. Use the Tab key to go from one element or area to the next one, use Shift + Tab to go in the reverse direction.</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="11">Pressing ESC closes the dialog without saving changes. <switchinline select="sys"><caseinline select="MAC">
+      <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="2" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="U" oldref="10">There is always one element highlighted in any given dialog - usually shown by a broken frame. This element, which can be either a button, an option field, an entry in a list box or a check box, is said to have the focus on it. If the focal point is a button, pressing Enter runs it as if you had clicked it. A check box is toggled by pressing the spacebar. If an option field has the focus, use the arrow keys to change the activated option field in that area. Use the Tab key to go from one element or area to the next one, use Shift + Tab to go in the reverse direction.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="11">Pressing ESC closes the dialog without saving changes. <switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>If you place the focus on a button, not only will you see the dotted line framing the name of the button, but also a thicker shadow under the button selected. This indicates that if you exit the dialog by pressing the Enter key, it is the equivalent of pressing that button itself.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147209" xml-lang="en-US" level="2" l10n="U" oldref="105">Shortcut Keys for Mouse Actions</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="2" l10n="U"
+                 oldref="105">Shortcut Keys for Mouse Actions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> to access additional functionality. The modified functions available when holding down keys during drag-and-drop are indicated by the mouse pointer changing form. When selecting files or other objects, the modifier keys can extend the selection - the functions are explained where applicable. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
 </caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="127">Practical Text Input Fields</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="129">You can open a context menu, which contains some of the most often-used commands.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+                 oldref="127">Practical Text Input Fields</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145673" role="listitem" l10n="U" oldref="129">You can open a context menu, which contains some of the most often-used commands.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150085" role="listitem" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog to insert one or more special characters.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153088" role="listitem" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to select the entire text. Use the right or left arrow key to remove the selection.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="132">Double-click a word to select it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149785" xml-lang="en-US" l10n="CHG" oldref="133">A triple-click in a text input field selects the entire field. A triple-click in a text document selects the current sentence.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="132">Double-click a word to select it.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149785" role="listitem" l10n="CHG" oldref="133">A triple-click in a text input field selects the entire field. A triple-click in a text document selects the current sentence.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150976" role="listitem" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del to delete everything from the cursor position to the end of the word.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147264" role="listitem" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and right or left arrow key, the cursor will jump from word to word; if you also hold down the Shift key, one word after the other is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="136">INSRT is used to switch between the insert mode and the overwrite mode and back again.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148757" xml-lang="en-US" l10n="U" oldref="137">Drag-and-drop can be used within and outside of a text box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154346" role="listitem" l10n="U" oldref="136">INSRT is used to switch between the insert mode and the overwrite mode and back again.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148757" role="listitem" l10n="U" oldref="137">Drag-and-drop can be used within and outside of a text box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150358" role="listitem" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z shortcut keys are used to undo modifications one step at a time; the text will then have the status it had before the first change.</paragraph>
-</listitem>
-</list>
-<section id="autocompurl">
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a 
+         </listitem>
+      </list>
+      <section id="autocompurl">
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a 
 </caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive 
 </caseinline><defaultinline>in your home folder</defaultinline></switchinline> that starts with the letter "a".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="CHG" oldref="140">Use the down arrow key to scroll through the other files and directories. Use the right arrow key to also display an existing subdirectory in the URL field. Quick AutoComplete is available if you press the End key after entering part of the URL. Once you find the document or directory you want, press Enter.</paragraph>
-</listitem>
-</list>
-</section>
-<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="163">Interrupting Macros</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3144760" role="listitem" l10n="CHG" oldref="140">Use the down arrow key to scroll through the other files and directories. Use the right arrow key to also display an existing subdirectory in the URL field. Quick AutoComplete is available if you press the End key after entering part of the URL. Once you find the document or directory you want, press Enter.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+                 oldref="163">Interrupting Macros</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q.</paragraph>
-<paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2" l10n="U" oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="13">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.) 
+      <paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2" l10n="U"
+                 oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="13">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.) 
 </caseinline></switchinline></paragraph>
-<table id="tbl_id3555101">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3153367" xml-lang="en-US" l10n="U" oldref="14">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="15">
+      <table id="tbl_id3555101">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153367" role="tablehead" l10n="U" oldref="14">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156060" role="tablehead" l10n="U" oldref="15">
 <emph>Effect</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149260" xml-lang="en-US" l10n="U" oldref="16">Enter key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153727" xml-lang="en-US" l10n="U" oldref="17">Activates the focused button in a dialog</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153142" xml-lang="en-US" l10n="U" oldref="18">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="19">Terminates the action or dialog. If in $[officename] Help: goes up one level.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151118" xml-lang="en-US" l10n="U" oldref="20">Spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="21">Toggles the focused check box in a dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152791" xml-lang="en-US" l10n="U" oldref="22">Arrow keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="23">Changes the active control field in an option section of a dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154188" xml-lang="en-US" l10n="U" oldref="24">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="25">Advances focus to the next section or element in a dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153363" xml-lang="en-US" l10n="U" oldref="26">Shift + Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="27">Moves the focus to the previous section or element in a dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149260" role="tablecontent" l10n="U" oldref="16">Enter key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153727" role="tablecontent" l10n="U" oldref="17">Activates the focused button in a dialog</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153142" role="tablecontent" l10n="U" oldref="18">Esc</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155412" role="tablecontent" l10n="U" oldref="19">Terminates the action or dialog. If in $[officename] Help: goes up one level.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151118" role="tablecontent" l10n="U" oldref="20">Spacebar</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147435" role="tablecontent" l10n="U" oldref="21">Toggles the focused check box in a dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152791" role="tablecontent" l10n="U" oldref="22">Arrow keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151113" role="tablecontent" l10n="U" oldref="23">Changes the active control field in an option section of a dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154188" role="tablecontent" l10n="U" oldref="24">Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146975" role="tablecontent" l10n="U" oldref="25">Advances focus to the next section or element in a dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153363" role="tablecontent" l10n="U" oldref="26">Shift + Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149665" role="tablecontent" l10n="U" oldref="27">Moves the focus to the previous section or element in a dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147317" role="tablecontent" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="154">Opens the list of the control field currently selected in a dialog. These shortcut keys apply not only to combo boxes but also to icon buttons with pop-up menus. Close an opened list by pressing the Escape key.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159348" xml-lang="en-US" l10n="U" oldref="172">Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144765" xml-lang="en-US" l10n="U" oldref="171">Deletes the selected item(s) into the recycle bin.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149379" xml-lang="en-US" l10n="U" oldref="174">Shift+Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149412" xml-lang="en-US" l10n="U" oldref="173">Deletes the selected item(s) without putting them in the recycle bin.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154792" xml-lang="en-US" l10n="U" oldref="176">Backspace</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="175">When a folder is shown: goes up one level (goes back)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10BC0" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10BE8" xml-lang="en-US" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153224" role="tablecontent" l10n="U" oldref="154">Opens the list of the control field currently selected in a dialog. These shortcut keys apply not only to combo boxes but also to icon buttons with pop-up menus. Close an opened list by pressing the Escape key.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3159348" role="tablecontent" l10n="U" oldref="172">Del</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144765" role="tablecontent" l10n="U" oldref="171">Deletes the selected item(s) into the recycle bin.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149379" role="tablecontent" l10n="U" oldref="174">Shift+Del</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149412" role="tablecontent" l10n="U" oldref="173">Deletes the selected item(s) without putting them in the recycle bin.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154792" role="tablecontent" l10n="U" oldref="176">Backspace</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149582" role="tablecontent" l10n="U" oldref="175">When a folder is shown: goes up one level (goes back)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Control</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149488" role="tablecontent" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149912" xml-lang="en-US" l10n="CHG" oldref="142">When positioned at the start of a header, a tab is inserted.<comment>UFI: fixes #i21687#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148573" xml-lang="en-US" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="288">Activates the selected OLE object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146990" xml-lang="en-US" l10n="U" oldref="290">Enter (if a drawing object or text object is selected)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153839" xml-lang="en-US" l10n="U" oldref="291">Activates text input mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149912" role="tablecontent" l10n="CHG" oldref="142">When positioned at the start of a header, a tab is inserted.<comment>UFI: fixes #i21687#</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148573" role="tablecontent" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154162" role="tablecontent" l10n="U" oldref="288">Activates the selected OLE object.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146990" role="tablecontent" l10n="U" oldref="290">Enter (if a drawing object or text object is selected)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153839" role="tablecontent" l10n="U" oldref="291">Activates text input mode.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156437" role="tablecontent" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="29">Opens a document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149123" role="tablecontent" l10n="U" oldref="29">Opens a document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155064" role="tablecontent" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="31">Saves the current document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150749" role="tablecontent" l10n="U" oldref="31">Saves the current document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156377" role="tablecontent" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="33">Creates a new document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155764" role="tablecontent" l10n="U" oldref="33">Creates a new document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151357" role="tablecontent" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="177">Opens <emph>Templates and Documents</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="177">Opens <emph>Templates and Documents</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150043" role="tablecontent" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="35">Prints document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147100" role="tablecontent" l10n="U" oldref="35">Prints document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149258" role="tablecontent" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="114">Exits application.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153966" role="tablecontent" l10n="U" oldref="114">Exits application.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153538" role="tablecontent" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="37">Cuts out the selected elements.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166450" role="tablecontent" l10n="U" oldref="37">Cuts out the selected elements.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155904" role="tablecontent" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148537" xml-lang="en-US" l10n="U" oldref="39">Copies the selected items.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148537" role="tablecontent" l10n="U" oldref="39">Copies the selected items.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156318" role="tablecontent" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147005" role="tablecontent" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id071620091225295" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command+Option 
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+V</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0716200912253022" role="tablecontent" l10n="NEW">Pastes unformatted text from the clipboard. The text is pasted using the format that exists at the insertion point.<comment>CWS mox01</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10F47" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+V</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10F4B" xml-lang="en-US" l10n="NEW">Opens the <emph>Paste Special</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10F4B" role="tablecontent" l10n="NEW">Opens the <emph>Paste Special</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153789" role="tablecontent" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="43">Selects all.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155581" role="tablecontent" l10n="U" oldref="43">Selects all.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149738" role="tablecontent" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45">Undoes last action.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147095" xml-lang="en-US" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="352">Redoes last action.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149816" role="tablecontent" l10n="U" oldref="45">Undoes last action.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150345" role="tablecontent" l10n="U" oldref="352">Redoes last action.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7297280" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Y</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id8709677" xml-lang="en-US" l10n="NEW">Repeats last command.<comment>[framework-features] new/SRC680_m221 : Shortcut for "Repeat"</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id8709677" role="tablecontent" l10n="NEW">Repeats last command.<comment>[framework-features] new/SRC680_m221 : Shortcut for "Repeat"</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3158414" role="tablecontent" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="166">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150090" role="tablecontent" l10n="U" oldref="166">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148800" role="tablecontent" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="168">Searches for the last entered search term.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154198" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149527" role="tablecontent" l10n="U" oldref="168">Searches for the last entered search term.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154198" role="tablecontent" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Ctrl+Shift+J</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150567" xml-lang="en-US" l10n="CHG" oldref="49"><switchinline select="sys"><caseinline select="MAC">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150567" role="tablecontent" l10n="CHG" oldref="49"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Toggles the view between fullscreen mode and normal mode in Writer or Calc</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151049" role="tablecontent" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+R</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148462" xml-lang="en-US" l10n="U" oldref="51">Redraws the document view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148462" role="tablecontent" l10n="U" oldref="51">Redraws the document view.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149035" role="tablecontent" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150665" xml-lang="en-US" l10n="CHG" oldref="350">Enable or disable the selection cursor in read-only text.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150665" role="tablecontent" l10n="CHG" oldref="350">Enable or disable the selection cursor in read-only text.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145588" role="tablecontent" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148753" xml-lang="en-US" l10n="U" oldref="91">The <emph>Italic</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also marked in italic.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148753" role="tablecontent" l10n="U" oldref="91">The <emph>Italic</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also marked in italic.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3166428" role="tablecontent" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150490" xml-lang="en-US" l10n="U" oldref="93">The <emph>Bold</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also put in bold.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150490" role="tablecontent" l10n="U" oldref="93">The <emph>Bold</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also put in bold.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154815" role="tablecontent" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153228" xml-lang="en-US" l10n="U" oldref="95">The <emph>Underlined</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also underlined.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153228" role="tablecontent" l10n="U" oldref="95">The <emph>Underlined</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also underlined.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3152891" xml-lang="en-US" level="2" l10n="U" oldref="60">Shortcut Keys Using the Function Keys</paragraph>
-<paragraph role="paragraph" id="par_id3152457" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="sys"><caseinline select="MAC">Not all of the function shortcut keys are available on the Mac. 
+      <paragraph xml-lang="en-US" id="hd_id3152891" role="heading" level="2" l10n="U"
+                 oldref="60">Shortcut Keys Using the Function Keys</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152457" role="paragraph" l10n="U" oldref="59"><switchinline select="sys"><caseinline select="MAC">Not all of the function shortcut keys are available on the Mac. 
 </caseinline></switchinline></paragraph>
-<table id="tbl_id1489608">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3149726" xml-lang="en-US" l10n="U" oldref="183">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153756" xml-lang="en-US" l10n="U" oldref="184">
+      <table id="tbl_id1489608">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149726" role="tablehead" l10n="U" oldref="183">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153756" role="tablehead" l10n="U" oldref="184">
 <emph>Effect</emph>
 </paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149404" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149404" role="tablecontent" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>F1</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145410" role="tablecontent" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Starts the $[officename] Help</defaultinline></switchinline></paragraph>
-<paragraph role="tablecontent" id="par_id3153697" xml-lang="en-US" l10n="U" oldref="152">In the $[officename] Help: jumps to main help page.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
+               <paragraph xml-lang="en-US" id="par_id3153697" role="tablecontent" l10n="U" oldref="152">In the $[officename] Help: jumps to main help page.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154951" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Shift + F1</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153309" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153309" role="tablecontent" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>Context Help</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159220" xml-lang="en-US" l10n="U" oldref="292">Shift+F2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="293">Turns on Extended Tips for the currently selected command, icon or control.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3159220" role="tablecontent" l10n="U" oldref="292">Shift+F2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151241" role="tablecontent" l10n="U" oldref="293">Turns on Extended Tips for the currently selected command, icon or control.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146871" role="tablecontent" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4 or <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+F4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="69">Closes the current document (close $[officename] when the last open document is closed)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154532" xml-lang="en-US" l10n="U" oldref="180">F6</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144506" xml-lang="en-US" l10n="U" oldref="179">Sets focus in next subwindow (for example, document/data source view)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3144771" xml-lang="en-US" l10n="U" oldref="182">Shift+F6</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147075" xml-lang="en-US" l10n="U" oldref="181">Sets focus in previous subwindow.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156191" xml-lang="en-US" l10n="U" oldref="294">F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156172" xml-lang="en-US" l10n="U" oldref="295">Activates the first menu (File menu)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159093" xml-lang="en-US" l10n="U" oldref="146">Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148606" xml-lang="en-US" l10n="U" oldref="147">Opens the context menu.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157978" role="tablecontent" l10n="U" oldref="69">Closes the current document (close $[officename] when the last open document is closed)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154532" role="tablecontent" l10n="U" oldref="180">F6</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144506" role="tablecontent" l10n="U" oldref="179">Sets focus in next subwindow (for example, document/data source view)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3144771" role="tablecontent" l10n="U" oldref="182">Shift+F6</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147075" role="tablecontent" l10n="U" oldref="181">Sets focus in previous subwindow.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156191" role="tablecontent" l10n="U" oldref="294">F10</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156172" role="tablecontent" l10n="U" oldref="295">Activates the first menu (File menu)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3159093" role="tablecontent" l10n="U" oldref="146">Shift+F10</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148606" role="tablecontent" l10n="U" oldref="147">Opens the context menu.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3153288" xml-lang="en-US" level="2" l10n="U" oldref="287">Shortcut keys in the Gallery</paragraph>
-<table id="tbl_id310678">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3156308" xml-lang="en-US" l10n="U" oldref="286">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149440" xml-lang="en-US" l10n="U" oldref="285">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149971" xml-lang="en-US" l10n="U" oldref="284">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="283">Moves between areas.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148971" xml-lang="en-US" l10n="U" oldref="282">Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154059" xml-lang="en-US" l10n="U" oldref="281">Moves between areas (backwards)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="hd_id3153288" role="heading" level="2" l10n="U"
+                 oldref="287">Shortcut keys in the Gallery</paragraph>
+      <table id="tbl_id310678">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156308" role="tablehead" l10n="U" oldref="286">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149440" role="tablehead" l10n="U" oldref="285">Result</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149971" role="tablecontent" l10n="U" oldref="284">Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153110" role="tablecontent" l10n="U" oldref="283">Moves between areas.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148971" role="tablecontent" l10n="U" oldref="282">Shift+Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154059" role="tablecontent" l10n="U" oldref="281">Moves between areas (backwards)</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3152368" xml-lang="en-US" level="3" l10n="U" oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
-<table id="tbl_id8934598">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN11555" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN1155B" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159192" xml-lang="en-US" l10n="U" oldref="279">Up arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152540" xml-lang="en-US" l10n="U" oldref="278">Moves the selection up one.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150892" xml-lang="en-US" l10n="U" oldref="277">Down arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151004" xml-lang="en-US" l10n="U" oldref="276">Moves the selection down.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="hd_id3152368" role="heading" level="2" l10n="U"
+                 oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
+      <table id="tbl_id8934598">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN11555" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1155B" role="tablehead" l10n="NEW">Result</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3159192" role="tablecontent" l10n="U" oldref="279">Up arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152540" role="tablecontent" l10n="U" oldref="278">Moves the selection up one.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150892" role="tablecontent" l10n="U" oldref="277">Down arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151004" role="tablecontent" l10n="U" oldref="276">Moves the selection down.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153976" role="tablecontent" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148652" xml-lang="en-US" l10n="U" oldref="273">Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="272">Opens a context menu.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146894" role="tablecontent" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148652" role="tablecontent" l10n="U" oldref="273">Shift+F10</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153250" role="tablecontent" l10n="U" oldref="272">Opens a context menu.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155614" role="tablecontent" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150099" xml-lang="en-US" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150099" role="tablecontent" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145755" role="tablecontent" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="268">Opens the <emph>Enter Title</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146776" role="tablecontent" l10n="U" oldref="268">Opens the <emph>Enter Title</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154642" role="tablecontent" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153653" xml-lang="en-US" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155946" xml-lang="en-US" l10n="U" oldref="265">Insert</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145372" xml-lang="en-US" l10n="U" oldref="264">Inserts a new theme</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153653" role="tablecontent" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155946" role="tablecontent" l10n="U" oldref="265">Insert</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145372" role="tablecontent" l10n="U" oldref="264">Inserts a new theme</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3150633" xml-lang="en-US" level="3" l10n="U" oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
-<table id="tbl_id9288308">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN116D6" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN116DC" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149343" xml-lang="en-US" l10n="U" oldref="262">Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153241" xml-lang="en-US" l10n="U" oldref="261">Jumps to the first entry.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148809" xml-lang="en-US" l10n="U" oldref="260">End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148902" xml-lang="en-US" l10n="U" oldref="259">Jumps to the last entry.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149382" xml-lang="en-US" l10n="U" oldref="258">Left Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="257">Selects the next Gallery element on the left.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152926" xml-lang="en-US" l10n="U" oldref="256">Right Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153802" xml-lang="en-US" l10n="U" oldref="255">Selects the next Gallery element on the right.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="254">Up Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="253">Selects the next Gallery element above.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147517" xml-lang="en-US" l10n="U" oldref="252">Down Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="251">Selects the next Gallery element below.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145602" xml-lang="en-US" l10n="U" oldref="250">Page Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147081" xml-lang="en-US" l10n="U" oldref="249">Scroll up one screen.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153045" xml-lang="en-US" l10n="U" oldref="355">Page Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150411" xml-lang="en-US" l10n="U" oldref="248">Scroll down one screen.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="hd_id3150633" role="heading" level="2" l10n="U"
+                 oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
+      <table id="tbl_id9288308">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN116D6" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN116DC" role="tablehead" l10n="NEW">Result</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149343" role="tablecontent" l10n="U" oldref="262">Home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153241" role="tablecontent" l10n="U" oldref="261">Jumps to the first entry.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148809" role="tablecontent" l10n="U" oldref="260">End</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148902" role="tablecontent" l10n="U" oldref="259">Jumps to the last entry.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149382" role="tablecontent" l10n="U" oldref="258">Left Arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150048" role="tablecontent" l10n="U" oldref="257">Selects the next Gallery element on the left.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152926" role="tablecontent" l10n="U" oldref="256">Right Arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153802" role="tablecontent" l10n="U" oldref="255">Selects the next Gallery element on the right.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150776" role="tablecontent" l10n="U" oldref="254">Up Arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149800" role="tablecontent" l10n="U" oldref="253">Selects the next Gallery element above.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147517" role="tablecontent" l10n="U" oldref="252">Down Arrow</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151223" role="tablecontent" l10n="U" oldref="251">Selects the next Gallery element below.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145602" role="tablecontent" l10n="U" oldref="250">Page Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147081" role="tablecontent" l10n="U" oldref="249">Scroll up one screen.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153045" role="tablecontent" l10n="U" oldref="355">Page Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150411" role="tablecontent" l10n="U" oldref="248">Scroll down one screen.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147278" role="tablecontent" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Insert</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153614" xml-lang="en-US" l10n="U" oldref="245">Inserts the selected object as a linked object into the current document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153614" role="tablecontent" l10n="U" oldref="245">Inserts the selected object as a linked object into the current document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155345" role="tablecontent" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153608" xml-lang="en-US" l10n="U" oldref="243">Inserts a copy of the selected object into the current document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153608" role="tablecontent" l10n="U" oldref="243">Inserts a copy of the selected object into the current document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3143278" role="tablecontent" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+T</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156370" xml-lang="en-US" l10n="U" oldref="241">Opens the <emph>Enter Title</emph> dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156370" role="tablecontent" l10n="U" oldref="241">Opens the <emph>Enter Title</emph> dialog.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145114" role="tablecontent" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146107" xml-lang="en-US" l10n="U" oldref="239">Switches between themes view and object view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147552" xml-lang="en-US" l10n="U" oldref="238">Spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145324" xml-lang="en-US" l10n="U" oldref="237">Switches between themes view and object view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148978" xml-lang="en-US" l10n="U" oldref="236">Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="235">Switches between themes view and object view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154108" xml-lang="en-US" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153294" xml-lang="en-US" l10n="U" oldref="233">Switches back to main overview.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146107" role="tablecontent" l10n="U" oldref="239">Switches between themes view and object view.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147552" role="tablecontent" l10n="U" oldref="238">Spacebar</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145324" role="tablecontent" l10n="U" oldref="237">Switches between themes view and object view.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148978" role="tablecontent" l10n="U" oldref="236">Enter</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155743" role="tablecontent" l10n="U" oldref="235">Switches between themes view and object view.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154108" role="tablecontent" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153294" role="tablecontent" l10n="U" oldref="233">Switches back to main overview.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="dbtable">
-<paragraph role="heading" id="hd_id3149722" xml-lang="en-US" level="2" l10n="CHG" oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
-<table id="tbl_id1178319">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN11906" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN1190C" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150963" xml-lang="en-US" l10n="U" oldref="331">Spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="332">Toggles row selection, except when the row is in edit mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
+      <section id="dbtable">
+         <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="2" l10n="CHG"
+                    oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
+         <table id="tbl_id1178319">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN11906" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1190C" role="tablehead" l10n="NEW">Result</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3150963" role="tablecontent" l10n="U" oldref="331">Spacebar</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146883" role="tablecontent" l10n="U" oldref="332">Toggles row selection, except when the row is in edit mode.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3149787" role="tablecontent" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="334">Toggles row selection</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147482" xml-lang="en-US" l10n="U" oldref="335">Shift+spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149319" xml-lang="en-US" l10n="U" oldref="336">Selects the current column</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149028" role="tablecontent" l10n="U" oldref="334">Toggles row selection</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3147482" role="tablecontent" l10n="U" oldref="335">Shift+spacebar</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149319" role="tablecontent" l10n="U" oldref="336">Selects the current column</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id1418805" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1743522" xml-lang="en-US" l10n="NEW">Moves pointer to the first row</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id1743522" role="tablecontent" l10n="NEW">Moves pointer to the first row</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id5994140" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7870113" xml-lang="en-US" l10n="NEW">Moves pointer to the last row</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id7870113" role="tablecontent" l10n="NEW">Moves pointer to the last row</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="zeichenobjekte">
-<paragraph role="heading" id="hd_id3147411" xml-lang="en-US" level="2" l10n="U" oldref="230">Shortcut Keys for Drawing Objects</paragraph>
-<table id="tbl_id1152073">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN1199F" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN119A5" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149684" xml-lang="en-US" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
+      </section>
+      <section id="zeichenobjekte">
+         <paragraph xml-lang="en-US" id="hd_id3147411" role="heading" level="2" l10n="U"
+                    oldref="230">Shortcut Keys for Drawing Objects</paragraph>
+         <table id="tbl_id1152073">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN1199F" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_idN119A5" role="tablehead" l10n="NEW">Result</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3149684" role="tablecontent" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150264" xml-lang="en-US" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155994" role="tablecontent" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3150264" role="tablecontent" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 and press Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154055" xml-lang="en-US" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149242" xml-lang="en-US" l10n="U" oldref="225">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157902" xml-lang="en-US" l10n="U" oldref="224">Selects the next Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149349" xml-lang="en-US" l10n="U" oldref="223">Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="222">Selects the previous Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154055" role="tablecontent" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3149242" role="tablecontent" l10n="U" oldref="225">Tab</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3157902" role="tablecontent" l10n="U" oldref="224">Selects the next Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3149349" role="tablecontent" l10n="U" oldref="223">Shift+Tab</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150836" role="tablecontent" l10n="U" oldref="222">Selects the previous Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3109846" role="tablecontent" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="220">Selects the first Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154276" role="tablecontent" l10n="U" oldref="220">Selects the first Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3145829" role="tablecontent" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3161664" xml-lang="en-US" l10n="U" oldref="218">Selects the last Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153099" xml-lang="en-US" l10n="U" oldref="217">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149009" xml-lang="en-US" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156271" xml-lang="en-US" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152818" xml-lang="en-US" l10n="U" oldref="339">Exit Handle Selection Mode and return to Object Selection Mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151258" xml-lang="en-US" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159162" xml-lang="en-US" l10n="U" oldref="191">Move the selected point (the snap-to-grid functions are temporarily disabled, but end points still snap to each other).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3161664" role="tablecontent" l10n="U" oldref="218">Selects the last Drawing Object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3153099" role="tablecontent" l10n="U" oldref="217">Esc</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149009" role="tablecontent" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3156271" role="tablecontent" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152818" role="tablecontent" l10n="U" oldref="339">Exit Handle Selection Mode and return to Object Selection Mode.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3151258" role="tablecontent" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159162" role="tablecontent" l10n="U" oldref="191">Move the selected point (the snap-to-grid functions are temporarily disabled, but end points still snap to each other).</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3146874" role="tablecontent" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Up/Down/Left/Right Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="212">Moves the selected Drawing Object one pixel (in Selection Mode)</paragraph>
-<paragraph role="tablecontent" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="211">Re-sizes a Drawing Object (in Handle Selection Mode)</paragraph>
-<paragraph role="tablecontent" id="par_id3145306" xml-lang="en-US" l10n="U" oldref="210">Rotates a Drawing Object (in Rotation Mode)</paragraph>
-<paragraph role="tablecontent" id="par_id3159244" xml-lang="en-US" l10n="U" oldref="209">Opens the properties dialog for a Drawing Object.</paragraph>
-<paragraph role="tablecontent" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="208">Activates the Point Selection mode for the selected drawing object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153580" xml-lang="en-US" l10n="U" oldref="207">Spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153053" xml-lang="en-US" l10n="U" oldref="206">Select a point of a drawing object (in Point Selection mode) / Cancel selection.</paragraph>
-<paragraph role="tablecontent" id="par_id3145629" xml-lang="en-US" l10n="U" oldref="205">The selected point blinks once per second.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148624" xml-lang="en-US" l10n="U" oldref="204">Shift+spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154842" xml-lang="en-US" l10n="U" oldref="203">Select an additional point in Point Selection mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3144422" role="tablecontent" l10n="U" oldref="212">Moves the selected Drawing Object one pixel (in Selection Mode)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3153386" role="tablecontent" l10n="U" oldref="211">Re-sizes a Drawing Object (in Handle Selection Mode)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3145306" role="tablecontent" l10n="U" oldref="210">Rotates a Drawing Object (in Rotation Mode)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3159244" role="tablecontent" l10n="U" oldref="209">Opens the properties dialog for a Drawing Object.</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3150763" role="tablecontent" l10n="U" oldref="208">Activates the Point Selection mode for the selected drawing object.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3153580" role="tablecontent" l10n="U" oldref="207">Spacebar</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3153053" role="tablecontent" l10n="U" oldref="206">Select a point of a drawing object (in Point Selection mode) / Cancel selection.</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3145629" role="tablecontent" l10n="U" oldref="205">The selected point blinks once per second.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3148624" role="tablecontent" l10n="U" oldref="204">Shift+spacebar</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154842" role="tablecontent" l10n="U" oldref="203">Select an additional point in Point Selection mode.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3147424" role="tablecontent" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152955" xml-lang="en-US" l10n="U" oldref="201">Select the next point of the drawing object (Point Selection mode)</paragraph>
-<paragraph role="tablecontent" id="par_id3149753" xml-lang="en-US" l10n="U" oldref="200">In Rotation mode, the center of rotation can also be selected.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152955" role="tablecontent" l10n="U" oldref="201">Select the next point of the drawing object (Point Selection mode)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149753" role="tablecontent" l10n="U" oldref="200">In Rotation mode, the center of rotation can also be selected.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3147233" role="tablecontent" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151296" xml-lang="en-US" l10n="U" oldref="198">Select the previous point of the drawing object (Point Selection mode)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3151296" role="tablecontent" l10n="U" oldref="198">Select the previous point of the drawing object (Point Selection mode)</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3150933" role="tablecontent" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="341">A new drawing object with default size is placed in the center of the current view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145662" role="tablecontent" l10n="U" oldref="341">A new drawing object with default size is placed in the center of the current view.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3147563" role="tablecontent" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter at the Selection icon</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="343">Activates the first drawing object in the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154569" xml-lang="en-US" l10n="U" oldref="196">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149994" xml-lang="en-US" l10n="U" oldref="195">Leave the Point Selection mode. The drawing object is selected afterwards.</paragraph>
-<paragraph role="tablecontent" id="par_id3155512" xml-lang="en-US" l10n="U" oldref="193">Edit a point of a drawing object (Point Edit mode)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148580" xml-lang="en-US" l10n="U" oldref="344">Any text or numerical key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="345">If a drawing object is selected, switches to edit mode and places the cursor at the end of the text in the drawing object. A printable character is inserted.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150860" role="tablecontent" l10n="U" oldref="343">Activates the first drawing object in the document.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3154569" role="tablecontent" l10n="U" oldref="196">Esc</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149994" role="tablecontent" l10n="U" oldref="195">Leave the Point Selection mode. The drawing object is selected afterwards.</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3155512" role="tablecontent" l10n="U" oldref="193">Edit a point of a drawing object (Point Edit mode)</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="hd_id3148580" role="tablecontent" l10n="U" oldref="344">Any text or numerical key</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152918" role="tablecontent" l10n="U" oldref="345">If a drawing object is selected, switches to edit mode and places the cursor at the end of the text in the drawing object. A printable character is inserted.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id2693563" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key while creating or scaling a graphic object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id8308969" xml-lang="en-US" l10n="NEW">The position of the object's center is fixed.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id526444" xml-lang="en-US" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id4939725" xml-lang="en-US" l10n="NEW">The ratio of the object's width to height is fixed.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id8308969" role="tablecontent" l10n="NEW">The position of the object's center is fixed.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id526444" role="tablecontent" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id4939725" role="tablecontent" l10n="NEW">The ratio of the object's width to height is fixed.</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/04/01020000.xhp#DB_keys"/>
-<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
-</section>
-</body>
-</helpdocument>
+      </section>
+      <section id="relatedtopics">
+         <embed href="text/shared/04/01020000.xhp#DB_keys"/>
+         <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/04/01020000.xhp b/helpcontent2/source/text/shared/04/01020000.xhp
index aff765f66c..583afa6796 100755
--- a/helpcontent2/source/text/shared/04/01020000.xhp
+++ b/helpcontent2/source/text/shared/04/01020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/04/makefile.mk b/helpcontent2/source/text/shared/04/makefile.mk
index 59727b800e..98160a67da 100644
--- a/helpcontent2/source/text/shared/04/makefile.mk
+++ b/helpcontent2/source/text/shared/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,4 +50,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b4028ba58e..84d2171457 100755..100644
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,39 +29,42 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textshared0500000001xml" indexer="include">
-<title id="tit" xml-lang="en-US">Getting Support</title>
-<filename>/text/shared/05/00000001.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="support">
+      <topic id="textshared0500000001xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Getting Support</title>
+         <filename>/text/shared/05/00000001.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="support">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143272"><bookmark_value>support on the Web</bookmark_value>
-<bookmark_value>getting support</bookmark_value>
-<bookmark_value>forums and support</bookmark_value>
-<bookmark_value>Web support</bookmark_value>
+         <bookmark_value>getting support</bookmark_value>
+         <bookmark_value>forums and support</bookmark_value>
+         <bookmark_value>Web support</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id9173253" xml-lang="en-US" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
-<paragraph role="paragraph" id="par_id3150667" xml-lang="en-US" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
-<paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
-<paragraph role="paragraph" id="par_id1318380" xml-lang="en-US" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
-<paragraph role="heading" id="hd_id2611386" xml-lang="en-US" level="2" l10n="NEW">Mailing lists</paragraph>
-<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
-<paragraph role="heading" id="hd_id0915200811081722" xml-lang="en-US" level="2" l10n="NEW">Forum</paragraph>
-<paragraph role="paragraph" id="par_id0915200811081778" xml-lang="en-US" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
-<paragraph role="heading" id="hd_id0804200803314150" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
-<paragraph role="paragraph" id="par_id0804200803314235" xml-lang="en-US" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
-<paragraph role="heading" id="hd_id3168534" xml-lang="en-US" level="2" l10n="NEW">Downloads</paragraph>
-<paragraph role="paragraph" id="par_id3028143" xml-lang="en-US" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
-<paragraph role="heading" id="hd_id2602967" xml-lang="en-US" level="2" l10n="NEW">Documentation</paragraph>
-<paragraph role="paragraph" id="par_id3497211" xml-lang="en-US" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial office software.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+
+         <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide OpenOffice.org community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.services.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000002.xhp b/helpcontent2/source/text/shared/05/00000002.xhp
index 8eed0b17fd..87bb13aa7f 100644
--- a/helpcontent2/source/text/shared/05/00000002.xhp
+++ b/helpcontent2/source/text/shared/05/00000002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000002.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/00000100.xhp b/helpcontent2/source/text/shared/05/00000100.xhp
index b8c63d26a9..85464efbd6 100755
--- a/helpcontent2/source/text/shared/05/00000100.xhp
+++ b/helpcontent2/source/text/shared/05/00000100.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000100.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,20 +29,17 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0500000100xml" indexer="exclude" status="PUBLISH">
 <title id="tit" xml-lang="en-US"/>
 <filename>/text/shared/05/00000100.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-14T14:08:39">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="neuehilfe"><comment>this section is displayed on all module main pages above the other "Help about Help" links.</comment>
+<paragraph role="paragraph" id="par_id3150699" xml-lang="en-US" l10n="NEW">The Help references the default settings of the program on a system that is set to defaults. Descriptions of colors, mouse actions, or other configurable items can be different for your program and system.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3150618" xml-lang="en-US" l10n="U" oldref="1">The <emph>$[officename] Help system</emph> provides easy access to information and support. There are several ways to find what you are looking for in the <link href="text/shared/05/00000110.xhp" name="Help environment">Help environment</link>: You can search for a specific keyword in the <link href="text/shared/05/00000130.xhp" name="Index">Index</link>, carry out a full-text search under <link href="text/shared/05/00000140.xhp" name="Find">Find</link>, or look through a hierarchical list of the <link href="text/shared/05/00000160.xhp" name="Topics">Topics</link>.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 55d77ffb7f..0ff57de8c9 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000110.xhp,v $
- * $Revision: 1.9.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,170 +31,190 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">The %PRODUCTNAME Help Window</title>
-<filename>/text/shared/05/00000110.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">The %PRODUCTNAME Help Window</title>
+         <filename>/text/shared/05/00000110.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_HELPONHELP" id="bm_id3706162" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/><paragraph role="heading" id="hd_id3153884" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
 </variable></paragraph>
-<paragraph role="warning" id="par_id3156183" xml-lang="en-US" l10n="CHG" oldref="25">The Help system for OpenOffice.org and StarOffice/StarSuite software from Sun Microsystems, Inc. is based on the same source files. Some of the functions described here may not be included in this particular <item type="productname">%PRODUCTNAME</item> distribution.<comment>removed "OpenSource" switch</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/><paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
-<table id="tbl_id3155555">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="E">
-<image id="img_id3155892" src="sfx2/res/indexon_small.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155892" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
+      <table id="tbl_id3155555">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="E">
+<image id="img_id3155892" src="sfx2/res/indexon_small.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155892">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/><paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_HELP_TOOLBOXITEM_INDEX">Hides and shows the <emph>navigation pane</emph></ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="E">
-<image id="img_id3149811" src="res/sc06301.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149811" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147089" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_HELP_TOOLBOXITEM_INDEX">Hides and shows the <emph>navigation pane</emph></ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="E">
+<image id="img_id3149811" src="res/sc06301.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149811">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/><paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_HELP_TOOLBOXITEM_BACKWARD">Moves back to the <emph>previous</emph> page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="E">
-<image id="img_id3159399" src="res/commandimagelist/sc_browseforward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159399" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3151111" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_HELP_TOOLBOXITEM_BACKWARD">Moves back to the <emph>previous</emph> page</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149415" role="paragraph" l10n="E">
+<image id="img_id3159399" src="res/commandimagelist/sc_browseforward.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3159399">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/><paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_HELP_TOOLBOXITEM_FORWARD">Moves forward to the <emph>next</emph> page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="E">
-<image id="img_id3148642" src="res/sc06303.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148642" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154514" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_HELP_TOOLBOXITEM_FORWARD">Moves forward to the <emph>next</emph> page</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="E">
+<image id="img_id3148642" src="res/sc06303.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148642">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/><paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_HELP_TOOLBOXITEM_START">Moves to the <emph>first page</emph> of the current Help topic</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="E">
-<image id="img_id3155434" src="res/commandimagelist/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155434" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_HELP_TOOLBOXITEM_START">Moves to the <emph>first page</emph> of the current Help topic</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149797" role="paragraph" l10n="E">
+<image id="img_id3155434" src="res/commandimagelist/sc_print.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155434">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/><paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_HELP_TOOLBOXITEM_PRINT"><emph>Prints</emph> the current page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="E">
-<image id="img_id3149294" src="sfx2/res/favourite.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149294" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_HELP_TOOLBOXITEM_PRINT"><emph>Prints</emph> the current page</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145068" role="paragraph" l10n="E">
+<image id="img_id3149294" src="sfx2/res/favourite.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149294">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/><paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_HELP_TOOLBOXITEM_BOOKMARKS">Adds this page to your bookmarks</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN108D9" xml-lang="en-US" l10n="NEW">
-<image id="img_id7358623" src="res/commandimagelist/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id7358623" xml-lang="en-US">Search icon</alt>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="U" oldref="18"><ahelp hid="HID_HELP_TOOLBOXITEM_BOOKMARKS">Adds this page to your bookmarks</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN108D9" role="paragraph" l10n="NEW">
+<image id="img_id7358623" src="res/commandimagelist/sc_recsearch.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7358623">Search icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/><paragraph role="paragraph" id="par_idN108FE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_HELP_TOOLBOXITEM_SEARCHDIALOG">Opens the <emph>Find on this page</emph> dialog.</ahelp></paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="21">These commands can also be found in the context menu of the Help document.</paragraph>
-<paragraph role="heading" id="par_idN10922" xml-lang="en-US" level="2" l10n="NEW">Help Page</paragraph>
-<paragraph role="paragraph" id="par_idN10926" xml-lang="en-US" l10n="NEW">You can copy from the Help Viewer to the clipboard on your operating system with standard copy commands. For example:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1092C" xml-lang="en-US" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN10933" xml-lang="en-US" l10n="NEW">To search the current Help page:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10939" xml-lang="en-US" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_idN10940" xml-lang="en-US" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
-<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A22" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A48" xml-lang="en-US" l10n="NEW">Select the search options that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A26" xml-lang="en-US" l10n="NEW">Click <emph>Find</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">To find the next occurrence of the search term on the page, click <emph>Find</emph> again.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" id="bm_id1145664" localize="false"/><paragraph role="paragraph" id="par_idN10906" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" visibility="hidden">Enter the text that you want to search for or select a text entry in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" id="bm_id6895962" localize="false"/><paragraph role="paragraph" id="par_idN10993" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" visibility="hidden">Finds complete words only.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" id="bm_id5402996" localize="false"/><paragraph role="paragraph" id="par_idN109AA" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" visibility="hidden">Distinguishes between uppercase text and lowercase text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" id="bm_id3418988" localize="false"/><paragraph role="paragraph" id="par_idN109C1" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" visibility="hidden">Searches the entire Help page, starting at the current position of the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" id="bm_id3523056" localize="false"/><paragraph role="paragraph" id="par_idN109D8" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" visibility="hidden">Searches backwards from the current position of the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" id="bm_id5264137" localize="false"/><paragraph role="paragraph" id="par_idN109F5" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" visibility="hidden">Finds the next occurrence of the search term.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="8">Navigation Pane</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/><paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_HELP_TABCONTROL">The navigation pane of the Help window contains the tab pages <emph>Contents</emph>, <emph>Index</emph>, <emph>Find</emph> and <emph>Bookmarks</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/><paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_HELP_LISTBOX">The list box located at the very top is where you can select other <item type="productname">%PRODUCTNAME</item> Help modules.</ahelp> The <emph>Index</emph> and <emph>Find</emph> tab pages only contain the data for the selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
-<table id="tbl_id3144434">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149983" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/05/00000160.xhp" name="Contents">Contents</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145748" xml-lang="en-US" l10n="CHG" oldref="15">Displays an index of the main topics of all modules.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/05/00000130.xhp" name="Index">Index</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151351" xml-lang="en-US" l10n="CHG" oldref="11">Displays a list of index keywords for the currently selected %PRODUCTNAME module.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/05/00000140.xhp" name="Find">Find</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="13">Allows you to carry out a full-text search. The search will include the entire Help contents of the currently selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154985" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/05/00000150.xhp" name="Bookmarks">Bookmarks</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156062" xml-lang="en-US" l10n="U" oldref="17">Contains user-defined bookmarks. You can edit or delete bookmarks, or click them to go to the corresponding pages.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<section id="relatedtopics">
-<embed href="text/shared/05/00000120.xhp#00000120"/>
-<embed href="text/shared/05/00000160.xhp#doc_title"/>
-<embed href="text/shared/05/00000130.xhp#00000130"/>
-<embed href="text/shared/05/00000140.xhp#00000140"/>
-<embed href="text/shared/05/00000150.xhp#doc_title"/>
-</section>
-</body>
-</helpdocument>
+            </tablecell>
+            <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN108FE" role="paragraph" l10n="NEW"><ahelp hid="HID_HELP_TOOLBOXITEM_SEARCHDIALOG">Opens the <emph>Find on this page</emph> dialog.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="21">These commands can also be found in the context menu of the Help document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10922" role="heading" level="2" l10n="NEW">Help Page</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10926" role="paragraph" l10n="NEW">You can copy from the Help Viewer to the clipboard on your operating system with standard copy commands. For example:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1092C" role="paragraph" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10930" role="paragraph" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10933" role="paragraph" l10n="NEW">To search the current Help page:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10939" role="paragraph" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10940" role="paragraph" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10A36" role="note" l10n="NEW">You can also click in the Help page and press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A22" role="paragraph" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A48" role="paragraph" l10n="NEW">Select the search options that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A26" role="paragraph" l10n="NEW">Click <emph>Find</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">To find the next occurrence of the search term on the page, click <emph>Find</emph> again.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" id="bm_id1145664" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10906" role="paragraph" l10n="NEW"><ahelp hid="sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" visibility="hidden">Enter the text that you want to search for or select a text entry in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" id="bm_id6895962" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10993" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" visibility="hidden">Finds complete words only.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" id="bm_id5402996" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109AA" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" visibility="hidden">Distinguishes between uppercase text and lowercase text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" id="bm_id3418988" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109C1" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" visibility="hidden">Searches the entire Help page, starting at the current position of the cursor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" id="bm_id3523056" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109D8" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" visibility="hidden">Searches backwards from the current position of the cursor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" id="bm_id5264137" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109F5" role="paragraph" l10n="NEW"><ahelp hid="sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" visibility="hidden">Finds the next occurrence of the search term.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U" oldref="8">Navigation Pane</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_HELP_TABCONTROL">The navigation pane of the Help window contains the tab pages <emph>Contents</emph>, <emph>Index</emph>, <emph>Find</emph> and <emph>Bookmarks</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_HELP_LISTBOX">The list box located at the very top is where you can select other <item type="productname">%PRODUCTNAME</item> Help modules.</ahelp> The <emph>Index</emph> and <emph>Find</emph> tab pages only contain the data for the selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
+      <table id="tbl_id3144434">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149983" role="tablecontent" l10n="U" oldref="14"><link href="text/shared/05/00000160.xhp" name="Contents">Contents</link></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145748" role="tablecontent" l10n="CHG" oldref="15">Displays an index of the main topics of all modules.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155366" role="tablecontent" l10n="U" oldref="10"><link href="text/shared/05/00000130.xhp" name="Index">Index</link></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151351" role="tablecontent" l10n="CHG" oldref="11">Displays a list of index keywords for the currently selected %PRODUCTNAME module.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149260" role="tablecontent" l10n="U" oldref="12"><link href="text/shared/05/00000140.xhp" name="Find">Find</link></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154188" role="tablecontent" l10n="U" oldref="13">Allows you to carry out a full-text search. The search will include the entire Help contents of the currently selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="U" oldref="16"><link href="text/shared/05/00000150.xhp" name="Bookmarks">Bookmarks</link></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156062" role="tablecontent" l10n="U" oldref="17">Contains user-defined bookmarks. You can edit or delete bookmarks, or click them to go to the corresponding pages.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <section id="relatedtopics">
+         <embed href="text/shared/05/00000120.xhp#00000120"/>
+         <embed href="text/shared/05/00000160.xhp#doc_title"/>
+         <embed href="text/shared/05/00000130.xhp#00000130"/>
+         <embed href="text/shared/05/00000140.xhp#00000140"/>
+         <embed href="text/shared/05/00000150.xhp#doc_title"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index 7bc523b0cb..f3dbbf6eaf 100755
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.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.
  * 
@@ -10,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000120.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,46 +32,46 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Help Agent, Tips and Extended Tips</title>
-<filename>/text/shared/05/00000120.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-23T10:58:54">converted from old format - fpe
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Help Agent, Tips and Extended Tips</title>
+         <filename>/text/shared/05/00000120.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150672"><bookmark_value>Help; Help tips</bookmark_value>
-<bookmark_value>tooltips; help</bookmark_value>
-<bookmark_value>Help Agent; help</bookmark_value>
+      <bookmark_value>tooltips; help</bookmark_value>
+      <bookmark_value>Help Agent; help</bookmark_value>
+      <bookmark_value>Clippy, see Help Agent</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3150672" xml-lang="en-US" l10n="E" oldref="11" localize="false"/>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
+<paragraph xml-lang="en-US" id="par_id3150672" role="paragraph" l10n="E" oldref="11"
+                 localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
-<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
-<paragraph role="tip" id="par_idN10634" xml-lang="en-US" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task.</paragraph>
-<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="3">Tips</paragraph>
-<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
-<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
-<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
-<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
-<embed href="text/shared/05/00000110.xhp#00000110"/>
-<embed href="text/shared/05/00000160.xhp#doc_title"/>
-<embed href="text/shared/05/00000130.xhp#00000130"/>
-<embed href="text/shared/05/00000140.xhp#00000140"/>
-<embed href="text/shared/05/00000150.xhp#doc_title"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147285" role="heading" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10634" role="tip" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task. To disable the Help Agent choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#agentoff"/>
+      <paragraph xml-lang="en-US" id="hd_id3149140" role="heading" level="2" l10n="U" oldref="3">Tips</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157896" role="paragraph" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153910" role="paragraph" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id992156" role="tip" l10n="NEW">Enable or disable the tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10666" role="tip" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
+         <embed href="text/shared/05/00000110.xhp#00000110"/>
+         <embed href="text/shared/05/00000160.xhp#doc_title"/>
+         <embed href="text/shared/05/00000130.xhp#00000130"/>
+         <embed href="text/shared/05/00000140.xhp#00000140"/>
+         <embed href="text/shared/05/00000150.xhp#doc_title"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000130.xhp b/helpcontent2/source/text/shared/05/00000130.xhp
index 601df29a41..2c7fe609a7 100644
--- a/helpcontent2/source/text/shared/05/00000130.xhp
+++ b/helpcontent2/source/text/shared/05/00000130.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000130.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
 <paragraph role="paragraph" id="par_id3149428" xml-lang="en-US" l10n="E" oldref="2" localize="false"/>
 <paragraph role="heading" id="hd_id3153884" xml-lang="en-US" level="1" l10n="U" oldref="5"><variable id="00000130"><link href="text/shared/05/00000130.xhp" name="Index - Keyword Search in the Help">Index - Keyword Search in the Help</link>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_COMBOBOX_TP_HELP_INDEX_CB_INDEX" id="bm_id3149662" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX" id="bm_id3149662" localize="false"/>
 <paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SFX2_COMBOBOX_TP_HELP_INDEX_CB_INDEX" visibility="hidden">Double-click an entry or type the word you want to find in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_INDEX_PB_OPEN_INDEX" id="bm_id3150476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX" id="bm_id3150476" localize="false"/>
 <paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_INDEX_PB_OPEN_INDEX" visibility="hidden">Click to display the selected topic.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="1">You can search for a specific topic by typing a word into the <emph>Search term</emph> text box. The window contains an alphabetical list of index terms.</paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="6">If the cursor is in the index list when you type the search term, the display will jump directly to the next match. When you type a word in the <emph>Search term</emph> text box, the focus will jump to the best match in the index list.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000140.xhp b/helpcontent2/source/text/shared/05/00000140.xhp
index 74d111b87c..2d9d4bd2da 100644
--- a/helpcontent2/source/text/shared/05/00000140.xhp
+++ b/helpcontent2/source/text/shared/05/00000140.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000140.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,17 +49,17 @@
 <paragraph role="paragraph" id="par_id3148532" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
 <paragraph role="heading" id="hd_id3148523" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="00000140"><link href="text/shared/05/00000140.xhp" name="Find - The Full-Text Search">Find - The Full-Text Search</link>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_COMBOBOX_TP_HELP_SEARCH_ED_SEARCH" id="bm_id3151100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH" id="bm_id3151100" localize="false"/>
 <paragraph role="paragraph" id="par_id3155599" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SFX2_COMBOBOX_TP_HELP_SEARCH_ED_SEARCH" visibility="hidden">Enter the search term here. The search is not case-sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_SEARCH" id="bm_id3109850" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH" id="bm_id3109850" localize="false"/>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_SEARCH" visibility="hidden">Click to start a full-text search for the term you entered.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_TP_HELP_SEARCH_LB_RESULT" id="bm_id3149140" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT" id="bm_id3149140" localize="false"/>
 <paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_SEARCH_LB_RESULT" visibility="hidden">Lists the headings of the pages found in your full-text search. To display a page, double-click its entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_HELP_SEARCH_CB_FULLWORDS" id="bm_id3154673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS" id="bm_id3154673" localize="false"/>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SFX2_CHECKBOX_TP_HELP_SEARCH_CB_FULLWORDS" visibility="hidden">Specifies whether to carry out an exact search for the word you entered. Incomplete words will not be found.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_HELP_SEARCH_CB_SCOPE" id="bm_id3147835" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE" id="bm_id3147835" localize="false"/>
 <paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2_CHECKBOX_TP_HELP_SEARCH_CB_SCOPE" visibility="hidden">Specifies whether to only search in document headings for the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_OPEN_SEARCH" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH" id="bm_id3145346" localize="false"/>
 <paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_OPEN_SEARCH" visibility="hidden">Displays the entry selected in the list.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152552" xml-lang="en-US" l10n="U" oldref="8">The full text search function in $[officename] Help allows you to find Help documents that contain any combination of search terms. To do this, type one or more words into the <emph>Search term</emph> text field.</paragraph>
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="9">The <emph>Search term</emph> text field stores the words you entered last. To repeat a previous search, click the arrow icon and select the term from the list.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000150.xhp b/helpcontent2/source/text/shared/05/00000150.xhp
index 8c3fab45cf..8ddf83ac90 100644
--- a/helpcontent2/source/text/shared/05/00000150.xhp
+++ b/helpcontent2/source/text/shared/05/00000150.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000150.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
   
   <bookmark branch="index" xml-lang="en-US" id="bm_id3153244"><bookmark_value>Help; bookmarks</bookmark_value><bookmark_value>bookmarks; Help</bookmark_value></bookmark><paragraph role="paragraph" id="par_id3153244" l10n="E" xml-lang="en-US" oldref="1" localize="false"/>
   <paragraph id="hd_id3154349" role="heading" level="1" oldref="2" l10n="U" xml-lang="en-US"><variable id="doc_title"><link href="text/shared/05/00000150.xhp" name="Managing Bookmarks">Managing Bookmarks</link></variable></paragraph>
-  <bookmark branch="hid/SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" xml-lang="en-US" id="bm_id3143284"/><paragraph l10n="U" role="paragraph" id="par_id3154840" xml-lang="en-US" oldref="11"><ahelp hid="SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" visibility="hidden">Displays the name of the bookmarked page. You can also type a new name for the bookmark.</ahelp></paragraph>
+  <bookmark branch="hid/sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE" xml-lang="en-US" id="bm_id3143284"/><paragraph l10n="U" role="paragraph" id="par_id3154840" xml-lang="en-US" oldref="11"><ahelp hid="SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" visibility="hidden">Displays the name of the bookmarked page. You can also type a new name for the bookmark.</ahelp></paragraph>
   <table id="tbl_id3154228">
    
    
@@ -61,7 +58,7 @@
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3149827" l10n="U" oldref="3">You can find the bookmarks on the <emph>Bookmarks</emph> tab page.</paragraph>
   <list type="unordered">
    <listitem>
-    <bookmark branch="hid/SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" xml-lang="en-US" id="bm_id3156410"/><paragraph l10n="U" role="listitem" id="par_id3145345" xml-lang="en-US" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" visibility="visible">Double-clicking a bookmark or pressing the Return key opens the assigned page in Help. A right-click opens the context menu.</ahelp></paragraph>
+    <bookmark branch="hid/sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS" xml-lang="en-US" id="bm_id3156410"/><paragraph l10n="U" role="listitem" id="par_id3145345" xml-lang="en-US" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" visibility="visible">Double-clicking a bookmark or pressing the Return key opens the assigned page in Help. A right-click opens the context menu.</ahelp></paragraph>
    </listitem>
    <listitem>
     <paragraph role="listitem" id="par_id3166410" l10n="U" xml-lang="en-US" oldref="5">Use the Del key to delete a selected bookmark.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000160.xhp b/helpcontent2/source/text/shared/05/00000160.xhp
index dc9f1d9c07..88dd0a41a4 100644
--- a/helpcontent2/source/text/shared/05/00000160.xhp
+++ b/helpcontent2/source/text/shared/05/00000160.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000160.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/err_html.xhp b/helpcontent2/source/text/shared/05/err_html.xhp
index 6831a727cf..2d9c471465 100644
--- a/helpcontent2/source/text/shared/05/err_html.xhp
+++ b/helpcontent2/source/text/shared/05/err_html.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: err_html.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index b53847959e..970596d05c 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,4 +58,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/07/09000000.xhp b/helpcontent2/source/text/shared/07/09000000.xhp
index af101e9abb..5beec3dfb5 100644
--- a/helpcontent2/source/text/shared/07/09000000.xhp
+++ b/helpcontent2/source/text/shared/07/09000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 09000000.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/07/makefile.mk b/helpcontent2/source/text/shared/07/makefile.mk
index c080f0760b..a15cea003a 100644
--- a/helpcontent2/source/text/shared/07/makefile.mk
+++ b/helpcontent2/source/text/shared/07/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/3dsettings_toolbar.xhp b/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
index bedd180b3c..acfc21dbc4 100644
--- a/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
+++ b/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 3dsettings_toolbar.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,76 +29,68 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textshared3dsettings_toolbarxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">3D-Settings</title>
-<filename>/text/shared/3dsettings_toolbar.xhp</filename>
-</topic>
-<history>
-<created date="2004-09-28T12:54:34">UFI: 3D-Settings toolbar</created>
-<lastedited date="2007-01-16T10:10:48">DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="3dsettings">
-<paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="1" l10n="NEW"><variable id="3dtoolbar"><link href="text/shared/3dsettings_toolbar.xhp">3D-Settings</link>
+      <topic id="textshared3dsettings_toolbarxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">3D-Settings</title>
+         <filename>/text/shared/3dsettings_toolbar.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="3dsettings">
+         <paragraph xml-lang="en-US" id="par_idN1055A" role="heading" level="1" l10n="NEW"><variable id="3dtoolbar"><link href="text/shared/3dsettings_toolbar.xhp">3D-Settings</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The 3D-Settings toolbar controls properties of selected 3D objects.</ahelp></paragraph>
-</section>
+         <paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph" l10n="NEW"><ahelp hid=".">The 3D-Settings toolbar controls properties of selected 3D objects.</ahelp></paragraph>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TOOGLE" id="bm_id9720450" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionToggle" id="bm_id7128513" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Extrusion on/off</paragraph>
-<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the 3D effects on and off for the selected objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10575" role="heading" level="2" l10n="NEW">Extrusion on/off</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10579" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the 3D effects on and off for the selected objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_DOWN" id="bm_id4860377" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltDown" id="bm_id9378337" localize="false"/>
-<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Tilt Down</paragraph>
-<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Tilt Down</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_UP" id="bm_id1682790" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltUp" id="bm_id8217413" localize="false"/>
-<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Tilt Up</paragraph>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Tilts the selected object upwards by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Tilt Up</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="CHG"><ahelp hid=".">Tilts the selected object upwards by five degrees.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_LEFT" id="bm_id8390758" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltLeft" id="bm_id3715628" localize="false"/>
-<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Tilt Left</paragraph>
-<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object left by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105C6" role="heading" level="2" l10n="NEW">Tilt Left</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105CA" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object left by five degrees.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_RIGHT" id="bm_id3985717" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltRight" id="bm_id5299844" localize="false"/>
-<paragraph role="heading" id="par_idN105E1" xml-lang="en-US" level="2" l10n="NEW">Tilt Right</paragraph>
-<paragraph role="paragraph" id="par_idN105E5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object right by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105E1" role="heading" level="2" l10n="NEW">Tilt Right</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105E5" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object right by five degrees.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_DEPTH_FLOATER" id="bm_id1778008" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDepthFloater" id="bm_id408642" localize="false"/>
-<paragraph role="heading" id="par_idN105FC" xml-lang="en-US" level="2" l10n="NEW">Depth</paragraph>
-<paragraph role="paragraph" id="par_idN10600" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Depth window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39983" id="bm_id8984344" localize="false"/>
-<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an extrusion depth.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVX_MDLG_EXTRUSION_DEPTH_MTR_DEPTH" id="bm_id5449079" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter an extrusion depth.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105FC" role="heading" level="2" l10n="NEW">Depth</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10600" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Depth window.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph" l10n="NEW"><ahelp hid=".">Select an extrusion depth.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVX_MDLG_EXTRUSION_DEPTH:MTR_DEPTH" id="bm_id5449079" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW"><ahelp hid=".">Enter an extrusion depth.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_DIRECTION_FLOATER" id="bm_id6154362" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDirectionFloater" id="bm_id3699453" localize="false"/>
-<paragraph role="heading" id="par_idN1064C" xml-lang="en-US" level="2" l10n="NEW">Direction</paragraph>
-<paragraph role="paragraph" id="par_idN10650" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Direction window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/34073" id="bm_id3675649" localize="false"/>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a direction.</ahelp><comment>UFI: same ID for Direction and Lighting direction</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39981" id="bm_id1361430" localize="false"/>
-<paragraph role="paragraph" id="par_idN10698" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a perspective or parallel extrusion method.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1064C" role="heading" level="2" l10n="NEW">Direction</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10650" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Direction window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_POPUP_LINEEND_CTRL" id="bm_id3675649" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW"><ahelp hid=".">Select a direction.</ahelp><comment>UFI: same ID for Direction and Lighting direction</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW"><ahelp hid=".">Select a perspective or parallel extrusion method.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_LIGHTING_FLOATER" id="bm_id70192" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionLightingFloater" id="bm_id7180394" localize="false"/>
-<paragraph role="heading" id="par_idN106B3" xml-lang="en-US" level="2" l10n="NEW">Lighting</paragraph>
-<paragraph role="paragraph" id="par_idN106B7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Lighting window.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN106C6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a lighting direction.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39984" id="bm_id9216589" localize="false"/>
-<paragraph role="paragraph" id="par_idN106E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a lighting intensity.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106B3" role="heading" level="2" l10n="NEW">Lighting</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Lighting window.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106C6" role="paragraph" l10n="NEW"><ahelp hid=".">Select a lighting direction.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106E1" role="paragraph" l10n="NEW"><ahelp hid=".">Select a lighting intensity.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_SURFACE_FLOATER" id="bm_id3682363" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionSurfaceFloater" id="bm_id9263893" localize="false"/>
-<paragraph role="heading" id="par_idN106FC" xml-lang="en-US" level="2" l10n="NEW">Surface</paragraph>
-<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Surface window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39986" id="bm_id8363292" localize="false"/>
-<paragraph role="paragraph" id="par_idN10717" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a surface material or a wireframe display.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106FC" role="heading" level="2" l10n="NEW">Surface</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10700" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Surface window.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10717" role="paragraph" l10n="NEW"><ahelp hid=".">Select a surface material or a wireframe display.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_3D_COLOR" id="bm_id144047" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Extrusion3DColor" id="bm_id7303994" localize="false"/>
-<paragraph role="heading" id="par_idN10732" xml-lang="en-US" level="2" l10n="NEW">3D Color</paragraph>
-<paragraph role="paragraph" id="par_idN10736" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Color toolbar.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10732" role="heading" level="2" l10n="NEW">3D Color</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10736" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Color toolbar.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/autokorr/01000000.xhp b/helpcontent2/source/text/shared/autokorr/01000000.xhp
index ca5dd04230..0bb93c05ef 100755
--- a/helpcontent2/source/text/shared/autokorr/01000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/01000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr01000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/02000000.xhp b/helpcontent2/source/text/shared/autokorr/02000000.xhp
index 4d6298de6a..91993c59cf 100755
--- a/helpcontent2/source/text/shared/autokorr/02000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/02000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02000000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr02000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/03000000.xhp b/helpcontent2/source/text/shared/autokorr/03000000.xhp
index af27e21c59..de2e7abffe 100755
--- a/helpcontent2/source/text/shared/autokorr/03000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/03000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr03000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/04000000.xhp b/helpcontent2/source/text/shared/autokorr/04000000.xhp
index fd042d0397..502e721253 100755
--- a/helpcontent2/source/text/shared/autokorr/04000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/04000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr04000000xml" indexer="exclude" status="PUBLISH">
@@ -54,6 +51,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/05000000.xhp b/helpcontent2/source/text/shared/autokorr/05000000.xhp
index bbec4756d7..a4eb3bfca8 100755
--- a/helpcontent2/source/text/shared/autokorr/05000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/05000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr05000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/06000000.xhp b/helpcontent2/source/text/shared/autokorr/06000000.xhp
index d650b691ae..70e0f75a37 100755
--- a/helpcontent2/source/text/shared/autokorr/06000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/06000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr06000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/07000000.xhp b/helpcontent2/source/text/shared/autokorr/07000000.xhp
index fdf991abf5..45117e6ea5 100755
--- a/helpcontent2/source/text/shared/autokorr/07000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/07000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 07000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr07000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/08000000.xhp b/helpcontent2/source/text/shared/autokorr/08000000.xhp
index 10bcaf0073..7fd6245d6d 100755
--- a/helpcontent2/source/text/shared/autokorr/08000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/08000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 08000000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr08000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/09000000.xhp b/helpcontent2/source/text/shared/autokorr/09000000.xhp
index fa1a778d78..ff4af8ffe1 100755
--- a/helpcontent2/source/text/shared/autokorr/09000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/09000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 09000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr09000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/10000000.xhp b/helpcontent2/source/text/shared/autokorr/10000000.xhp
index 129ae893c3..b3531239d6 100755
--- a/helpcontent2/source/text/shared/autokorr/10000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/10000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr10000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/11000000.xhp b/helpcontent2/source/text/shared/autokorr/11000000.xhp
deleted file mode 100755
index cbb2cc6fa2..0000000000
--- a/helpcontent2/source/text/shared/autokorr/11000000.xhp
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 11000000.xhp,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedautokorr11000000xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoCorrect has been activated</title>
-<filename>/text/shared/autokorr/11000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-26T12:44:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL" id="bm_id3149989" localize="false"/>
-<paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect has been activated</paragraph>
-<paragraph role="heading" id="hd_id3155271" xml-lang="en-US" level="3" l10n="U" oldref="2">1/2 ... has been replaced with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3153220" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link> has replaced text and character combinations that are found in the font as a single character, such as 1/2, with the appropriate character.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/autokorr/12000000.xhp b/helpcontent2/source/text/shared/autokorr/12000000.xhp
index d1c9fe8208..53e18538ba 100755
--- a/helpcontent2/source/text/shared/autokorr/12000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/12000000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 12000000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,6 +46,9 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/13000000.xhp b/helpcontent2/source/text/shared/autokorr/13000000.xhp
index 7b2bcd738d..4abe69ef8e 100755
--- a/helpcontent2/source/text/shared/autokorr/13000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/13000000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 13000000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautokorr13000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
 </section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
 <switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index 1f89e18dc9..29e0fa2ee6 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,11 +54,10 @@ XHPFILES = \
    08000000.xhp \
    09000000.xhp \
    10000000.xhp \
-   11000000.xhp \
    12000000.xhp \
    13000000.xhp 
     
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/autopi/01000000.xhp b/helpcontent2/source/text/shared/autopi/01000000.xhp
index 0bbff64038..c96e0612df 100644
--- a/helpcontent2/source/text/shared/autopi/01000000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010000.xhp b/helpcontent2/source/text/shared/autopi/01010000.xhp
index 32930bf472..a47fb27a11 100644
--- a/helpcontent2/source/text/shared/autopi/01010000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010100.xhp b/helpcontent2/source/text/shared/autopi/01010100.xhp
index 64cdcb4517..8ea6552526 100644
--- a/helpcontent2/source/text/shared/autopi/01010100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010200.xhp b/helpcontent2/source/text/shared/autopi/01010200.xhp
index 344c851fc1..aa7e4f92ca 100644
--- a/helpcontent2/source/text/shared/autopi/01010200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010300.xhp b/helpcontent2/source/text/shared/autopi/01010300.xhp
index be84409df5..772cb0aadd 100644
--- a/helpcontent2/source/text/shared/autopi/01010300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp
index 70057ed3d4..400ee67a91 100644
--- a/helpcontent2/source/text/shared/autopi/01010400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ YJ: checked</lastedited>
 <paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies your address information.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERPLACEHOLDER" id="bm_id1062044" localize="false"/>
 <paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
-<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from Tools - Options - %PRODUCTNAME - User data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from %PRODUCTNAME - User Data in the Options dialog box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERDEFINE" id="bm_id1482589" localize="false"/>
 <paragraph role="heading" id="par_idN10603" xml-lang="en-US" level="3" l10n="NEW">New sender address</paragraph>
 <paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERDEFINE">Use the address data from the following text boxes.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01010500.xhp b/helpcontent2/source/text/shared/autopi/01010500.xhp
index 5ed08ce3a5..8e72d8d603 100644
--- a/helpcontent2/source/text/shared/autopi/01010500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010600.xhp b/helpcontent2/source/text/shared/autopi/01010600.xhp
index b0c5a9bd15..ecc1bf86ff 100644
--- a/helpcontent2/source/text/shared/autopi/01010600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index 86ef883c14..d72c1c3ceb 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020100.xhp b/helpcontent2/source/text/shared/autopi/01020100.xhp
index 965f579c7a..2423a092f9 100755
--- a/helpcontent2/source/text/shared/autopi/01020100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020200.xhp b/helpcontent2/source/text/shared/autopi/01020200.xhp
index d3dacbd680..44934df296 100755
--- a/helpcontent2/source/text/shared/autopi/01020200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020200.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,11 +68,11 @@ YJ: checked</lastedited>
 <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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTSENDERDEFINE" id="bm_id2940153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERNAME" id="bm_id8901944" localize="false"/>
 <paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Complimentary close</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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERSTREET" 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>
diff --git a/helpcontent2/source/text/shared/autopi/01020300.xhp b/helpcontent2/source/text/shared/autopi/01020300.xhp
index d514b0ad64..bf9f5dbb93 100755
--- a/helpcontent2/source/text/shared/autopi/01020300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020300.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,24 +51,24 @@ YJ: checked</lastedited>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax3"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/41140" id="bm_id2698141" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERSTATE" 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="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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERCITY" 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="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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERFAX" id="bm_id5530869" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTRECEIVERPLACEHOLDER" id="bm_id5629749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTRECEIVERDATABASE" id="bm_id6467787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTFOOTER" id="bm_id3894466" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CHKFOOTERNEXTPAGES" id="bm_id5997192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CHKFOOTERPAGENUMBERS" 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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTTEMPLATENAME" id="bm_id1582384" localize="false"/>
 <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"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILETEMPLATEPATH" 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>
diff --git a/helpcontent2/source/text/shared/autopi/01020400.xhp b/helpcontent2/source/text/shared/autopi/01020400.xhp
index dc0f7e4da2..ecc8d4a204 100755
--- a/helpcontent2/source/text/shared/autopi/01020400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020400.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,13 +51,13 @@ YJ: checked</lastedited>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax4"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/41158" id="bm_id6082033" localize="false"/>
+<!-- removed HID 41158 -->
 <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"/>
+<!-- removed HID 41159 -->
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Include 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"/>
+<!-- removed HID 41160 -->
 <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>
diff --git a/helpcontent2/source/text/shared/autopi/01020500.xhp b/helpcontent2/source/text/shared/autopi/01020500.xhp
index 0825c2e278..6b24449171 100755
--- a/helpcontent2/source/text/shared/autopi/01020500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@ YJ: checked</lastedited>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax5"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/41163" id="bm_id1817377" localize="false"/>
+<!-- removed HID 41163 -->
 <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"/>
+<!-- removed HID 41167 -->
 <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"/>
+<!-- removed HID 41165 -->
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Create a fax from 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"/>
+<!-- removed HID 41166 -->
 <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>
diff --git a/helpcontent2/source/text/shared/autopi/01040000.xhp b/helpcontent2/source/text/shared/autopi/01040000.xhp
index 18c68e5e0e..d17be9ff44 100644
--- a/helpcontent2/source/text/shared/autopi/01040000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040100.xhp b/helpcontent2/source/text/shared/autopi/01040100.xhp
index 601e779e52..83dc960bd8 100755
--- a/helpcontent2/source/text/shared/autopi/01040100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040200.xhp b/helpcontent2/source/text/shared/autopi/01040200.xhp
index 6a76c6e56e..d3828063e9 100755
--- a/helpcontent2/source/text/shared/autopi/01040200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,15 +47,15 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotagenda2"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT" id="bm_id3149183" localize="false"/>
+<!-- removed HID SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT -->
 <bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_DATE" id="bm_id619525" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="5">Date</paragraph>
 <paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT">Specifies the date of the meeting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM" id="bm_id3147276" localize="false"/>
+<!-- removed HID SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM -->
 <bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_TIME" id="bm_id622272" localize="false"/><paragraph role="heading" id="hd_id3154749" xml-lang="en-US" level="2" l10n="U" oldref="7">Time</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM">Specifies the time of the meeting.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_TITLE" id="bm_id88503" localize="false"/><paragraph role="heading" id="par_idN10625" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
 <paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the title of the meeting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT" id="bm_id3150255" localize="false"/>
+<!-- removed HID SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT -->
 <bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_LOCATION" id="bm_id4133121" localize="false"/><paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Location</paragraph>
 <paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT">Specifies the location of the meeting.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="CHG" oldref="21"><link href="text/shared/autopi/01040300.xhp" name="Go to Agenda Wizard - Headings to include">Go to Agenda Wizard - Headings to include</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01040300.xhp b/helpcontent2/source/text/shared/autopi/01040300.xhp
index 17c39b4198..14b9addc36 100755
--- a/helpcontent2/source/text/shared/autopi/01040300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040400.xhp b/helpcontent2/source/text/shared/autopi/01040400.xhp
index 14b60512fe..4f5272f49a 100755
--- a/helpcontent2/source/text/shared/autopi/01040400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040400.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040500.xhp b/helpcontent2/source/text/shared/autopi/01040500.xhp
index b72e9d93cf..6cf8307750 100755
--- a/helpcontent2/source/text/shared/autopi/01040500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040500.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040600.xhp b/helpcontent2/source/text/shared/autopi/01040600.xhp
index 04ce505533..a08b4eed49 100755
--- a/helpcontent2/source/text/shared/autopi/01040600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040600.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040600.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01050000.xhp b/helpcontent2/source/text/shared/autopi/01050000.xhp
index 9aa087918d..fbbd650aec 100644
--- a/helpcontent2/source/text/shared/autopi/01050000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,16 +34,11 @@
 <title id="tit" xml-lang="en-US">Presentation Wizard</title>
 <filename>/text/shared/autopi/01050000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-05T11:02:05">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159224"><bookmark_value>wizards; presentations</bookmark_value>
-<bookmark_value>presentations; wizards</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_AUTOPILOT" id="bm_id3154894" localize="false"/>
+<bookmark_value>presentations; wizards</bookmark_value></bookmark>
+<!-- removed HID SID_AUTOPILOT -->
 <bookmark xml-lang="en-US" branch="hid/slot:10425" id="bm_id7406537" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotPresentations" id="bm_id3928952" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewPresentation" id="bm_id9551683" localize="false"/>
@@ -56,17 +48,17 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#dtapt"/>
 </section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link></emph> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
 <paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
 <embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
 <embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
 <embed href="text/shared/autopi/01050300.xhp#autopilotseite3"/>
 <embed href="text/shared/autopi/01050400.xhp#autopilotseite4"/>
 <embed href="text/shared/autopi/01050500.xhp#autopilotseite5"/>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_ASS:BUT_LAST" id="bm_id3156002" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:BUT_LAST" id="bm_id3156002" localize="false"/>
 <paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="2" l10n="U" oldref="4">&lt;&lt; Back</paragraph>
 <paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:PUSHBUTTON:DLG_ASS:BUT_LAST">Returns to the previous step without deleting your current settings.</ahelp> You can only select this button after the second editing step.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_ASS:BUT_NEXT" id="bm_id3153665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:BUT_NEXT" id="bm_id3153665" localize="false"/>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="6">Next &gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3156307" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:PUSHBUTTON:DLG_ASS:BUT_NEXT">Accepts the new settings and moves to the next page.</ahelp> You will not be able to select this button in the last editing step.</paragraph>
 <paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="2" l10n="U" oldref="8">Create</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01050100.xhp b/helpcontent2/source/text/shared/autopi/01050100.xhp
index 8880d6792d..a353fcfb8d 100755
--- a/helpcontent2/source/text/shared/autopi/01050100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@ dedr: fixed #i31165#</lastedited>
 </section>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="15">Type</paragraph>
 <paragraph role="paragraph" id="par_id3153684" xml-lang="en-US" l10n="U" oldref="23">You can determine the presentation type in this area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTY" id="bm_id3153749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY" id="bm_id3153749" localize="false"/>
 <paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="3" l10n="U" oldref="16">Empty presentation</paragraph>
 <paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTY">Creates a new (empty) presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATE" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE" id="bm_id3153346" localize="false"/>
 <paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3" l10n="U" oldref="17">From template</paragraph>
 <paragraph role="paragraph" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATE">Opens a list box containing various modifiable presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_OPEN" id="bm_id3166460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN" id="bm_id3166460" localize="false"/>
 <paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="18">Open existing presentation</paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_OPEN">Displays a list of previously created presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_PushButton_DLG_ASS_PB_PAGE1_OPEN" id="bm_id5456099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:PB_PAGE1_OPEN" id="bm_id5456099" localize="false"/>
 <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click <emph>Open</emph> to see a file selection dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_REGION" id="bm_id3156002" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_TEMPLATES" id="bm_id3155136" localize="false"/>
@@ -71,13 +68,13 @@ dedr: fixed #i31165#</lastedited>
 <paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SD_AUTOPILOT_TEMPLATES">Lists the available template categories for presentations.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_OPEN" id="bm_id3153665" localize="false"/>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="20">List of existing presentations (only available when you select the Open existing presentation option)</paragraph>
-<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
+<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>%PRODUCTNAME - Paths</emph> in the Options dialog box. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
 <paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
 <paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PREVIEW">Specifies that templates appear in the preview window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
 <paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="22">Do not show this dialog again</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="13">Continue here to <link href="text/shared/autopi/01050200.xhp" name="Wizard Page 2">Wizard Page 2</link>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01050200.xhp b/helpcontent2/source/text/shared/autopi/01050200.xhp
index 0f03077820..1d09621d93 100755
--- a/helpcontent2/source/text/shared/autopi/01050200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,18 +47,18 @@
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#dtapsz"/>
 </section>
-  <bookmark branch="hid/HID_SD_AUTOPILOT_PAGETEMPLATES" xml-lang="en-US" id="bm_id3153311"/><bookmark branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT" xml-lang="en-US" id="bm_id3152552"/><paragraph role="heading" level="2" id="hd_id3153749" l10n="U" xml-lang="en-US" oldref="20">Select a slide design</paragraph>
+  <bookmark branch="hid/HID_SD_AUTOPILOT_PAGETEMPLATES" xml-lang="en-US" id="bm_id3153311"/><bookmark branch="hid/sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT" xml-lang="en-US" id="bm_id3152552"/><paragraph role="heading" level="2" id="hd_id3153749" l10n="U" xml-lang="en-US" oldref="20">Select a slide design</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155338" xml-lang="en-US" oldref="26"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT" visibility="visible">Allows you to select a slide design for the presentation you selected on page 1 of the Wizard.</ahelp> In the upper list box you can choose from three slide design types (education, presentation backgrounds and presentations). In the lower list box, you can select one of the templates for your presentation.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3149177" l10n="U" xml-lang="en-US" oldref="21">Select an output medium</paragraph>
-  <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5" xml-lang="en-US" id="bm_id3152781"/><paragraph role="heading" level="3" id="hd_id3153681" l10n="U" xml-lang="en-US" oldref="32">Original</paragraph>
+  <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5" xml-lang="en-US" id="bm_id3152781"/><paragraph role="heading" level="3" id="hd_id3153681" l10n="U" xml-lang="en-US" oldref="32">Original</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3156347" xml-lang="en-US" oldref="33"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5" visibility="visible">Uses the original page format of the template.</ahelp></paragraph>
-  <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3147653" l10n="U" xml-lang="en-US" oldref="23">Overhead sheet</paragraph>
+  <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3147653" l10n="U" xml-lang="en-US" oldref="23">Overhead sheet</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153032" xml-lang="en-US" oldref="30"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3" visibility="visible">Creates a presentation to be used as overhead transparencies.</ahelp></paragraph>
-  <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4" xml-lang="en-US" id="bm_id3146948"/><paragraph role="heading" level="3" id="hd_id3148685" l10n="U" xml-lang="en-US" oldref="24">Paper</paragraph>
+  <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4" xml-lang="en-US" id="bm_id3146948"/><paragraph role="heading" level="3" id="hd_id3148685" l10n="U" xml-lang="en-US" oldref="24">Paper</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155419" xml-lang="en-US" oldref="31"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4" visibility="visible">Creates a presentation that can be printed on paper.</ahelp></paragraph>
-  <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1" xml-lang="en-US" id="bm_id3153349"/><paragraph role="heading" level="3" id="hd_id3148491" l10n="U" xml-lang="en-US" oldref="25">Screen</paragraph>
+  <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1" xml-lang="en-US" id="bm_id3153349"/><paragraph role="heading" level="3" id="hd_id3148491" l10n="U" xml-lang="en-US" oldref="25">Screen</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145119" xml-lang="en-US" oldref="28"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1" visibility="visible">Creates a computer screen presentation only.</ahelp> The screen is adjusted by default.</paragraph>
-  <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2" xml-lang="en-US" id="bm_id3149579"/><paragraph role="heading" level="3" id="hd_id3154898" l10n="U" xml-lang="en-US" oldref="22">Slide</paragraph>
+  <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2" xml-lang="en-US" id="bm_id3149579"/><paragraph role="heading" level="3" id="hd_id3154898" l10n="U" xml-lang="en-US" oldref="22">Slide</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153821" xml-lang="en-US" oldref="29"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2" visibility="visible">Creates a presentation to be used as slides.</ahelp></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3155388" l10n="U" oldref="12">Continue to <link href="text/shared/autopi/01050300.xhp" name="Presentation Wizard Page 3">Presentation Wizard Page 3</link>.</paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/autopi/01050300.xhp b/helpcontent2/source/text/shared/autopi/01050300.xhp
index 4a623373f6..5f54b2ef8f 100755
--- a/helpcontent2/source/text/shared/autopi/01050300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
 </section>
 <paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="2">Select a slide transition</paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_SD_AUTOPILOT_PAGE3">Assigns special effects to your presentation and determines its speed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE3_EFFECT" id="bm_id3155535" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="4">Effect</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT" id="bm_id3155535" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="4">Effect</paragraph>
 <paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE3_EFFECT">Specifies an effect for your presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE3_SPEED" id="bm_id3155892" localize="false"/><paragraph role="heading" id="hd_id3153346" xml-lang="en-US" level="3" l10n="U" oldref="6">Speed</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_ASS:LB_PAGE3_SPEED" id="bm_id3155892" localize="false"/><paragraph role="heading" id="hd_id3153346" xml-lang="en-US" level="3" l10n="U" oldref="6">Speed</paragraph>
 <paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE3_SPEED">Determines the effect speed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="8">Select the presentation type</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="9">Determines the timing for the presentation.</paragraph>
@@ -69,15 +66,15 @@
 <default><paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="22">You can change the settings later under the menu <link href="text/simpress/main0114.xhp" name="Presentation">Presentation</link>.</paragraph>
 </default>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_LIVE" id="bm_id3155136" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="10">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE" id="bm_id3155136" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="10">Default</paragraph>
 <paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_LIVE">The <emph>Default</emph> option runs the presentation as a full screen presentation with the specified speed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_KIOSK" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_KIOSK">Runs the presentation automatically, and restarts it again after a break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_TIME" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="14">Duration of page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_ASS:TMF_PAGE3_TIME" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="14">Duration of page</paragraph>
 <paragraph role="paragraph" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_TIME">Defines the duration of each presentation page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_BREAK" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3155922" xml-lang="en-US" level="3" l10n="U" oldref="16">Duration of pause</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3155922" xml-lang="en-US" level="3" l10n="U" oldref="16">Duration of pause</paragraph>
 <paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_BREAK">Defines the pause between each presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PAGE3_LOGO" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="3" l10n="U" oldref="18">Show logo</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="3" l10n="U" oldref="18">Show logo</paragraph>
 <paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PAGE3_LOGO">Specifies whether to display the $[officename] logo during the pause between each presentation.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="20">Click here to continue to <link href="text/shared/autopi/01050400.xhp" name="page 4 of the Presentation Wizard">page 4 of the Presentation Wizard</link>. The wizard ends here if you selected the "Empty presentation" option on page 1 of the Wizard.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/autopi/01050400.xhp b/helpcontent2/source/text/shared/autopi/01050400.xhp
index 5bd5208f9e..010e8ef6a3 100755
--- a/helpcontent2/source/text/shared/autopi/01050400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,11 +48,11 @@
   <embed href="text/shared/00/00000401.xhp#dtapsv"/>
 </section>
   <paragraph role="heading" level="2" id="hd_id3147571" l10n="U" xml-lang="en-US" oldref="29">Describe your basic ideas</paragraph>
-  <bookmark branch="hid/SD:EDIT:DLG_ASS:EDT_PAGE4_ASKNAME" xml-lang="en-US" id="bm_id3145071"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="30">What is your name or the name of your company?</paragraph>
+  <bookmark branch="hid/sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME" xml-lang="en-US" id="bm_id3145071"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="30">What is your name or the name of your company?</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149182" xml-lang="en-US" oldref="34"><ahelp hid="SD:EDIT:DLG_ASS:EDT_PAGE4_ASKNAME" visibility="visible">Specifies your name or the name of your company.</ahelp></paragraph>
-  <bookmark branch="hid/SD:EDIT:DLG_ASS:EDT_PAGE4_ASKTOPIC" xml-lang="en-US" id="bm_id3152551"/><paragraph role="heading" level="3" id="hd_id3156410" l10n="U" xml-lang="en-US" oldref="31">What is the subject of your presentation?</paragraph>
+  <bookmark branch="hid/sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC" xml-lang="en-US" id="bm_id3152551"/><paragraph role="heading" level="3" id="hd_id3156410" l10n="U" xml-lang="en-US" oldref="31">What is the subject of your presentation?</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149177" xml-lang="en-US" oldref="35"><ahelp hid="SD:EDIT:DLG_ASS:EDT_PAGE4_ASKTOPIC" visibility="visible">Specifies the topic of your presentation.</ahelp></paragraph>
-  <bookmark branch="hid/SD:MULTILINEEDIT:DLG_ASS:EDT_PAGE4_ASKINFORMATION" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3146797" l10n="U" xml-lang="en-US" oldref="32">Further ideas to be presented?</paragraph>
+  <bookmark branch="hid/sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3146797" l10n="U" xml-lang="en-US" oldref="32">Further ideas to be presented?</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149398" xml-lang="en-US" oldref="36"><ahelp hid="SD:MULTILINEEDIT:DLG_ASS:EDT_PAGE4_ASKINFORMATION" visibility="visible">Use this field for further thoughts and ideas that you would like to cover later in your presentation.</ahelp></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3157909" l10n="U" oldref="11">Continue to <link href="text/shared/autopi/01050500.xhp" name="Presentation Wizard Page 5">Presentation Wizard Page 5</link>.</paragraph>
  </body>
diff --git a/helpcontent2/source/text/shared/autopi/01050500.xhp b/helpcontent2/source/text/shared/autopi/01050500.xhp
index bbeb2ab3c0..12a3f9ac75 100755
--- a/helpcontent2/source/text/shared/autopi/01050500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 </section>
 <paragraph role="heading" id="hd_id3150178" xml-lang="en-US" level="2" l10n="U" oldref="19">Choose your pages</paragraph>
 <paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="CHG" oldref="21">In the list field, you see all pages belonging to the selected presentation template. All pages with a checkmark in the check box next to their names will be included in the created presentation. To not include a page, clear the check box in front of the page name. Click the small plus sign that is next to the page name to display the corresponding sub-items.<comment>UFI: fixes #112852#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PAGE5_SUMMARY" id="bm_id3145136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY" id="bm_id3145136" localize="false"/>
 <paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="20">Create summary</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PAGE5_SUMMARY">Creates a summary of all presentation contents.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="23">Return to the <link href="text/shared/autopi/01050000.xhp" name="Presentation Wizard">Presentation Wizard</link> title page.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01090000.xhp b/helpcontent2/source/text/shared/autopi/01090000.xhp
index a8f6b09f17..229cca8fdf 100755
--- a/helpcontent2/source/text/shared/autopi/01090000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090100.xhp b/helpcontent2/source/text/shared/autopi/01090100.xhp
index 92c026a80a..2c075d6911 100755
--- a/helpcontent2/source/text/shared/autopi/01090100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090100.xhp,v $
- * $Revision: 1.14.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,60 +45,60 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_LBTABLES" id="bm_id3154751" localize="false"/>
+<!-- removed HID HID_DLGFORM_LBTABLES -->
 <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"/>
+<!-- removed HID HID_DLGFORM_FIELDSAVAILABLE -->
 <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"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS -->
 <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"/>
+<!-- removed HID HID_DLGFORM_CMDMOVESELECTED -->
 <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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT -->
 <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"/>
+<!-- removed HID HID_DLGFORM_CMDMOVEALL -->
 <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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT -->
 <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"/>
+<!-- removed HID HID_DLGFORM_CMDREMOVESELECTED -->
 <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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT -->
 <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"/>
+<!-- removed HID HID_DLGFORM_CMDREMOVEALL -->
 <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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT -->
 <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>
@@ -127,7 +124,7 @@
 <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"/>
+<!-- removed HID HID_DLGFORM_FIELDSSELECTED -->
 <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>
diff --git a/helpcontent2/source/text/shared/autopi/01090200.xhp b/helpcontent2/source/text/shared/autopi/01090200.xhp
index 8f19fec2d3..9a34cd5195 100755
--- a/helpcontent2/source/text/shared/autopi/01090200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090200.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090210.xhp b/helpcontent2/source/text/shared/autopi/01090210.xhp
index 88f9e1b00e..f591fbda74 100755
--- a/helpcontent2/source/text/shared/autopi/01090210.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090210.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090210.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090220.xhp b/helpcontent2/source/text/shared/autopi/01090220.xhp
index a7d665bb8b..e69896c7ad 100755
--- a/helpcontent2/source/text/shared/autopi/01090220.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090220.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090220.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090300.xhp b/helpcontent2/source/text/shared/autopi/01090300.xhp
index 13b0b52b4f..82dd7c209b 100755
--- a/helpcontent2/source/text/shared/autopi/01090300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090400.xhp b/helpcontent2/source/text/shared/autopi/01090400.xhp
index 5d175139c7..ea8faca64b 100755
--- a/helpcontent2/source/text/shared/autopi/01090400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090400.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090500.xhp b/helpcontent2/source/text/shared/autopi/01090500.xhp
index c626f64140..0ccecc6175 100755
--- a/helpcontent2/source/text/shared/autopi/01090500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090600.xhp b/helpcontent2/source/text/shared/autopi/01090600.xhp
index 3dbbf76556..cdd22d17cc 100755
--- a/helpcontent2/source/text/shared/autopi/01090600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090600.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100000.xhp b/helpcontent2/source/text/shared/autopi/01100000.xhp
index d98e06c15c..82e4bfb157 100755
--- a/helpcontent2/source/text/shared/autopi/01100000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100100.xhp b/helpcontent2/source/text/shared/autopi/01100100.xhp
index 0dfe78a897..edf309b6d7 100755
--- a/helpcontent2/source/text/shared/autopi/01100100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100100.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100150.xhp b/helpcontent2/source/text/shared/autopi/01100150.xhp
index 1e2b84fa4a..d5196bf6f8 100755
--- a/helpcontent2/source/text/shared/autopi/01100150.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100150.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100150.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100200.xhp b/helpcontent2/source/text/shared/autopi/01100200.xhp
index 48194d32cc..37e2951c3a 100755
--- a/helpcontent2/source/text/shared/autopi/01100200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100300.xhp b/helpcontent2/source/text/shared/autopi/01100300.xhp
index 8cca83df98..8329e3af14 100755
--- a/helpcontent2/source/text/shared/autopi/01100300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100400.xhp b/helpcontent2/source/text/shared/autopi/01100400.xhp
index eabac575a4..457a357cbc 100755
--- a/helpcontent2/source/text/shared/autopi/01100400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100500.xhp b/helpcontent2/source/text/shared/autopi/01100500.xhp
index 062f8612eb..e75d6adbbb 100755
--- a/helpcontent2/source/text/shared/autopi/01100500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01100500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01110000.xhp b/helpcontent2/source/text/shared/autopi/01110000.xhp
index 6238fd3da8..8145f9552a 100644
--- a/helpcontent2/source/text/shared/autopi/01110000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01110100.xhp b/helpcontent2/source/text/shared/autopi/01110100.xhp
index fd6f10fe09..285745cee2 100755
--- a/helpcontent2/source/text/shared/autopi/01110100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
 <paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="12">Assign design</paragraph>
 <paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="13">In this area, you can choose to create a new design and select or delete an existing design.</paragraph>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="3">If you delete a design, you will only delete the design information in the Wizard. An export file will not be deleted by this action.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_NEW_DESIGN" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN" id="bm_id3154318" localize="false"/>
 <paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="4">New design</paragraph>
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_NEW_DESIGN">Creates a new design in the next pages of the Wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_OLD_DESIGN" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN" id="bm_id3147577" localize="false"/>
 <paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="6">Existing Design</paragraph>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_OLD_DESIGN">Loads an existing design from the design list to use as a starting point for the steps to follow on the next pages of the Wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_PUBLISHING:PAGE1_DESIGNS" id="bm_id3156346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS" id="bm_id3156346" localize="false"/>
 <paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="2" l10n="U" oldref="8">Design list</paragraph>
 <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:LISTBOX:DLG_PUBLISHING:PAGE1_DESIGNS">Displays all existing designs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE1_DEL_DESIGN" id="bm_id3150986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN" id="bm_id3150986" localize="false"/>
 <paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="2" l10n="U" oldref="10">Delete Selected Design</paragraph>
 <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE1_DEL_DESIGN">Deletes the selected design from the design list.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/autopi/01110200.xhp b/helpcontent2/source/text/shared/autopi/01110200.xhp
index 05a4ad6128..6f161e832c 100644
--- a/helpcontent2/source/text/shared/autopi/01110200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,36 +58,36 @@
 </section>
 <paragraph role="heading" id="hd_id3152924" xml-lang="en-US" level="2" l10n="U" oldref="9">Publication type</paragraph>
 <paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="10">Defines the basic settings for the intended export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_STANDARD" id="bm_id3157958" localize="false"/><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="3">Standard HTML format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD" id="bm_id3157958" localize="false"/><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="3">Standard HTML format</paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_STANDARD">Creates standard HTML pages from export pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_FRAMES" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Standard HTML with frames</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Standard HTML with frames</paragraph>
 <paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_FRAMES">Creates standard HTML pages with frames. The exported page will be placed in the main frame, and the frame to the left will display a table of contents in the form of hyperlinks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_CONTENT" id="bm_id3147242" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="11">Create title page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT" id="bm_id3147242" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="11">Create title page</paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_CONTENT">Creates a title page for your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_NOTES" id="bm_id3149236" localize="false"/><paragraph role="heading" id="hd_id3163804" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="IMPRESS">Show notes 
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES" id="bm_id3149236" localize="false"/><paragraph role="heading" id="hd_id3163804" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="IMPRESS">Show notes 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_NOTES">Specifies that your notes are also displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_KIOSK" id="bm_id3147336" localize="false"/><paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK" id="bm_id3147336" localize="false"/><paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_KIOSK">Creates a default HTML presentation as a kiosk export, in which the slides are automatically advanced after a specified amount of time.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_DEFAULT" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="17">As stated in document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="17">As stated in document</paragraph>
 <paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_DEFAULT">The slide transition depends on the timing that you set for each slide in the presentation. If you set a manual page transition, the HTML presentation introduces a new page by pressing any key from your keyboard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_AUTO" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3156307" xml-lang="en-US" level="3" l10n="U" oldref="19">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3156307" xml-lang="en-US" level="3" l10n="U" oldref="19">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_AUTO">The page transition takes place automatically after the specified period of time elapses and does not depend on the presentation's contents</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_PUBLISHING:PAGE2_DURATION_TMF" id="bm_id3152472" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="21">Slide view time</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF" id="bm_id3152472" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="21">Slide view time</paragraph>
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:TIMEFIELD:DLG_PUBLISHING:PAGE2_DURATION_TMF">Defines the amount of time for each slide display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_ENDLESS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="23">Endless</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="23">Endless</paragraph>
 <paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_ENDLESS">Automatically restarts the HTML presentation after the last slide has been displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_WEBCAST" id="bm_id3152811" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="U" oldref="25">WebCast</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST" id="bm_id3152811" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="U" oldref="25">WebCast</paragraph>
 <paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_WEBCAST">In a WebCast export, automatic scripts will be generated with Perl or ASP support.</ahelp> This enables the speaker (for example, a speaker in a telephone conference using a slide show on the Internet) to change the slides in the audience's web browsers. You will find more information on <link href="text/shared/autopi/01110200.xhp" name="WebCast">WebCast</link> later in this section.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_ASP" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="27">Active Server Pages (ASP)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="27">Active Server Pages (ASP)</paragraph>
 <paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_ASP">When you select the<emph> ASP </emph>option, the WebCast export creates ASP pages. Note that the HTML presentation can only be offered by a web server supporting ASP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_PERL" id="bm_id3152920" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="29">Perl</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL" id="bm_id3152920" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="29">Perl</paragraph>
 <paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_PERL">Used by WebCast export to create HTML pages and Perl scripts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_INDEX" id="bm_id3151382" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="4" l10n="U" oldref="31">URL for listeners</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_INDEX" id="bm_id3151382" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="4" l10n="U" oldref="31">URL for listeners</paragraph>
 <paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_INDEX">Specifies the URL (absolute or relative) to be entered by the viewer in order to see the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_URL" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="4" l10n="U" oldref="33">URL for presentation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_URL" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="4" l10n="U" oldref="33">URL for presentation</paragraph>
 <paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_URL">Specifies the URL (absolute or relative), where the created HTML presentation on the web server has been saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_CGI" id="bm_id3155429" localize="false"/><paragraph role="heading" id="hd_id3153367" xml-lang="en-US" level="4" l10n="U" oldref="35">URL for Perl scripts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_CGI" id="bm_id3155429" localize="false"/><paragraph role="heading" id="hd_id3153367" xml-lang="en-US" level="4" l10n="U" oldref="35">URL for Perl scripts</paragraph>
 <paragraph role="paragraph" id="par_id3159255" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_CGI">Specifies the URL (absolute or relative) for the generated Perl scripts.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="37">More Information on WebCast Export</paragraph>
 <paragraph role="paragraph" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="38">There are two possible options for exporting $[officename] Impress presentations using WebCast technology: Active Server Pages (ASP) and Perl.</paragraph>
@@ -99,7 +96,7 @@
 <paragraph role="heading" id="hd_id3159197" xml-lang="en-US" level="3" l10n="U" oldref="40">Exporting</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="41">To export to ASP, in a $[officename] Impress document choose <emph>File - Export</emph>. You then see the <emph>Export</emph> dialog in which you select <emph>HTML Document</emph> as the file type. Once you have selected a directory and entered a file name, click <emph>Save</emph>. For export as ASP, we recommend selecting a "secret" file name for the HTML file (see below for more details). You then see the <emph>HTML Export</emph> dialog. Several files will be written to the directory you have just selected.</paragraph>
+<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="41">To export to ASP, in a $[officename] Impress document choose <emph>File - Export</emph>. You then see the <emph>Export</emph> dialog in which you select <emph>HTML Document</emph> as the file type. Once you have selected a directory and entered a file name, click <emph>Export</emph>. For export as ASP, we recommend selecting a "secret" file name for the HTML file (see below for more details). You then see the <emph>HTML Export</emph> dialog. Several files will be written to the directory you have just selected.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3149410" xml-lang="en-US" l10n="U" oldref="42">The presenter uses the entered file name to change between the slides viewed by the audience. You can save the WebCast files locally or save them directly to an HTTP server. You can later transfer locally saved files to the HTTP server by FTP. Note that WebCast only works if the files are requested over an HTTP server.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01110300.xhp b/helpcontent2/source/text/shared/autopi/01110300.xhp
index cd12a9927f..7e722d73a5 100755
--- a/helpcontent2/source/text/shared/autopi/01110300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,23 +49,23 @@
 </section>
 <paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="11">Save graphics as</paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="12">Determines the image format. You can also define the compression value for the export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PUBLISHING_PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphics format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphics format</paragraph>
 <paragraph role="paragraph" id="par_id4653767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The files are exported as PNG files. PNG files are compressed without loss of data, and can contain more than 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_GIF" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="13">GIF - Graphics Interchange Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="13">GIF - Graphics Interchange Format</paragraph>
 <paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_GIF">The files are exported as GIF files. GIF files are compressed without loss of data, and have a maximum of 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_JPG" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">JPG - Compressed file format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">JPG - Compressed file format</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_JPG">The files are exported as JPEG files. JPEG files are compressed, with adjustable compression and can contain more than 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:COMBOBOX:DLG_PUBLISHING:PAGE3_QUALITY" id="bm_id3156023" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="17">Quality</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY" id="bm_id3156023" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="17">Quality</paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:COMBOBOX:DLG_PUBLISHING:PAGE3_QUALITY">Specifies the compression factor of the JPEG graphic. A 100% value offers the best quality for a large data range. The 25% factor indicates small files with inferior image quality.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="2" l10n="U" oldref="19">Monitor resolution</paragraph>
 <paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="20">Defines the resolution for the target screen. Depending on the selected resolution, the image will be displayed in a reduced size. You can specify a reduction of up to 80% from the original size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1" id="bm_id3154389" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Low resolution (640x480 pixels)</paragraph><comment>see i73719</comment><paragraph role="paragraph" id="par_id3153380" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1">Select the low resolution to keep the file size small, even for presentations with many slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_2" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="3" l10n="CHG" oldref="23">Medium resolution (800x600 pixels)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1" id="bm_id3154389" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Low resolution (640x480 pixels)</paragraph><comment>see i73719</comment><paragraph role="paragraph" id="par_id3153380" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1">Select the low resolution to keep the file size small, even for presentations with many slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="3" l10n="CHG" oldref="23">Medium resolution (800x600 pixels)</paragraph>
 <paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_2">Select the medium resolution for a medium-sized presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_3" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="25">High resolution (1024x768 pixels)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="25">High resolution (1024x768 pixels)</paragraph>
 <paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_3">Select a high resolution for a high quality slide display.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154946" xml-lang="en-US" level="2" l10n="U" oldref="31">Export</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE3_SLD_SOUND" id="bm_id3148672" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="3" l10n="U" oldref="29">Export sounds when slide advances</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND" id="bm_id3148672" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="3" l10n="U" oldref="29">Export sounds when slide advances</paragraph>
 <paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE3_SLD_SOUND">Specifies that the sound files that are defined as an effect for slide transitions are exported.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01110400.xhp b/helpcontent2/source/text/shared/autopi/01110400.xhp
index 9befa72476..ade99d346c 100755
--- a/helpcontent2/source/text/shared/autopi/01110400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,19 +52,19 @@
   <embed href="text/shared/00/00000401.xhp#htmlspeichern4"/>
 </section>
 <paragraph role="heading" id="hd_id3155392" xml-lang="en-US" level="2" l10n="U" oldref="15">Information for the title page</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_AUTHOR" id="bm_id3155338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR" id="bm_id3155338" localize="false"/>
 <paragraph role="heading" id="hd_id3155941" xml-lang="en-US" level="3" l10n="U" oldref="3">Author</paragraph>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_AUTHOR">Specifies the name of the publication's author.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_EMAIL_EDIT" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT" id="bm_id3145346" localize="false"/>
 <paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">E-mail address</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_EMAIL_EDIT">Specifies the e-mail address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_WWW_EDIT" id="bm_id3163803" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT" id="bm_id3163803" localize="false"/>
 <paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="7">Your homepage</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_WWW_EDIT">Specifies your homepage. A hyperlink will be inserted in the publication.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:MULTILINEEDIT:DLG_PUBLISHING:PAGE4_MISC" id="bm_id3149236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC" id="bm_id3149236" localize="false"/>
 <paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="3" l10n="U" oldref="9">Additional information</paragraph>
 <paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:MULTILINEEDIT:DLG_PUBLISHING:PAGE4_MISC">Specifies additional text to appear on the title page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE4_DOWNLOAD" id="bm_id3157910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD" id="bm_id3157910" localize="false"/>
 <paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="17"><switchinline select="appl"><caseinline select="IMPRESS">Link to a copy of the original presentation
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147619" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="appl"><caseinline select="IMPRESS"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE4_DOWNLOAD">Inserts a hyperlink to download a copy of the presentation file.</ahelp>
diff --git a/helpcontent2/source/text/shared/autopi/01110500.xhp b/helpcontent2/source/text/shared/autopi/01110500.xhp
index 3659692ff1..be142b3715 100755
--- a/helpcontent2/source/text/shared/autopi/01110500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 </section>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="7">Select button style</paragraph>
 <paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="8">Specifies whether you want to insert navigation buttons in your presentation. You can also select the style of the buttons.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE5_TEXTONLY" id="bm_id3143268" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY" id="bm_id3143268" localize="false"/>
 <paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="3">Text only</paragraph>
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE5_TEXTONLY">Inserts only text hyperlinks instead of buttons.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156411" xml-lang="en-US" level="2" l10n="U" oldref="5">Selection field</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01110600.xhp b/helpcontent2/source/text/shared/autopi/01110600.xhp
index 683a45c9bd..c68c380190 100755
--- a/helpcontent2/source/text/shared/autopi/01110600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,28 +53,28 @@
 </section>
 <paragraph role="heading" id="hd_id3152924" xml-lang="en-US" level="2" l10n="U" oldref="21">Select color scheme</paragraph>
 <paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="22">Determines the color scheme and the colors for text and background.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DOCCOLORS" id="bm_id3145090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS" id="bm_id3145090" localize="false"/>
 <paragraph role="heading" id="hd_id3147291" xml-lang="en-US" level="3" l10n="U" oldref="23">Apply color scheme from document</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DOCCOLORS">Determines the colors from the styles used in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DEFAULT" id="bm_id3146958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT" id="bm_id3146958" localize="false"/>
 <paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="25">Use browser colors</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DEFAULT">Uses the default colors of the viewer's Web Browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_USER" id="bm_id3152997" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_USER" id="bm_id3152997" localize="false"/>
 <paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="27">Use custom color scheme</paragraph>
 <paragraph role="paragraph" id="par_id3149399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_USER">Allows you to define your own colors for some presentation objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_TEXT" id="bm_id3145382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT" id="bm_id3145382" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="8">Text</paragraph>
 <paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_TEXT">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the text color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_LINK" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_LINK" id="bm_id3155389" localize="false"/>
 <paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="10">Hyperlink</paragraph>
 <paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_LINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the hyperlink color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_ALINK" id="bm_id3153825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK" id="bm_id3153825" localize="false"/>
 <paragraph role="heading" id="hd_id3149234" xml-lang="en-US" level="3" l10n="U" oldref="14">Active Link</paragraph>
 <paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_ALINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the active link color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_VLINK" id="bm_id3153822" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK" id="bm_id3153822" localize="false"/>
 <paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="12">Visited Link</paragraph>
 <paragraph role="paragraph" id="par_id3150670" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_VLINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the visited link color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_BACK" id="bm_id3152360" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_BACK" id="bm_id3152360" localize="false"/>
 <paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="3" l10n="U" oldref="7">Background</paragraph>
 <paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_BACK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the background color of the presentation.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/autopi/01120000.xhp b/helpcontent2/source/text/shared/autopi/01120000.xhp
index ecb34db2fb..7e4b48415b 100755
--- a/helpcontent2/source/text/shared/autopi/01120000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01120100.xhp b/helpcontent2/source/text/shared/autopi/01120100.xhp
index 00a6f7eb1a..131d3379a4 100755
--- a/helpcontent2/source/text/shared/autopi/01120100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#gruppen1"/>
 </section>
-  <bookmark branch="hid/DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS" xml-lang="en-US" id="bm_id3154927"/><paragraph role="heading" level="2" id="hd_id3153894" l10n="U" xml-lang="en-US" oldref="3">Which names do you want to give the option fields?</paragraph>
+  <!-- removed HID DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS --><paragraph role="heading" level="2" id="hd_id3153894" l10n="U" xml-lang="en-US" oldref="3">Which names do you want to give the option fields?</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3154673" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS" visibility="visible">Specifies the respective label for each option field. You will see the label of the option field in the form.</ahelp> This entry corresponds to the <link href="text/shared/02/01170101.xhp" name="Label">Label</link> property of the option field.</paragraph>
-  <bookmark branch="hid/DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT" xml-lang="en-US" id="bm_id3153750"/><paragraph role="heading" level="3" id="hd_id3155805" l10n="U" xml-lang="en-US" oldref="10">Accept</paragraph>
+  <!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT --><paragraph role="heading" level="3" id="hd_id3155805" l10n="U" xml-lang="en-US" oldref="10">Accept</paragraph>
   <table id="tbl_id3145211">
    
    
@@ -68,9 +65,9 @@
    
   </table>
   <paragraph role="paragraph" id="par_id3154749" l10n="U" xml-lang="en-US" oldref="6">Enter the label for each option field of the group that you want to create and copy the label to the list by clicking the arrow button. Repeat this procedure until all the option fields are defined.</paragraph>
-  <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS" xml-lang="en-US" id="bm_id3147243"/><paragraph role="heading" level="2" id="hd_id3150443" l10n="U" xml-lang="en-US" oldref="7">Option fields</paragraph>
+  <!-- removed HID DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS --><paragraph role="heading" level="2" id="hd_id3150443" l10n="U" xml-lang="en-US" oldref="7">Option fields</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3152996" xml-lang="en-US" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS" visibility="visible">Displays all option fields which have to be included in the group box.</ahelp></paragraph>
-  <bookmark branch="hid/DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT" xml-lang="en-US" id="bm_id3153146"/><paragraph role="heading" level="3" id="hd_id3146949" l10n="U" xml-lang="en-US" oldref="11">Remove</paragraph>
+  <!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT --><paragraph role="heading" level="3" id="hd_id3146949" l10n="U" xml-lang="en-US" oldref="11">Remove</paragraph>
   <table id="tbl_id3149578">
    
    
diff --git a/helpcontent2/source/text/shared/autopi/01120200.xhp b/helpcontent2/source/text/shared/autopi/01120200.xhp
index 054935988a..076065d272 100755
--- a/helpcontent2/source/text/shared/autopi/01120200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,11 +50,11 @@
 </section>
   <paragraph role="heading" level="2" id="hd_id3157896" l10n="U" xml-lang="en-US" oldref="3">Should one option field be selected as a default?</paragraph>
   <paragraph role="paragraph" id="par_id3149346" l10n="U" xml-lang="en-US" oldref="4">Specifies whether you want to set default settings for the option box.</paragraph>
-  <bookmark branch="hid/DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES" xml-lang="en-US" id="bm_id3154288"/><paragraph role="heading" level="3" id="hd_id3147226" l10n="U" xml-lang="en-US" oldref="5">Yes, the following:</paragraph>
+  <!-- removed HID DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES --><paragraph role="heading" level="3" id="hd_id3147226" l10n="U" xml-lang="en-US" oldref="5">Yes, the following:</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150774" xml-lang="en-US" oldref="10"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES" visibility="visible">Specifies that you want an option field to be selected as a default after opening the form.</ahelp> Choose the option field from the box.</paragraph>
-  <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD" xml-lang="en-US" id="bm_id3149182"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="6">List box</paragraph>
+  <!-- removed HID DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD --><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="6">List box</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3146957" xml-lang="en-US" oldref="7"><ahelp hid="DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD" visibility="visible">Select the option field that you want to have as the default when opening the form.</ahelp></paragraph>
-  <bookmark branch="hid/DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO" xml-lang="en-US" id="bm_id3153031"/><paragraph role="heading" level="3" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="8">No, one particular field is not going to be selected</paragraph>
+  <!-- removed HID DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO --><paragraph role="heading" level="3" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="8">No, one particular field is not going to be selected</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3163802" xml-lang="en-US" oldref="9"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO" visibility="visible">Specifies that you do not want any option field to be the default choice.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01120300.xhp b/helpcontent2/source/text/shared/autopi/01120300.xhp
index 89101bf463..f2d9fe04e5 100755
--- a/helpcontent2/source/text/shared/autopi/01120300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#gruppen3"/>
 </section>
-  <bookmark branch="hid/DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" xml-lang="en-US" id="bm_id3155805"/><paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US" oldref="3">Which value do you want to assign to each option?</paragraph>
+  <!-- removed HID DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE --><paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US" oldref="3">Which value do you want to assign to each option?</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3152425" xml-lang="en-US" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" visibility="visible">Select a number or a text as a reference value for the selected option field.</ahelp></paragraph>
-  <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" xml-lang="en-US" id="bm_id3147088"/><paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US" oldref="5">Option fields</paragraph>
+  <!-- removed HID DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS --><paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US" oldref="5">Option fields</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155941" xml-lang="en-US" oldref="6"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" visibility="visible">Select the option field for which you want to assign the reference value.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01120400.xhp b/helpcontent2/source/text/shared/autopi/01120400.xhp
index 8e4f5339d2..ede1f0463e 100644
--- a/helpcontent2/source/text/shared/autopi/01120400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01120500.xhp b/helpcontent2/source/text/shared/autopi/01120500.xhp
index f756f381d0..af0428d327 100755
--- a/helpcontent2/source/text/shared/autopi/01120500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
   <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#gruppen5"/>
 </section>
-  <bookmark branch="hid/DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT" xml-lang="en-US" id="bm_id3156211"/><paragraph role="heading" level="2" id="hd_id3144415" l10n="U" xml-lang="en-US" oldref="3">Which caption is to be given to your option group?</paragraph>
+  <!-- removed HID DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT --><paragraph role="heading" level="2" id="hd_id3144415" l10n="U" xml-lang="en-US" oldref="3">Which caption is to be given to your option group?</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3163829" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT" visibility="visible">Specifies the label for the option box. You will see the label of the group box displayed in the form.</ahelp> The text you enter here will correspond to the <link href="text/shared/02/01170101.xhp" name="Label">Label</link> property of the group box.</paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 12227de0d4..1bdbbafdfd 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01130000.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01130000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Document Converter</title>
@@ -43,6 +40,7 @@
 <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"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDHELP" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_DIALOG" id="bm_id3150478" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/macro:///ImportWizard.Main.Main" id="bm_id4087038" localize="false"/>
 <paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="9">Document Converter</paragraph>
 <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>
@@ -50,7 +48,7 @@
 <section id="howtoget">
 <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_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from older versions, 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>
 <embed href="text/shared/autopi/01130100.xhp#seite1"/>
 <embed href="text/shared/autopi/01130200.xhp#seite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01130100.xhp b/helpcontent2/source/text/shared/autopi/01130100.xhp
index cd1f9d1d44..4899ec6659 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01130100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130100.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,15 +48,15 @@
   <embed href="text/shared/00/00000401.xhp#autopilotmsimport1"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTSODOCUMENTS" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts binary $[officename] documents (StarOffice 5.2 and before) into the OpenDocument format used by $[officename].</ahelp><comment>UFI: dont use a variable!</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts old binary documents into the OpenDocument format used by $[officename].</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKWRITER" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3153049" xml-lang="en-US" level="3" l10n="U" oldref="29">Text documents</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of $[officename] Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKCALC" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="31">Spreadsheets</paragraph>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of $[officename] Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKIMPRESS" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="3" l10n="U" oldref="33">Drawing/presentation documents</paragraph>
-<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of $[officename] Draw *.sda into OpenDocument *.odg documents, and $[officename] Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of Draw *.sda into OpenDocument *.odg documents, and Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKMATHGLOBAL" id="bm_id3156346" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="35">Master documents/formulas</paragraph>
-<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of $[officename] Writer master documents *.sgl into OpenDocument *.odm documents, and $[officename] Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of Writer master documents *.sgl into OpenDocument *.odm documents, and Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTMSDOCUMENTS" id="bm_id3147209" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="37">Microsoft Office</paragraph>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="38">Converts Microsoft Office documents into the OpenDocument format.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKWORD" id="bm_id3148685" localize="false"/><paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3" l10n="U" oldref="3">Word documents</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01130200.xhp b/helpcontent2/source/text/shared/autopi/01130200.xhp
index 9cd4e3cdbc..c73187e455 100755
--- a/helpcontent2/source/text/shared/autopi/01130200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01130200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp
index 4e180daa23..73fae10bb2 100644
--- a/helpcontent2/source/text/shared/autopi/01150000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01150000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01150000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,8 +31,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01150000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Euro Converter Wizard</title>
@@ -50,7 +46,9 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_EURO_CONVERTER" id="bm_id7067290" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id3150476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/><paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGCONVERT_DIALOG" id="bm_id3150477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/>
+<paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
 <paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="2"><variable id="eurokonv"><ahelp hid=".uno:EuroConverter">Converts the currency amounts found in $[officename] Calc documents and in fields and tables of $[officename] Writer documents into euros.</ahelp>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="54">Only closed files are converted. It is possible, however, to use the Euro Converter in an open $[officename] Calc document. In this case, a separate dialog opens. This dialog is described <link href="text/shared/autopi/01150000.xhp" name="at the end of this section">at the end of this section</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 17276999bd..70cca1dbdb 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01170000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Address Data Source</title>
@@ -44,6 +41,7 @@
 <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/HID_ABSPILOT" id="bm_id3581348" 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>
 <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>
@@ -58,7 +56,7 @@
 <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"/>
+<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"/>
@@ -67,25 +65,25 @@
 <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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
diff --git a/helpcontent2/source/text/shared/autopi/01170200.xhp b/helpcontent2/source/text/shared/autopi/01170200.xhp
index dd30f7d03b..f57f0fdd63 100755
--- a/helpcontent2/source/text/shared/autopi/01170200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170200.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01170300.xhp b/helpcontent2/source/text/shared/autopi/01170300.xhp
index b46b0104e0..1a4020031d 100755
--- a/helpcontent2/source/text/shared/autopi/01170300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01170400.xhp b/helpcontent2/source/text/shared/autopi/01170400.xhp
index 9c0039996f..17190d22ec 100755
--- a/helpcontent2/source/text/shared/autopi/01170400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170400.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170400.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,10 +49,10 @@
 </section>
 <paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">Location</paragraph>
 <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the location of the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE" id="bm_id3865169" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE" id="bm_id3865169" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BROWSECONN" id="bm_id1817072" localize="false"/><paragraph role="heading" id="par_idN105BE" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN105C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the location using a file dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_CheckBox_RID_PAGE_FINAL_CB_REGISTER_DS" id="bm_id1906186" localize="false"/><paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="2" l10n="NEW">Make this address book available to all modules in %PRODUCTNAME</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS" id="bm_id1906186" localize="false"/><paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="2" l10n="NEW">Make this address book available to all modules in %PRODUCTNAME</paragraph>
 <paragraph role="paragraph" id="par_idN105C9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Registers the newly created database file in %PRODUCTNAME. The database will then be listed in the data source window (F4). If this check box is cleared, the database will be available only by opening the database file.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3144436" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Address book name</paragraph>
 <paragraph role="paragraph" id="par_id3154673" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME">Specifies the data source name.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170500.xhp b/helpcontent2/source/text/shared/autopi/01170500.xhp
index 2f3bd40659..17e22aa0f8 100755
--- a/helpcontent2/source/text/shared/autopi/01170500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index c0c61ff588..945a27e1db 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -130,4 +126,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/autopi/purchase.xhp b/helpcontent2/source/text/shared/autopi/purchase.xhp
index 90807c7539..989253d945 100644
--- a/helpcontent2/source/text/shared/autopi/purchase.xhp
+++ b/helpcontent2/source/text/shared/autopi/purchase.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: purchase.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index 579af0f79b..7de1e40774 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: startup.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard00.xhp b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
index 92c2ab8f74..9af659a46b 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard00.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard00.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard01.xhp b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
index ca57d65dbc..d4551aa9b5 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard01.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard01.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,23 +29,25 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopiwebwizard01xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Web Wizard - Introduction</title>
-<filename>/text/shared/autopi/webwizard01.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="introduction"><comment>UFI: removed help id</comment><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/autopi/webwizard01.xhp">Web Wizard - Introduction</link></paragraph>
-<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can use the Web Wizard to maintain web pages on a server.</ahelp> You can also load previously saved Web Wizard settings to maintain an existing web page. These settings include information about the local folder and the FTP server.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/HID1_LST_SESSIONS" id="bm_id2904751" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Choose Web Wizard settings</paragraph>
-<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US" l10n="NEW"><ahelp hid="34207">Select the settings that you want to load and then click <emph>Load</emph>. To start the wizard with the default settings, select "none".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID1_BTN_DEL_SES" id="bm_id5166783" localize="false"/><paragraph role="heading" id="par_idN1055E" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
-<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW"><ahelp hid="34209">Deletes the selected settings.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10565" xml-lang="en-US" l10n="NEW"><link href="text/shared/autopi/webwizard02.xhp">Web Wizard - Documents</link></paragraph>
-</body>
-</helpdocument>
+      <topic id="textsharedautopiwebwizard01xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Web Wizard - Introduction</title>
+         <filename>/text/shared/autopi/webwizard01.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="introduction"><comment>UFI: removed help id</comment>
+<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/autopi/webwizard01.xhp">Web Wizard - Introduction</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph" l10n="CHG"><ahelp hid=".">You can use the Web Wizard to maintain web pages on a server.</ahelp> You can also load previously saved Web Wizard settings to maintain an existing web page. These settings include information about the local folder and the FTP server.</paragraph>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/HID1_LST_SESSIONS" id="bm_id2904751" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10557" role="heading" level="2" l10n="NEW">Choose Web Wizard settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1055B" role="paragraph" l10n="CHG"><ahelp hid="34207">Select the settings that you want to load and then click <emph>Load</emph>. To start the wizard with the default settings, select "default".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID1_BTN_DEL_SES" id="bm_id5166783" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1055E" role="heading" level="2" l10n="NEW">Delete</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10562" role="paragraph" l10n="NEW"><ahelp hid="34209">Deletes the selected settings.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><link href="text/shared/autopi/webwizard02.xhp">Web Wizard - Documents</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/autopi/webwizard02.xhp b/helpcontent2/source/text/shared/autopi/webwizard02.xhp
index 4ed1bf5cf7..ac8ca33eb5 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard02.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard02.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard02.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard03.xhp b/helpcontent2/source/text/shared/autopi/webwizard03.xhp
index 7b644dcf9a..5267669ce4 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard03.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard03.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard03.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard04.xhp b/helpcontent2/source/text/shared/autopi/webwizard04.xhp
index 29e82ee1e1..161b1194db 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard04.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard04.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard04.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05.xhp b/helpcontent2/source/text/shared/autopi/webwizard05.xhp
index a1bca19708..80493df2b1 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard05.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp b/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
index 8d93653d34..aad1e47c3d 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard05bi.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05is.xhp b/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
index 59a797a0f1..66ee361106 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard05is.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard06.xhp b/helpcontent2/source/text/shared/autopi/webwizard06.xhp
index 9ef53e8743..3b073277da 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard06.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard06.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard06.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard07.xhp b/helpcontent2/source/text/shared/autopi/webwizard07.xhp
index 994b902205..e2f93809b9 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard07.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard07.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard07.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp b/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
index 565891cc4b..595215ba52 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webwizard07fc.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02000000.xhp b/helpcontent2/source/text/shared/explorer/database/02000000.xhp
index cfbee288a1..46e2e38f3b 100644
--- a/helpcontent2/source/text/shared/explorer/database/02000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02000000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02000000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02000002.xhp b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
index 0c7a2090b8..e892039082 100755
--- a/helpcontent2/source/text/shared/explorer/database/02000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02000002.xhp,v $
- *
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 6f8bedd9dd..204a16eb12 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02010100.xhp,v $
- * $Revision: 1.18.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -139,9 +136,9 @@
 <paragraph role="paragraph" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="22">To remove a field name from the query, click the column header of the field and choose the <emph>Delete</emph> command on the context menu for the column.</paragraph>
 <paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="277">Save query</paragraph>
 <paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="278">Use the <emph>Save</emph> icon on the Standard Bar to save the query. You see a dialog that asks you to enter a name for the query. If the database supports schemas, you can also enter a schema.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
 <paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="280"><ahelp hid="DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA">Enter the name of the schema that is assigned to the query or table view.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_SAVE_AS:ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
 <paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="U" oldref="282"><ahelp hid="DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE">Enter the name of the query or table view.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3163805" xml-lang="en-US" level="3" l10n="U" oldref="23">Filtering data</paragraph>
 <paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="24">To filter data for the query, set the desired preferences in the lower area of the Design View. The following lines are available:</paragraph>
@@ -165,8 +162,7 @@
 <paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U" oldref="36">Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link.</paragraph>
 <paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="150">You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
+<paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
 <paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
 <table id="tbl_id3148461">
 <tablerow>
@@ -258,8 +254,6 @@
 </tablecell>
 </tablerow>
 </table>
-</case>
-</switch>
 <paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="189">You can also enter function calls directly into the SQL statement. The syntax is:</paragraph>
 <paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="U" oldref="190">SELECT FUNCTION(column) FROM table.</paragraph>
 <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="191">For example, the function call in SQL for calculating a sum is:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
index 35352548a5..58eb67f46d 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02010101.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,41 +29,52 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Relations</title>
-<filename>/text/shared/explorer/database/02010101.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Join Properties</title>
+         <filename>/text/shared/explorer/database/02010101.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154015"><bookmark_value>links;relational databases (Base)</bookmark_value>
-<bookmark_value>inner joins (Base)</bookmark_value>
-<bookmark_value>joins in databases (Base)</bookmark_value>
-<bookmark_value>left joins (Base)</bookmark_value>
-<bookmark_value>right joins (Base)</bookmark_value>
-<bookmark_value>full joins (Base)</bookmark_value>
-</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment><paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="1" l10n="U" oldref="1">Relations</paragraph>
-<paragraph role="paragraph" id="par_id3151205" xml-lang="en-US" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Relations</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000450.xhp#Joins"/>
-</section>
+      <bookmark_value>inner joins (Base)</bookmark_value>
+      <bookmark_value>joins in databases (Base)</bookmark_value>
+      <bookmark_value>left joins (Base)</bookmark_value>
+      <bookmark_value>right joins (Base)</bookmark_value>
+      <bookmark_value>full joins (Base)</bookmark_value>
+</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3154015" role="heading" level="1" l10n="CHG"
+                 oldref="1">Join Properties</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151205" role="paragraph" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Join Properties</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000450.xhp#Joins"/>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="17">Tables involved</paragraph>
-<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph><comment>UFI: removed a help id</comment><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="15">Fields involved</paragraph>
-<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/><paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
-<paragraph role="paragraph" id="par_id3152482" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="U" oldref="5">Inner Join</paragraph>
-<paragraph role="paragraph" id="par_id3155936" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
-<paragraph role="heading" id="hd_id3156372" xml-lang="en-US" level="3" l10n="U" oldref="7">Left Join</paragraph>
-<paragraph role="paragraph" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="3" l10n="U" oldref="9">Right Join</paragraph>
-<paragraph role="paragraph" id="par_id3150647" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3158215" xml-lang="en-US" level="3" l10n="U" oldref="11">Full Join</paragraph>
-<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U"
+                 oldref="17">Tables involved</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2" l10n="U"
+                 oldref="15">Fields involved</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2" l10n="U" oldref="3">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U"
+                 oldref="13">Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="U" oldref="5">Inner Join</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3" l10n="U" oldref="7">Left Join</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3" l10n="U" oldref="9">Right Join</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3" l10n="U"
+                 oldref="11">Full Join</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3" l10n="NEW">Natural</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/04000000.xhp b/helpcontent2/source/text/shared/explorer/database/04000000.xhp
index edb2636d02..90d51c88e2 100644
--- a/helpcontent2/source/text/shared/explorer/database/04000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/04000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04000000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/04030000.xhp b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
index ca01e62893..76f4e3834e 100644
--- a/helpcontent2/source/text/shared/explorer/database/04030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000000.xhp b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
index 20002e3254..13d759c2c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05000000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000001.xhp b/helpcontent2/source/text/shared/explorer/database/05000001.xhp
index 26b6a1a89c..ba9c988346 100644
--- a/helpcontent2/source/text/shared/explorer/database/05000001.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000001.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05000001.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000002.xhp b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
index 0f1f4ba930..2eb18398c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05000002.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000003.xhp b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
index 1ca01fac10..219f2a70c8 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000003.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05000003.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,16 +44,16 @@
 <body>
 <paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1">Enter / change password</paragraph>
 <paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="U" oldref="2">Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user's name in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
 <paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="2" l10n="U" oldref="3">User</paragraph>
 <paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER">Specifies the name of the new user.</ahelp> This field is only visible if you have defined a new user.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
 <paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="9">Old password</paragraph>
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD">Enter the old password.</ahelp> This field is visible when you have started the dialog via <emph>Change password</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD" id="bm_id3166411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD" id="bm_id3166411" localize="false"/>
 <paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2" l10n="U" oldref="5">Password</paragraph>
 <paragraph role="paragraph" id="par_id3147243" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD">Enter the new password.</ahelp></paragraph><comment>UFI: removed help id</comment>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="7">Confirm (password)</paragraph>
 <paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT">Enter the new password again.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05010000.xhp b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
index ac3f40fcba..85d7bf403d 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05010100.xhp b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
index 0286983fd7..ffcb8e5368 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="indexentwurf">
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MODALDIALOG_DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ModalDialog:DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBIndexDesign" id="bm_id3149828" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05010100.xhp" name="Index design">Index design</link></paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DBIndexDesign">The <emph>Index Design </emph>dialog allows you edit the indexes for the current table.</ahelp></paragraph>
 </section>
@@ -66,7 +63,7 @@
 <paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_DLGIDX_RESETINDEX">Resets the current index to the setting that it had when the dialog was started.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="15">Index details</paragraph>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="16">As soon as you change a detail of the current index and then select another index, the change is immediately passed to the data source. You can only leave the dialog, or select another index, if the change has been successfully acknowledged by the data source. However, you can undo the change by clicking the <emph>Reset Current Index </emph>icon.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
 <paragraph role="paragraph" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE">Specifies whether the current index allows only unique values.</ahelp> Checking the <emph>Unique </emph>option prevents duplicate data from being entered in the field and ensures data integrity.</paragraph>
 <paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="19">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="20">The<emph> Fields</emph> area displays a list of fields in the current table. You can also select multiple fields. In order to remove a field from the selection, select the empty entry at the start of the list.</paragraph>
@@ -74,7 +71,7 @@
 <paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_FIELD">Displays a list of the fields in the current table. You can select more than one field.</ahelp><comment>i73718</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGINDEX_INDEXDETAILS_SORTORDER" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="23">Sort order</paragraph>
 <paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_SORTORDER">Determines the sort order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_INDEXDESIGN_PB_CLOSE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="25">Close</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="25">Close</paragraph>
 <paragraph role="paragraph" id="par_id3154190" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_INDEXDESIGN_PB_CLOSE">Closes the dialog.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index e648dca7a2..5ab4003832 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05020100.xhp b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
index 757510f362..c2f49abaf5 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,8 +52,8 @@
   <embed href="text/shared/00/00000450.xhp#relationen"/>
 </section>
 <paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="3">The update and delete options are only available if they are supported by the database used.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" id="bm_id3153088" localize="false"/>
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE -->
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE -->
 <paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="27">Tables</paragraph>
 <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" visibility="hidden">This is where the two related tables are listed.</ahelp>If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog.</paragraph>
 <paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="29">If you opened the <emph>Relations</emph> dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified.</paragraph>
@@ -68,31 +65,31 @@
 <paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_RELATIONDIALOG_RIGHTFIELDCELL">The names of the tables selected for the link appear here as column names.</ahelp> If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row.</paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="6">Update options</paragraph>
 <paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="7">Here you can select options that take effect when there are changes to a primary key field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD" id="bm_id3148550" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD -->
 <paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="8">No action</paragraph>
 <paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD">Specifies that any change made to a primary key does not affect other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD" id="bm_id3153379" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD -->
 <paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="3" l10n="U" oldref="10">Updating cascade</paragraph>
 <paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD">Updates all the external key fields if the value of the corresponding primary key has been modified (Cascading Update).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL" id="bm_id3156280" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL -->
 <paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="3" l10n="U" oldref="12">Set null</paragraph>
 <paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL"> If the corresponding primary key has been modified, use this option to set the "IS NULL" value to all external key fields. IS NULL means that the field is empty.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT" id="bm_id3150767" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT -->
 <paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="14">Set default</paragraph>
 <paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT"> If the corresponding primary key has been modified, use this option to set a default value to all external key fields.</ahelp> During the creation of the corresponding table, the default value of an external key field will be defined when you assign the field properties.</paragraph>
 <paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete options</paragraph>
 <paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="17">Here you can select options that take effect when a primary key field is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL" id="bm_id3150439" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL -->
 <paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="18">No action</paragraph>
 <paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL">Specifies that the deletion of a primary key will not have any effect on other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL" id="bm_id3149260" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL -->
 <paragraph role="heading" id="hd_id3154146" xml-lang="en-US" level="3" l10n="U" oldref="20">Delete cascade</paragraph>
 <paragraph role="paragraph" id="par_id3155309" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL">Specifies that all external key fields will be deleted if you delete the corresponding primary key field.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="22">When you delete a primary key field with the<emph> Delete cascade </emph>option, all records from other tables that have this key as their foreign key are also deleted. Use this option with great care; it is possible that a major portion of the database can be deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL" id="bm_id3154987" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL -->
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="23">Set null</paragraph>
 <paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL">If you delete the corresponding primary key, the "IS NULL" value will be assigned to all external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT" id="bm_id3163712" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT -->
 <paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="25">Set Default</paragraph>
 <paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT">If you delete the corresponding primary key, a set value will be set to all external key fields.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030000.xhp b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
index cf3b3992c0..5e1085234f 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index 3a4584273f..253a03adab 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,13 +47,13 @@
 <bookmark xml-lang="en-US" branch="hid/HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
 <paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_TAB_WIZ_TABLENAME_EDIT">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
 <paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
 <paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
 <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
 <paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
 <paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="13">The table definition must be exactly the same so that data can be copied. Data cannot be copied if a data field in the target table has another format than the data field in the source table.</paragraph>
 <paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="31">Match the data field names in the<emph> Copy Table</emph> dialog on the <link href="text/shared/explorer/database/05030400.xhp" name="Apply Columns">Apply Columns</link> page.</paragraph>
@@ -64,10 +61,9 @@
 <paragraph role="note" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="15">If the fields of the target table have a smaller field length than in the source table when data is being attached, the source data fields will automatically be truncated to match the field lengths in the target table.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBASE table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
 <paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030200.xhp b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
index c26abc7c60..a18e4b9bdb 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,14 +45,14 @@
 <paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The <emph>Apply columns </emph>dialog is the second window of the <emph>Copy table</emph> dialog.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="2" l10n="U" oldref="3">Existing columns</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES">Lists the available data fields that you can include in the copied table. To copy a data field, click its name, and then click the &gt; button. To copy all of the fields, click the <emph>&gt;&gt;</emph> button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
 <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES">Lists the fields that you want to include in the copied table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
 <paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH">Adds or removes the selected field (&gt; or &lt; button) or all of the fields (&lt;&lt; or &gt;&gt; button).</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/explorer/database/05030300.xhp" name="Next page">Next page</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030300.xhp b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
index e2b36b3aca..eb97219d79 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030300.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030300.xhp" name="Type formatting">Type formatting</link></paragraph>
 <paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The<emph> Type formatting </emph>dialog is the third window of the <emph>Copy table</emph> dialog.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">List box</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES">Lists the data fields that will be included in to the copied table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Column information</paragraph>
@@ -71,10 +68,10 @@
 <paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_TAB_ENT_BOOL_DEFAULT">Select the default value for a Yes/No field.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="17">Automatic type recognition</paragraph>
 <paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="18">$[officename] can automatically recognize field contents when you copy database tables by drag and drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO" id="bm_id3153061" localize="false"/>
 <paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="3" l10n="U" oldref="19">(max.) lines</paragraph>
 <paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO">Enter the number of lines to use for automatic type recognition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO" id="bm_id3148946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO" id="bm_id3148946" localize="false"/>
 <paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="21">Auto</paragraph>
 <paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO">Enables automatic type recognition.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030400.xhp b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
index 1d8c29a159..aca297e55f 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030400.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,18 +52,18 @@
 <bookmark xml-lang="en-US" branch="hid/HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="6">Destination table</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_ASSIGN">Lists the possible data fields in the destination table. Only the data fields that are selected in the source table list will be included the destination table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
 <paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2" l10n="U" oldref="8">up</paragraph>
 <paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT">Moves the selected entry up one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="2" l10n="U" oldref="10">down</paragraph>
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT">Moves the selected entry down one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL" id="bm_id3147619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL" id="bm_id3147619" localize="false"/>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="12">all</paragraph>
 <paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL">Selects all of the data fields in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE" id="bm_id3155341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE" id="bm_id3155341" localize="false"/>
 <paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="U" oldref="14">none</paragraph>
 <paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE">Clears all of the check boxes in the list.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05040000.xhp b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
index a865febb6b..5528a6bf9a 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05040100.xhp b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
index de92a9db83..a603258de7 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05040200.xhp b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
index 22a74cd625..c4c54c110a 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11000002.xhp b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
index 18fdb269ee..e2705cf956 100644
--- a/helpcontent2/source/text/shared/explorer/database/11000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11000002.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11020000.xhp b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
index f314718e31..aca738877a 100644
--- a/helpcontent2/source/text/shared/explorer/database/11020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11020000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_DSADMIN_ODBC_OPTIONS">Use this text field to enter additional optional driver settings if this is necessary.</ahelp></paragraph>
 </section>
 <section id="zeichensatz">
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_ODBC" id="bm_id3144511" localize="false"/><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
+<!-- removed HID HID_DSADMIN_CHARSET_ODBC --><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_DSADMIN_CHARSET_ODBC">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp> Choose "System" to use the default character set of your operating system. Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.</paragraph>
 </section>
 <section id="retrieve">
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 069f855c6b..558d0cb75e 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11030000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="15">To view any changes that you make to the database, close the connection to the database, and then reconnect the database.</paragraph>
 <paragraph role="paragraph" id="par_id6051820" xml-lang="en-US" l10n="NEW"><comment>UFI: deleted note about case sensitivity. Should be not other than for all other files.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/>
+<!-- removed HID HID_DSADMIN_CHARSET_DBASE -->
 <paragraph role="paragraph" id="par_id0904200811094971" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp></paragraph>
 <embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
 <embed href="text/shared/explorer/database/11020000.xhp#sql92"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030100.xhp b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
index 57108aa806..733522a0ce 100755
--- a/helpcontent2/source/text/shared/explorer/database/11030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11030100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,19 +45,19 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000450.xhp#dBasein"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES">Select the database table that you want to index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES">Lists the current indexes for the selected database table.</ahelp> To remove an index from the list, click the index, and then click the right arrow.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
 <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES">Lists the available indexes that you can assign to a table.</ahelp> To assign an index to a selected table, click the left arrow icon. The left double arrow assigns all available indexes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD">Moves the selected index to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL">Moves all of the free indexes to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE">Moves the selected table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL">Moves all of the table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11080000.xhp b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
index 35b5a848a5..33e9fb1de6 100644
--- a/helpcontent2/source/text/shared/explorer/database/11080000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11080000.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,16 +52,16 @@
 <embed href="text/shared/guide/data_enter_sql.xhp#data_enter_sql"/>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="23">You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here.</paragraph>
 <paragraph role="note" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="10">To run an SQL query for filtering data in the database, use the <link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design View</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL">Enter the SQL administration command that you want to run.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="24">For example, for a "Bibliography" data source, you can enter the following SQL command:</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="25">SELECT "Address" FROM "biblio" "biblio"</paragraph>
 <paragraph role="paragraph" id="par_id3145611" xml-lang="en-US" l10n="U" oldref="21">For more information on SQL commands, please consult the documentation that came with the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
 <paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY">Lists the previously executed SQL commands. To run a command again, click the command, and then click <emph>Run</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
 <paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS">Displays the results, including errors, of the SQL command that you ran.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
 <paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE">Runs the command that you entered in the <emph>Command to execute </emph>box.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen2"/>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11090000.xhp b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
index 0bcc8a157f..68990208c9 100755
--- a/helpcontent2/source/text/shared/explorer/database/11090000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11090000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11150200.xhp b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
index 44f87ee1e2..f1abe9b45a 100755
--- a/helpcontent2/source/text/shared/explorer/database/11150200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11150200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11170000.xhp b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
index 2e360806db..f05730913c 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11170000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,17 +44,17 @@
 <paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11170000.xhp" name="Adabas D Statistics">Adabas D Statistics</link></paragraph>
 <paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the access options for the Adabas database.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE" id="bm_id3151226" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE --><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE">Enter the size of the data buffer for the database.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT --><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
 <paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME" id="bm_id3149399" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME --><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME">Enter the name of a user that you want to give limited control to modify some parameters of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD" id="bm_id3149233" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD --><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
 <paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD">Enter the password of the Control User.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB" id="bm_id3149516" localize="false"/><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
+<!-- removed HID DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB --><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB">Exits the Adabas database server when you exit $[officename].</ahelp> This option is only available if you start the database server from $[officename] with a control user and password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
+<!-- removed HID DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT --><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
 <paragraph role="paragraph" id="par_id3156002" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11170100.xhp b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
index e129b6e10c..f8df2f7319 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11170100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,18 +43,18 @@
 <paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1">Database Statistics</paragraph>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2">Displays statistics about the Adabas database.</paragraph>
 <paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="2" l10n="U" oldref="3">Database files</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
 <paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE">Displays the path and the name of the SYSDEVSPACE file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG">Displays the path and the name of the TRANSACTIONLOG file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS">Displays the path and the name of the DATADEVSPACE file.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="2" l10n="U" oldref="11">Database sizes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE">Displays the full size (in megabytes) of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE">Displays the amount of free space (in megabytes) that is available in the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
 <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING">Displays the amount of used space in the database as a percentage.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..9c02ce07a1 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 30000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,8 +28,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedexplorerdatabase30000000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Adabas D Database</title>
@@ -44,11 +37,9 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
-<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
-<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">The Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
 <paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
-<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
+<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The free available Adabas database is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="97">The name of an Adabas file cannot exceed 8 characters. The path to the Adabas file, including the file name, cannot exceed 30 characters, and must be compliant with the 7-bit ASCII code. Both the path and the file name cannot contain spaces.</paragraph>
 <paragraph role="note" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="6">Under Windows, the Adabas setup application adds the DBROOT environment variable that contains the path information for the database. If the setup application finds this variable, it does not install the database.</paragraph>
 <paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="37">Create New Adabas Database</paragraph>
@@ -66,76 +57,5 @@
 </list>
 <paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
 <paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file. 
-</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script. 
-</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="94">In the $DBCONFIG$ directory, delete the three files that have the same name as the database, but with different extensions. For example, for a database named "Big", delete the "Big.sys", "Big.trs", and "Big.dat" files in the "C:\Adabas\".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="46">In the $DBCONFIG$\Config directory, delete the file that has the same name as the database, for example, " C:\Adabas\Sql\Config\Big".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="47">In the $DBWORKS$\Wrk directory, delete the directory that has the same name as the database., for example "C:\Adabas\Sql\Wrk\Big".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="2" l10n="U" oldref="71">Starting and Shutting Down an Adabas Database</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147361" xml-lang="en-US" l10n="U" oldref="72">strt -d &lt;DBNAME&gt; -NoDBWindow -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3145298" xml-lang="en-US" l10n="U" oldref="73">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="74">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; shutdown</paragraph>
-<paragraph role="listitem" id="par_id3154965" xml-lang="en-US" l10n="U" oldref="75">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147252" xml-lang="en-US" l10n="U" oldref="76">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; restart</paragraph>
-<paragraph role="listitem" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="77">switches the database to WARM.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="78">stp -d &lt;DBNAME&gt; -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="79">completely shuts down the database</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="2" l10n="U" oldref="61">Error Messages in an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="62">The following is a list of possible error messages and solutions for working with the Adabas D database.</paragraph>
-<paragraph role="heading" id="hd_id3153273" xml-lang="en-US" level="3" l10n="U" oldref="69">The database cannot be shut down / restarted as a user is still connected to it.</paragraph>
-<paragraph role="paragraph" id="par_id3145761" xml-lang="en-US" l10n="U" oldref="70">Close any other open tasks that show the database contents. On multi-user systems, ensure that all users are disconnected from the database, and then restart $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="3" l10n="U" oldref="63">Client unable to establish connection; -813 SERVERDB MUST BE RESTARTED</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="64">This error occurs if you try to access an Adabas D database that has not been started. Ensure that you have defined a Control User for the database, and then start the database.</paragraph>
-<paragraph role="heading" id="hd_id3149529" xml-lang="en-US" level="3" l10n="U" oldref="65">Client unable to establish connection; -8022 USER ALREADY CONNECTED</paragraph>
-<paragraph role="paragraph" id="par_id3153197" xml-lang="en-US" l10n="U" oldref="66">This error occurs if you try to access an Adabas D database more than one time.</paragraph>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="86">Errors occurring when writing the data in the database</paragraph>
-<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="87">Restart $[officename], and then change the database properties.</paragraph>
-<paragraph role="heading" id="hd_id3155582" xml-lang="en-US" level="2" l10n="U" oldref="80">Running an Adabas Server on a Network</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="81">To run Adabas on a network, you need to install the Adabas server on one machine and the client on the workstations that you want to access the database from.</paragraph>
-<paragraph role="note" id="par_id3149337" xml-lang="en-US" l10n="U" oldref="92">You can only create a new database on the server.</paragraph>
-<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="3" l10n="U" oldref="82">Enabling a Remote Connection</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="83">Under Windows, start the xtcpupd.exe support program on both the client and the server, and ensure that "Remote SQL via TCP/IP" is selected in the xtcpupd.exe dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin 
-</caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="CHG" oldref="104">Choose <emph>File - New - Database</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="CHG" oldref="88">Click <emph>Connect to an existing database</emph>, and select "Adabas D" in the listbox. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id296334" xml-lang="en-US" l10n="NEW">In the <emph>Name of the Adabas D database </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph>
-</listitem>
-</list>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/30100000.xhp b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
index 61ec25a288..c673f7af1c 100644
--- a/helpcontent2/source/text/shared/explorer/database/30100000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 30100000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="3" l10n="U" oldref="37">Database name</paragraph>
 <paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_DLG_ADABAS_DBNAME">Type the name of the database.</ahelp> The name is added to the <emph>Data source URL</emph> field.</paragraph>
 <paragraph role="heading" id="hd_id3150256" xml-lang="en-US" level="2" l10n="U" oldref="3">User settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_DLG_INSERT_PAGE_EDT_NAME" id="bm_id3144510" localize="false"/>
+<!-- removed HID SD_EDIT_DLG_INSERT_PAGE_EDT_NAME -->
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_SYSUSR" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="5">Administrator</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_ADABAS_SYSUSR" visibility="hidden">Enter the name of the database administrator.</ahelp> The administrator name and password is assigned when you create an Adabas database. Apart from the administrator, two more users can access the Adabas database.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_CONUSR" id="bm_id3149670" localize="false"/><paragraph role="heading" id="hd_id3149045" xml-lang="en-US" level="3" l10n="U" oldref="7">Control User</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
index 9d266f3ce3..b10574c408 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabaadvprop.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 54d89b3bd9..6dd9b75476 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dabaadvpropdat.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,64 +29,72 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
-<title id="tit" xml-lang="en-US">Special Settings</title>
-<filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="data">
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/dabaadvpropdat.xhp">Special Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW">Specifies the way you can work with data in a database.</paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id7679372" xml-lang="en-US" l10n="NEW">In a database window, choose <emph>Edit - Database - Advanced Settings</emph>
-</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id4572283" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
-<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
-<paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
-<paragraph role="paragraph" id="par_id6151921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
+      <topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Special Settings</title>
+         <filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="data">
+         <paragraph xml-lang="en-US" id="par_idN10556" role="heading" level="1" l10n="CHG"><link href="text/shared/explorer/database/dabaadvpropdat.xhp">Special Settings</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">Specifies the way you can work with data in a database.</paragraph>
+      </section>
+      <section id="howtoget">
+         <paragraph xml-lang="en-US" id="par_id7679372" role="paragraph" l10n="NEW">In a database window, choose <emph>Edit - Database - Advanced Settings</emph>
+         </paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
+
+      <paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
+
+
+      <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6151921" role="paragraph" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
-<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
-<paragraph role="paragraph" id="par_idN105A2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1059E" role="heading" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105A2" role="paragraph" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/>
-<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
-<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
-<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Example:</paragraph>
-<paragraph role="example" id="par_idN105C1" xml-lang="en-US" l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105A5" role="heading" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105A9" role="paragraph" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105BE" role="paragraph" l10n="NEW">Example:</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105C1" role="example" l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/>
-<paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
-<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the database driver.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105C4" role="heading" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105C8" role="paragraph" l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the database driver.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/>
-<paragraph role="heading" id="par_idN105CB" xml-lang="en-US" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a question mark (?).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph" l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a question mark (?).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/>
-<paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
-<paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105D2" role="heading" level="2" l10n="NEW">Display version columns (when available)</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105D6" role="paragraph" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/>
-<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
-<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105FA" role="heading" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/>
-<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
-<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp><comment>UFI: ???</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10613" role="heading" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp><comment>UFI: ???</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/>
-<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
-<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC statements.</ahelp><comment>UFI: ???</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1061A" role="heading" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1061E" role="paragraph" l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC statements.</ahelp><comment>UFI: ???</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/>
-<paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
-<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want to use.</ahelp><comment>UFI: ???</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10621" role="heading" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10625" role="paragraph" l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want to use.</ahelp><comment>UFI: ???</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/>
-<paragraph role="heading" id="hd_id1101718" xml-lang="en-US" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
-<paragraph role="paragraph" id="par_id3783989" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6684163" xml-lang="en-US" l10n="NEW">If this control box is not enabled, then the forms in the current database will not be checked for required fields.</paragraph>
-<paragraph role="paragraph" id="par_id3837397" xml-lang="en-US" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
-<paragraph role="heading" id="hd_id0909200811170166" xml-lang="en-US" level="2" l10n="NEW">Ignore currency field information</paragraph>
-<paragraph role="paragraph" id="par_id0909200811170221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id1101718" role="heading" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3783989" role="paragraph" l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6684163" role="paragraph" l10n="NEW">If this control box is not enabled, then the forms in the current database will not be checked for required fields.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3837397" role="paragraph" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0909200811170166" role="heading" level="2" l10n="NEW">Ignore currency field information</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
+<!-- removed HID 39067 -->
+<paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2" l10n="NEW">Use ODBC conformant date/time literals</paragraph>
+      <paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Check to use ODBC conformant date/time literals.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
index 95bc82db92..990c8691c4 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabaadvpropgen.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
index dc2e256c0b..712665e3a8 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabadoc.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,26 +27,23 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Database File</title>
-<filename>/text/shared/explorer/database/dabadoc.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-28T12:47:12">UFI: the main database document window</created>
-<lastedited date="2004-09-22T11:43:42">YJ: checked</lastedited>
-</history>
-</meta>
-<body>
-<section id="dabadoc">
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabadoc.xhp">Database File</link></paragraph>
-<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The database file window organizes the tables, views, queries, links, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN105B7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <topic id="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Database File</title>
+         <filename>/text/shared/explorer/database/dabadoc.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="dabadoc">
+         <paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabadoc.xhp">Database File</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph" l10n="NEW"><ahelp hid=".">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph" l10n="NEW"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
index a6e68d8c0c..6365b365c5 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabaprop.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index 4880d01ebc..f9fcdbbf6d 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabapropadd.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,8 +73,7 @@
 <paragraph role="tip" id="par_idN10718" xml-lang="en-US" l10n="NEW">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
 <paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Indexes<comment>UFI: seen for dBase</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
+<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
 <paragraph role="paragraph" id="par_idN10742" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size of the data buffer for the database. The setting takes effect after you restart the database.</ahelp><comment>copied from shared\explorer\database\11170000.xhp</comment></paragraph>
 <paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Data increment (MB)</paragraph>
 <paragraph role="paragraph" id="par_idN10761" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB. The setting takes effect after you restart the database.</ahelp></paragraph>
@@ -89,8 +85,6 @@
 <paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Exits the Adabas database server when you exit $[officename]. This option is only available if you start the database server from $[officename] with a control user and password.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Extended</paragraph>
 <paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
-</case>
-</switch>
 <paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></paragraph>
 <paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
 <paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2" l10n="NEW">Field separator</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
index 71bdc226cd..4c75609805 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabapropcon.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 19a732b0b3..77892be6b7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabapropgen.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 <paragraph role="warning" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
 <paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Browse<comment>UFI: found for dBase</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
@@ -66,7 +63,7 @@
 <paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
 <paragraph role="paragraph" id="par_id5589159" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
@@ -81,16 +78,12 @@
 <paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
 <paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39110" id="bm_id5591296" localize="false"/><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
+<!-- removed HID 39110 --><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
 <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39111" id="bm_id4361705" localize="false"/><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
+<!-- removed HID 39111 --><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
 <paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/30100000.xhp">Create New Adabas D Database</link> dialog.</ahelp></paragraph>
-</case>
-</switch></body>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index 402ffb81e8..e2d6fe116a 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz00.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index f291ee3af7..6ce4165036 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz01.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,16 +48,16 @@
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
 <paragraph role="paragraph" id="par_id8584246" xml-lang="en-US" l10n="NEW"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC" id="bm_id8278756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC -->
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
 <paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
 <paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST" id="bm_id2050538" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST -->
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
 <paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
 <paragraph role="paragraph" id="par_idN10618" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT" id="bm_id1602832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT -->
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
 <paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
 <paragraph role="paragraph" id="par_idN10633" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
index 0269a85a0a..ad52969bf6 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
index 16bfb0366c..b17ecbba7e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02access.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
index a4d150ee86..03bebac157 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02adabas.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
index 283951d5d8..f5a54f9d3e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02ado.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
index 6ed78e6944..9eb29c2ae6 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02dbase.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 3c78b6b1d6..c15dfe0b0e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02jdbc.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 <paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
 <paragraph role="paragraph" id="par_idN10627" xml-lang="en-US" l10n="NEW">
 <item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph>
-<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in Tools - Options - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
+<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
 <paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3" l10n="NEW">Oracle database</paragraph>
 <paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
 <switch select="sys">
@@ -92,14 +89,14 @@
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
 <paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_CONNURL_JDBCPAGE">Enter the URL for the database. For example, for the MySQL JDBC driver, enter "jdbc:mysql://&lt;Servername&gt;/&lt;name of the database&gt;". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DRIVERCLASS" id="bm_id3153970" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/852248660" id="bm_id3400372" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
+<!-- removed HID 852248660 -->
+<!-- removed HID 852330580 --><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
 <paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
 <section id="classpath">
-<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph>Tools - Options - %PRODUCTNAME</emph>
+<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
 <emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
+<!-- removed HID 852251216 --><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
 <paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
 <paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
index 71321aab36..a3ed715800 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02ldap.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,10 +35,6 @@
 <title id="tit" xml-lang="en-US">LDAP Connection</title>
 <filename>/text/shared/explorer/database/dabawiz02ldap.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-28T15:24:27">UFI: Database Wizard LDAP page</created>
-<lastedited date="2006-04-28T12:20:09">YJ: checked</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id22583"><bookmark_value>LDAP server; address books (Base)</bookmark_value>
@@ -66,7 +59,9 @@
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/>
 <paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)</paragraph>
 <paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph>
+<section id="relatedtopics">
 <paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
 <paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+</section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 6f5e555579..488a4c75ce 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02mysql.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
index 28daab627b..caef678b8e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02odbc.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
index 5b44a023c6..ead2ab3e44 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02oracle.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,10 +77,10 @@
 <bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" id="bm_id7325357" localize="false"/>
 <paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2" l10n="NEW">Port number</paragraph>
 <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port number for the database server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/852231276" id="bm_id3172399" localize="false"/>
+<!-- removed HID 852231276 -->
 <paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="2" l10n="NEW">Oracle JDBC Driver Class</paragraph>
 <paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/852234832" id="bm_id209051" localize="false"/>
+<!-- removed HID 852234832 -->
 <paragraph role="heading" id="par_idN10630" xml-lang="en-US" level="2" l10n="NEW">Test Class</paragraph>
 <paragraph role="paragraph" id="par_idN10634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
index 1ec3a89afc..1842d906ec 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02spreadsheet.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
index e08bc1da5b..c8e01bef11 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz02text.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
index 6ac3ce33f5..a745063c56 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dabawiz03auth.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/main.xhp b/helpcontent2/source/text/shared/explorer/database/main.xhp
index 16f75310d3..bde780c01b 100755
--- a/helpcontent2/source/text/shared/explorer/database/main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/main.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 3492dd4323..207808b4c8 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -112,6 +108,7 @@ XHPFILES = \
    menuinsert.xhp \
    menutools.xhp \
    menuview.xhp \
+   migrate_macros.xhp \
    password.xhp \
    querywizard00.xhp \
    querywizard01.xhp \
@@ -138,4 +135,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/explorer/database/menubar.xhp b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
index 01c98996e3..d1579ddc61 100755
--- a/helpcontent2/source/text/shared/explorer/database/menubar.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubar.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
index b1359b82d5..130b0653fd 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuedit.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,12 +54,12 @@
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts an item from the clipboard. If you want, you can insert forms and reports, including subfolders, from one database file to another.</ahelp></paragraph>
 <section id="tabbea">
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_EDIT" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12293" id="bm_id2726523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_EDIT" id="bm_id2726523" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBEdit" id="bm_id2447279" localize="false"/>
 <paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid=".">Opens a window where you can edit the selected table, query, form, or report.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_DELETE" id="bm_id3153824" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12291" id="bm_id4481643" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_DELETE" id="bm_id4481643" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBDelete" id="bm_id1720023" localize="false"/>
 <paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="2" l10n="U" oldref="29">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BROWSER_TABLE_DELETE">Deletes the selected table, query, form, or report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/menufile.xhp b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
index adacdc360f..c5741c79ee 100755
--- a/helpcontent2/source/text/shared/explorer/database/menufile.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menufile.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
index 5676db7ac1..a06681d9d2 100644
--- a/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menufilesave.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,16 +44,16 @@
 <body>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW">Save</paragraph>
 <paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">In this dialog, you can specify the position and name of a form <comment>UFI: spec says also for report, but reports can be created only by Wizard and are autosaved there</comment><comment>UFI: spec says also for query, cannot verify</comment> that you save within a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link>. The dialog opens automatically when you save a form the first time.<comment>UFI: no chance to open the dialog a second time</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Create New Directory</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create a new folder within the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
 <paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Up One Level</paragraph>
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to go up one level in the folder hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">File name</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the file name for the saved form.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
 <paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Save</paragraph>
 <paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click to save the form to the database file.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
index 1eee2c2b9b..a54cd8a6e6 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuinsert.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menutools.xhp b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
index 4bcb1a86c8..a25e2060f8 100755
--- a/helpcontent2/source/text/shared/explorer/database/menutools.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menutools.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menuview.xhp b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
index ed1a944b0b..bbfa747913 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuview.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuview.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
new file mode 100644
index 0000000000..11b48dd44f
--- /dev/null
+++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+      <topic id="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Migrate Macros</title>
+         <filename>/text/shared/explorer/database/migrate_macros.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="migrate_macros">
+<bookmark xml-lang="en-US" branch="index" id="bm_id6009095"><bookmark_value>wizards;macros (Base)</bookmark_value>
+         <bookmark_value>Macro Wizard (Base)</bookmark_value>
+         <bookmark_value>macros;attaching new (Base)</bookmark_value>
+         <bookmark_value>migrating macros (Base)</bookmark_value>
+</bookmark><comment>MW added 2 index entries</comment>
+<paragraph xml-lang="en-US" id="hd_id0112200902353472" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/migrate_macros.xhp">Migrate Macros</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph" l10n="NEW"><ahelp hid=".">The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area.</ahelp></paragraph>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Now macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200903075830" role="paragraph" l10n="NEW">The Database Document Macro Migration Wizard can move the macros up into the Base file's storage area. You can then examine the macros and edit them as needed. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200903075951" role="paragraph" l10n="NEW">For example, it is possible that macros from the sub-documents had the same module names and macro names. After you moved the macros into one common macro storage area, you must edit the macros to make the names unique. The wizard cannot do this.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200903075915" role="paragraph" l10n="NEW">The wizard can backup the Base file to another folder of your choice. The wizard changes the original Base file. The backup remains unchanged.</paragraph>
+      <embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+      <embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+      <embed href="text/shared/00/00000001.xhp#finish"/>
+      <embed href="text/shared/00/00000001.xhp#abbrechen"/>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/password.xhp b/helpcontent2/source/text/shared/explorer/database/password.xhp
index 7329f0c2b1..18782424a4 100644
--- a/helpcontent2/source/text/shared/explorer/database/password.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/password.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: password.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,13 +41,13 @@
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1" l10n="NEW">User Name and Password Required</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN10551" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Password</paragraph>
 <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_LOGIN:CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
 <paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2" l10n="NEW">Remember password till end of session</paragraph>
 <paragraph role="paragraph" id="par_idN10587" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the same user name and password without further dialog, when you connect again to the same data source in the current %PRODUCTNAME session.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
index 0019cd3083..6baf02dc4e 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard00.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
index ea6dd5a01d..450e2f8b50 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard01.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
index f9de67fb94..2e7ae511f9 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard02.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
index 605775ec52..7c818e7087 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard03.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
index 8c236291d1..32600760c6 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard04.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
index cd5d31bb94..f283f1f4f7 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard05.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
index 99bf15df79..66e7e4a6c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard06.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
index d7f1b7472c..1293b5bc48 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard07.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
index e516037e92..0f1cbd156a 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querywizard08.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
index c997db7bff..e08f3b0657 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rep_datetime.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,14 +44,14 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Date and Time dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Date and Time</item>.</ahelp></paragraph>
 <paragraph role="tip" id="par_id6278878" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878529" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878018" id="bm_id9102145" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878019" id="bm_id3624073" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878020" id="bm_id1140781" localize="false"/><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878533" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878022" id="bm_id5113681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878023" id="bm_id3558458" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878024" id="bm_id3776360" localize="false"/><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_DATE" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878018 -->
+<!-- removed HID 1577878019 -->
+<!-- removed HID 1577878020 --><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_TIME" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878022 -->
+<!-- removed HID 1577878023 -->
+<!-- removed HID 1577878024 --><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id5992919" xml-lang="en-US" l10n="NEW">Click OK to insert the field.</paragraph>
 <paragraph role="paragraph" id="par_id4320810" xml-lang="en-US" l10n="NEW">You can click the date or time field and drag to another position within the same area, or edit the properties in the Properties window.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index ee3e9162f4..a154988d03 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rep_main.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,204 +31,223 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Report Builder</title>
-<filename>/text/shared/explorer/database/rep_main.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Report Builder</title>
+         <filename>/text/shared/explorer/database/rep_main.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id8773155" xml-lang="en-US" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
+<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id5248573" xml-lang="en-US" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
-<paragraph role="note" id="par_id7128818" xml-lang="en-US" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="hd_id3753776" xml-lang="en-US" level="2" l10n="NEW">To Install the Report Builder Extension</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5284279" xml-lang="en-US" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4494766" xml-lang="en-US" l10n="NEW">Click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7858516" xml-lang="en-US" l10n="NEW">Find the Sun Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id973540" xml-lang="en-US" l10n="NEW">Click the "Get it!" icon. The file "sun-report-builder.oxt" will be downloaded to your computer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6011841" xml-lang="en-US" l10n="NEW">Select the "sun-report-builder.oxt" file that you downloaded. Click Open.</paragraph>
-<paragraph role="paragraph" id="par_id2591326" xml-lang="en-US" l10n="NEW">This starts the installation of the Sun Report Builder extension.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6201666" xml-lang="en-US" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id208136" xml-lang="en-US" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id556047" xml-lang="en-US" level="3" l10n="NEW">To install the JRE software</paragraph>
-<paragraph role="paragraph" id="par_id4515823" xml-lang="en-US" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4044312" xml-lang="en-US" l10n="NEW">Choose Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1369060" xml-lang="en-US" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
-<paragraph role="paragraph" id="par_id860927" xml-lang="en-US" l10n="NEW">If a recent JRE version is found on your system, you see an entry in the list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8581804" xml-lang="en-US" l10n="NEW">Click the option button in front of the entry to enable this JRE version for use in %PRODUCTNAME.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id6317636" xml-lang="en-US" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open Tools - Options - %PRODUCTNAME - Java again.</paragraph>
-<paragraph role="heading" id="hd_id9759514" xml-lang="en-US" level="2" l10n="NEW">To open the Report Builder</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id9076509" xml-lang="en-US" l10n="NEW">Open a Base file or create a new database. The database must contain at least one table with at least one data field and a primary key field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7050691" xml-lang="en-US" l10n="NEW">Click the Reports icon in the Base window, then choose Create Report in Design View.</paragraph>
-<paragraph role="paragraph" id="par_id7118747" xml-lang="en-US" l10n="NEW">The Report Builder window opens. </paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8283639" xml-lang="en-US" l10n="NEW">The Report Builder is divided into three parts. On the top you see the menu, with the toolbars below.</paragraph>
-<paragraph role="paragraph" id="par_id2291024" xml-lang="en-US" l10n="NEW">On the right you see the Properties window with the property values of the currently selected object.</paragraph>
-<paragraph role="paragraph" id="par_id2100589" xml-lang="en-US" l10n="NEW">The left part of the Report Builder window shows the Report Builder view. The Report Builder view is initially divided into three sections, from top to bottom:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5022125" xml-lang="en-US" l10n="NEW">
-<emph>Page Header</emph> - drag control fields with fixed text into the Page Header area</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6844386" xml-lang="en-US" l10n="NEW">
-<emph>Detail</emph> - drag and drop database fields into the Detail area</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7018646" xml-lang="en-US" l10n="NEW">
-<emph>Page Footer</emph> - drag control fields with fixed text into the Page Footer area</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5857112" xml-lang="en-US" l10n="NEW">To insert an additional <emph>Report Header</emph> and <emph>Report Footer</emph> area choose <item type="menuitem">Edit - Insert Report Header/Footer</item>. These areas contain text that appears at the start and end of the whole report.</paragraph><comment>id="par_id2685323" l10n="NEW"If you want a multi-column report, choose Format - Page, click the Columns tab, and set the number of columns. Now you can also specify a Column Header and Column Footer in the Report Builder view.</comment><comment>column header/footer</comment><paragraph role="paragraph" id="par_id6042664" xml-lang="en-US" l10n="NEW">Click the "-" icon in front of an area name to collapse that area to one line in the Report Builder view. The "-" icon changes to a "+" icon, and you can click this to expand the area again.</paragraph>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW">You insert database fields by drag-and-drop into the Detail area. See the section "To insert fields into the report" below.</paragraph>
-<paragraph role="paragraph" id="par_id1278420" xml-lang="en-US" l10n="NEW">In addition, you can click the Label Field or Text Box icon in the toolbar, then drag a rectangle in the Page Header or Page Footer area, to define a text that is the same on all pages. You enter the text in the Label box of the corresponding Properties window. You can also add graphics by using the Graphics icon.</paragraph>
-<paragraph role="heading" id="par_id7479476" xml-lang="en-US" level="2" l10n="NEW">To connect the report to a database table</paragraph>
-<paragraph role="paragraph" id="par_id3099154" xml-lang="en-US" l10n="NEW">First you must connect the report to a database table.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2218390" xml-lang="en-US" l10n="NEW">Move the mouse to the Properties view. You see two tab pages General and Data.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7771538" xml-lang="en-US" l10n="NEW">On the Data tab page, click Content to open the combo box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id366527" xml-lang="en-US" l10n="NEW">Select the table for that you want to create the report.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7996459" xml-lang="en-US" l10n="NEW">After selecting the table, press the <item type="keycode">Tab</item> key to leave the Content box.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id2531815" xml-lang="en-US" l10n="NEW">The Add Field window opens automatically and shows all fields of the selected table.</paragraph>
-<paragraph role="heading" id="par_id5927304" xml-lang="en-US" level="2" l10n="NEW">To insert fields into the report</paragraph>
-<paragraph role="paragraph" id="par_id4503921" xml-lang="en-US" l10n="NEW">The Add Field window helps you to insert the table entries in the report. Click the Add Field icon in the toolbar to open the Add Field window.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4051026" xml-lang="en-US" l10n="NEW">Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields.</paragraph>
-<paragraph role="paragraph" id="par_id3397320" xml-lang="en-US" l10n="NEW">It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3059785" xml-lang="en-US" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon 
-<image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.0902inch" height="0.0902inch" localize="true"><alt id="alt_id5605334" xml-lang="en-US">label field icon</alt>
+      <paragraph xml-lang="en-US" id="par_id5248573" role="paragraph" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7128818" role="note" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3753776" role="heading" level="2" l10n="NEW">To Install the Report Builder Extension</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The extension file will be downloaded to your computer.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the extension file that you downloaded. Click Open.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6201666" role="paragraph" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id208136" role="paragraph" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
+         </listitem>
+	          <listitem>
+            <paragraph xml-lang="en-US" id="par_id20813699" role="paragraph" l10n="NEW">Restart %PRODUCTNAME. If the Quickstarter is running, also close the Quickstarter.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1369060" role="paragraph" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id860927" role="paragraph" l10n="NEW">If a recent JRE version is found on your system, you see an entry in the list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8581804" role="paragraph" l10n="NEW">Click the option button in front of the entry to enable this JRE version for use in %PRODUCTNAME.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7730033" role="paragraph" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java again.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2" l10n="NEW">To open the Report Builder</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9076509" role="paragraph" l10n="NEW">Open a Base file or create a new database. The database must contain at least one table with at least one data field and a primary key field.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7050691" role="paragraph" l10n="NEW">Click the Reports icon in the Base window, then choose Create Report in Design View.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id7118747" role="paragraph" l10n="NEW">The Report Builder window opens. </paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8283639" role="paragraph" l10n="NEW">The Report Builder is divided into three parts. On the top you see the menu, with the toolbars below.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2291024" role="paragraph" l10n="NEW">On the right you see the Properties window with the property values of the currently selected object.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2100589" role="paragraph" l10n="NEW">The left part of the Report Builder window shows the Report Builder view. The Report Builder view is initially divided into three sections, from top to bottom:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5022125" role="paragraph" l10n="NEW">
+               <emph>Page Header</emph> - drag control fields with fixed text into the Page Header area</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6844386" role="paragraph" l10n="NEW">
+               <emph>Detail</emph> - drag and drop database fields into the Detail area</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7018646" role="paragraph" l10n="NEW">
+               <emph>Page Footer</emph> - drag control fields with fixed text into the Page Footer area</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5857112" role="paragraph" l10n="NEW">To insert an additional <emph>Report Header</emph> and <emph>Report Footer</emph> area choose <item type="menuitem">Edit - Insert Report Header/Footer</item>. These areas contain text that appears at the start and end of the whole report.</paragraph><comment>id="par_id2685323" l10n="NEW"If you want a multi-column report, choose Format - Page, click the Columns tab, and set the number of columns. Now you can also specify a Column Header and Column Footer in the Report Builder view.</comment><comment>column header/footer</comment>
+<paragraph xml-lang="en-US" id="par_id6042664" role="paragraph" l10n="NEW">Click the "-" icon in front of an area name to collapse that area to one line in the Report Builder view. The "-" icon changes to a "+" icon, and you can click this to expand the area again.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW">You insert database fields by drag-and-drop into the Detail area. See the section "To insert fields into the report" below.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1278420" role="paragraph" l10n="NEW">In addition, you can click the Label Field or Text Box icon in the toolbar, then drag a rectangle in the Page Header or Page Footer area, to define a text that is the same on all pages. You enter the text in the Label box of the corresponding Properties window. You can also add graphics by using the Graphics icon.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7479476" role="heading" level="2" l10n="NEW">To connect the report to a database table</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3099154" role="paragraph" l10n="NEW">First you must connect the report to a database table.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2218390" role="paragraph" l10n="NEW">Move the mouse to the Properties view. You see two tab pages General and Data.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7771538" role="paragraph" l10n="NEW">On the Data tab page, click Content to open the combo box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id366527" role="paragraph" l10n="NEW">Select the table for that you want to create the report.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7996459" role="paragraph" l10n="NEW">After selecting the table, press the Tab key to leave the Content box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph" l10n="NEW">The Add Field window opens automatically and shows all fields of the selected table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5927304" role="heading" level="2" l10n="NEW">To insert fields into the report</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4503921" role="paragraph" l10n="NEW">The Add Field window helps you to insert the table entries in the report. Click the Add Field icon in the toolbar to open the Add Field window.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4051026" role="paragraph" l10n="NEW">Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW">It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3059785" role="paragraph" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon
+<image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt>
 	</image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want.</paragraph>
-</listitem>
-</list><comment>Align at Section toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/><paragraph role="paragraph" id="par_id7657399" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the left margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignRight" id="bm_id3236182" localize="false"/><paragraph role="paragraph" id="par_id8925138" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the right margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignTop" id="bm_id1251258" localize="false"/><paragraph role="paragraph" id="par_id5461897" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the top margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignBottom" id="bm_id8111819" localize="false"/><paragraph role="paragraph" id="par_id8919339" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the bottom margin of the area.</ahelp></paragraph><comment>Object Resizing toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SmallestWidth" id="bm_id9116794" localize="false"/><paragraph role="paragraph" id="par_id4634235" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SmallestHeight" id="bm_id4381847" localize="false"/><paragraph role="paragraph" id="par_id1393475" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:GreatestWidth" id="bm_id1336710" localize="false"/><paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:GreatestHeight" id="bm_id1221655" localize="false"/><paragraph role="paragraph" id="par_id5376140" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest height.</ahelp></paragraph><comment>Report Controls toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:HFixedLine" id="bm_id4408093" localize="false"/><paragraph role="paragraph" id="par_id9611499" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a horizontal line to the current area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:VFixedLine" id="bm_id6949369" localize="false"/><paragraph role="paragraph" id="par_id6765953" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a vertical line to the current area.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1511581" xml-lang="en-US" l10n="NEW">After inserting fields in the Detail view, the report is ready for execution.</paragraph>
-<paragraph role="heading" id="par_id4881740" xml-lang="en-US" level="2" l10n="NEW">To execute a report</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8286385" xml-lang="en-US" l10n="NEW">Click the Execute Report icon 
-<image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3380230" xml-lang="en-US">execute report icon</alt>
+         </listitem>
+      </list><comment>Align at Section toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7657399" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the left margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignRight" id="bm_id3236182" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8925138" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the right margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignTop" id="bm_id1251258" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5461897" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the top margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignBottom" id="bm_id8111819" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8919339" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the bottom margin of the area.</ahelp></paragraph><comment>Object Resizing toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SmallestWidth" id="bm_id9116794" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4634235" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest width.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SmallestHeight" id="bm_id4381847" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1393475" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GreatestWidth" id="bm_id1336710" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6571550" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest width.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GreatestHeight" id="bm_id1221655" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5376140" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest height.</ahelp></paragraph><comment>Report Controls toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:HFixedLine" id="bm_id4408093" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id9611499" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a horizontal line to the current area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:VFixedLine" id="bm_id6949369" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6765953" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a vertical line to the current area.</ahelp></paragraph><comment>Shrink toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrink" id="bm_id040920092222313" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242612" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove top and bottom empty space.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrinkTop" id="bm_id0409200922231489" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242617" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove top empty space.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrinkBottom" id="bm_id040920092223576" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242661" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove bottom empty space.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id1511581" role="paragraph" l10n="NEW">After inserting fields in the Detail view, the report is ready for execution.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4881740" role="heading" level="2" l10n="NEW">To execute a report</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph" l10n="NEW">Click the Execute Report icon
+<image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
 	</image> on the toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id2354197" xml-lang="en-US" l10n="NEW">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
-<paragraph role="paragraph" id="par_id2485122" xml-lang="en-US" l10n="NEW">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
-<paragraph role="heading" id="hd_id8746910" xml-lang="en-US" level="2" l10n="NEW">To edit a report</paragraph>
-<paragraph role="paragraph" id="par_id9636524" xml-lang="en-US" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
-<paragraph role="paragraph" id="par_id5941648" xml-lang="en-US" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File 
-<image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id8237556" xml-lang="en-US">edit file icon</alt>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id2354197" role="paragraph" l10n="NEW">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2485122" role="paragraph" l10n="NEW">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id8746910" role="heading" level="2" l10n="NEW">To edit a report</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5941648" role="paragraph" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File
+<image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id8237556">Icon</alt>
 	</image> on the Standard toolbar.<comment>saved automatically with the Base file?</comment></paragraph>
-<paragraph role="paragraph" id="par_id8307138" xml-lang="en-US" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
-<paragraph role="paragraph" id="par_id7138889" xml-lang="en-US" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
-<paragraph role="paragraph" id="par_id9869380" xml-lang="en-US" l10n="NEW">After finishing, click the Execute Report icon 
-<image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">execute report icon</alt>
+      <paragraph xml-lang="en-US" id="par_id8307138" role="paragraph" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7138889" role="paragraph" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph" l10n="NEW">After finishing, click the Execute Report icon
+<image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to create a new report.</paragraph>
-<paragraph role="paragraph" id="par_id12512" xml-lang="en-US" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
-<paragraph role="heading" id="par_id2676168" xml-lang="en-US" level="2" l10n="NEW">Sorting the report</paragraph>
-<paragraph role="paragraph" id="par_id2626422" xml-lang="en-US" l10n="NEW">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1743827" xml-lang="en-US" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon 
-<image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id9557786" xml-lang="en-US">sorting and grouping icon</alt>
+      <paragraph xml-lang="en-US" id="par_id12512" role="paragraph" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2676168" role="heading" level="2" l10n="NEW">Sorting the report</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2626422" role="paragraph" l10n="NEW">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
+<image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="NEW">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4191717" xml-lang="en-US" l10n="NEW">Execute the report.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_id2318796" xml-lang="en-US" level="2" l10n="NEW">Grouping</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id399182" xml-lang="en-US" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon 
-<image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">sorting and grouping icon</alt>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="NEW">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4191717" role="paragraph" l10n="NEW">Execute the report.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id2318796" role="heading" level="2" l10n="NEW">Grouping</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
+<image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7588732" xml-lang="en-US" l10n="NEW">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="NEW">Click the Add Field icon 
-<image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.2201inch" height="0.2201inch"><alt id="alt_" xml-lang="en-US">add field icon</alt>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7588732" role="paragraph" l10n="NEW">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW">Click the Add Field icon
+<image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to open the Add Field window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5675527" xml-lang="en-US" l10n="NEW">Drag-and-drop the field entry that you want to group into the group header section. Then drag-and-drop the remaining fields into the Detail section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3496200" xml-lang="en-US" l10n="NEW">Execute the report. The report shows the grouped records.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="NEW">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
-<paragraph role="heading" id="par_id888698" xml-lang="en-US" level="2" l10n="NEW">Updating and printing your data</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
-<paragraph role="paragraph" id="par_id7594225" xml-lang="en-US" l10n="NEW">Click the Reports icon 
-<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.222inch" height="0.222inch"><alt id="alt_id4678487" xml-lang="en-US">reports icon</alt>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5675527" role="paragraph" l10n="NEW">Drag-and-drop the field entry that you want to group into the group header section. Then drag-and-drop the remaining fields into the Detail section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3496200" role="paragraph" l10n="NEW">Execute the report. The report shows the grouped records.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id888698" role="heading" level="2" l10n="NEW">Updating and printing your data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Click the Reports icon
+<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt>
 	</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
-<paragraph role="paragraph" id="par_id8147221" xml-lang="en-US" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
index add37e669a..a2c4323d92 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rep_navigator.xhp,v $
- *
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +47,7 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id1150852" xml-lang="en-US" l10n="NEW">You can open the Report Navigator window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">View - Report Navigator</item>.</paragraph>
 <paragraph role="paragraph" id="par_id1111484" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Report Navigator reveals the structure of the report. You can use the Report Navigator to insert functions into the report.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/64521" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_REPORT_NAVIGATOR_TREE" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
@@ -82,9 +78,9 @@
 <paragraph role="paragraph" id="par_id9256874" xml-lang="en-US" l10n="NEW">Maybe you have to set the initial value to the value of the field like [field].<comment>these 3 paras copied from another mail by Ocke in users@dba.o.o</comment></paragraph>
 <paragraph role="paragraph" id="par_id4601886" xml-lang="en-US" l10n="NEW">If there are blank fields in the cost column, use the following formula to replace the blank fields' content with zero:</paragraph>
 <paragraph role="code" id="par_id1754509" xml-lang="en-US" l10n="NEW">[SumCost] + IF(ISBLANK([field]);0;[field])</paragraph><comment>need some real working examples. See i81874</comment><comment>Formula</comment>
-<bookmark xml-lang="en-US" branch="hid/64522" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
-<bookmark xml-lang="en-US" branch="hid/64523" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
-<bookmark xml-lang="en-US" branch="hid/64518" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
-<bookmark xml-lang="en-US" branch="hid/64519" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORMULA" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_INITIALFORMULA" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DEEPTRAVERSING" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PREEVALUATED" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
index 171b5bbc21..b1e09930b7 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rep_pagenumbers.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,11 +44,11 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Page Numbers dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Page Numbers</item>.</ahelp></paragraph>
 <paragraph role="tip" id="par_id1068758" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861634" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861635" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861637" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861638" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577864712" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N_OF_M" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_TOPPAGE" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_PAGENUMBERS_LST_ALIGNMENT" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
 <list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_id8257087" xml-lang="en-US" l10n="NEW">Select the format for the page numbers, either "Page N" or "Page N of M", where N stands for the current page number, and M for the total number of pages in the report.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
index 1e22300e1d..6f83c36817 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rep_prop.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,35 +46,35 @@
 <paragraph role="tip" id="par_id1080660" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
 <paragraph role="paragraph" id="par_id7175817" xml-lang="en-US" l10n="NEW">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
 <paragraph role="paragraph" id="par_id9895931" xml-lang="en-US" l10n="NEW">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64473" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id6993926" xml-lang="en-US" l10n="NEW">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/><paragraph role="tip" id="par_id3729361" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To display the Data or General tab page for the whole report, choose Edit - Select Report.</ahelp></paragraph><comment>Group keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/64505" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
-<bookmark xml-lang="en-US" branch="hid/64506" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
-<bookmark xml-lang="en-US" branch="hid/64507" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
-<bookmark xml-lang="en-US" branch="hid/64493" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id7022003" xml-lang="en-US" l10n="NEW">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
 <paragraph role="paragraph" id="par_id7004303" xml-lang="en-US" l10n="NEW">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
-<bookmark xml-lang="en-US" branch="hid/64511" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
-<bookmark xml-lang="en-US" branch="hid/64504" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
-<bookmark xml-lang="en-US" branch="hid/64515" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
-<bookmark xml-lang="en-US" branch="hid/64494" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
-<bookmark xml-lang="en-US" branch="hid/64527" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
 <paragraph role="paragraph" id="par_id7466963" xml-lang="en-US" l10n="NEW">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
 <paragraph role="paragraph" id="par_id3644215" xml-lang="en-US" l10n="NEW">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
-<bookmark xml-lang="en-US" branch="hid/64477" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
-<bookmark xml-lang="en-US" branch="hid/64478" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/64479" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1536606" xml-lang="en-US" l10n="NEW">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
 <paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">For a Label field, you can change the displayed text in the Label input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64526" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
-<bookmark xml-lang="en-US" branch="hid/64512" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
-<bookmark xml-lang="en-US" branch="hid/64513" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
-<bookmark xml-lang="en-US" branch="hid/64514" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
-<bookmark xml-lang="en-US" branch="hid/64524" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
-<bookmark xml-lang="en-US" branch="hid/64501" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
-<bookmark xml-lang="en-US" branch="hid/37854" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1593676" xml-lang="en-US" l10n="NEW">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64510" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
index 39edac3b06..b7cb9952de 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rep_sort.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,56 +29,70 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedexplorerdatabaserep_sortxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sorting and Grouping</title>
-<filename>/text/shared/explorer/database/rep_sort.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="sort">
-<bookmark xml-lang="en-US" branch="hid/.uno:DbSortingAndGrouping" id="bm_id9569078" localize="false"/><paragraph role="heading" id="hd_id3486434" xml-lang="en-US" level="1" l10n="NEW"><variable id="rep_sort"><link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link>
+      <topic id="textsharedexplorerdatabaserep_sortxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Sorting and Grouping</title>
+         <filename>/text/shared/explorer/database/rep_sort.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="sort">
+<bookmark xml-lang="en-US" branch="hid/.uno:DbSortingAndGrouping" id="bm_id9569078" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3486434" role="heading" level="1" l10n="NEW"><variable id="rep_sort"><link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3068636" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id876186" xml-lang="en-US" l10n="NEW">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64463" id="bm_id2480849" localize="false"/><paragraph role="paragraph" id="par_id599688" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the fields that will be used for sorting or grouping. The field at the top has the highest priority, the second field has the second priority, and so on.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/64461" id="bm_id4181951" localize="false"/><paragraph role="paragraph" id="par_id1371501" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open a list from which you can select a field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114727444" id="bm_id2927335" localize="false"/><paragraph role="paragraph" id="par_id4661702" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field up in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114727445" id="bm_id2107303" localize="false"/><paragraph role="paragraph" id="par_id7868892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field down in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719249" id="bm_id4071779" localize="false"/><paragraph role="paragraph" id="par_id2188787" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the sorting order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719234" id="bm_id7844477" localize="false"/><paragraph role="paragraph" id="par_id5833307" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719236" id="bm_id6478469" localize="false"/><paragraph role="paragraph" id="par_id7726676" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719238" id="bm_id9038972" localize="false"/><paragraph role="paragraph" id="par_id3729361" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to create a new group on each changed value, or on other properties.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3405560" xml-lang="en-US" l10n="NEW">By default a new group is created on every changed value of a record from the selected field. You can change this property depending on the type of field:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3409527" xml-lang="en-US" l10n="NEW">For fields of type Text, you can select Prefix Characters and enter a number n of characters in the text box below. The records which are identical in the first n characters will be grouped together.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7112338" xml-lang="en-US" l10n="NEW">For fields of type Date/Time, you can group the records by the same year, quarter, month, week, day, hour, or minute. You can additionally specify an interval for weeks and hours: 2 weeks groups data in biweekly groups, 12 hours groups data in half-day groups.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW">For fields of type AutoNumber, Currency, or Number, you specify an interval.<comment>how?</comment></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/2114721800" id="bm_id7985168" localize="false"/><paragraph role="paragraph" id="par_id7700430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the group interval value that records are grouped by.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/21147219242" id="bm_id9573961" localize="false"/><paragraph role="paragraph" id="par_id1180455" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the level of detail by which a group is kept together on the same page.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2091433" xml-lang="en-US" l10n="NEW">When you specify to keep together some records on the same page, you have three choices:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW">No - page boundaries are not taken into account.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9312417" xml-lang="en-US" l10n="NEW">Whole Group - prints the group header, detail section, and group footer on the same page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9089022" xml-lang="en-US" l10n="NEW">With First Detail - prints the group header on a page only if the first detail record also can be printed on the same page.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id3068636" role="paragraph" l10n="NEW"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id876186" role="paragraph" l10n="NEW">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSBRW" id="bm_id2480849" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id599688" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the fields that will be used for sorting or grouping. The field at the top has the highest priority, the second field has the second priority, and so on.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELDEXPRESSION" id="bm_id4181951" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open a list from which you can select a field.</ahelp></paragraph>
+<!-- removed HID 2114727444 -->
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_UP" id="bm_id2927436" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4661702" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field up in the list.</ahelp></paragraph>
+<!-- removed HID 2114727445 -->
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_DOWN" id="bm_id2107304" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field down in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_ORDER" id="bm_id4071779" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the sorting order.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_HEADERLST" id="bm_id7844477" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5833307" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_FOOTERLST" id="bm_id6478469" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_GROUPONLST" id="bm_id9038972" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3729361" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to create a new group on each changed value, or on other properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_DELETE" id="bm_id9038973" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922142041" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected field from the list.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3405560" role="paragraph" l10n="NEW">By default a new group is created on every changed value of a record from the selected field. You can change this property depending on the type of field:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3409527" role="paragraph" l10n="NEW">For fields of type Text, you can select Prefix Characters and enter a number n of characters in the text box below. The records which are identical in the first n characters will be grouped together.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7112338" role="paragraph" l10n="NEW">For fields of type Date/Time, you can group the records by the same year, quarter, month, week, day, hour, or minute. You can additionally specify an interval for weeks and hours: 2 weeks groups data in biweekly groups, 12 hours groups data in half-day groups.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW">For fields of type AutoNumber, Currency, or Number, you specify an interval.<comment>how?</comment></paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_NUMERICFIELD_RID_GROUPS_SORTING_ED_GROUPINTERVALLST" id="bm_id7985168" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7700430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the group interval value that records are grouped by.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST" id="bm_id9573961" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the level of detail by which a group is kept together on the same page.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2091433" role="paragraph" l10n="NEW">When you specify to keep together some records on the same page, you have three choices:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5092318" role="paragraph" l10n="NEW">No - page boundaries are not taken into account.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9312417" role="paragraph" l10n="NEW">Whole Group - prints the group header, detail section, and group footer on the same page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9089022" role="paragraph" l10n="NEW">With First Detail - prints the group header on a page only if the first detail record also can be printed on the same page.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
index 44889a3944..aef55c0652 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablewizard00.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
index 043f97aefb..b7144ede96 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablewizard01.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
index e985d2219c..1d213ef501 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablewizard02.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
index 501962dccc..df0ff12d11 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablewizard03.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
index 50b1266dc0..8b591ef9b3 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablewizard04.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/toolbars.xhp b/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
index ca3db92767..0f92cddebb 100644
--- a/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbars.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/fontwork_toolbar.xhp b/helpcontent2/source/text/shared/fontwork_toolbar.xhp
index 2a3f12596b..6622bfaeed 100644
--- a/helpcontent2/source/text/shared/fontwork_toolbar.xhp
+++ b/helpcontent2/source/text/shared/fontwork_toolbar.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork_toolbar.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,55 +29,49 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textsharedfontwork_toolbarxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fontwork</title>
-<filename>/text/shared/fontwork_toolbar.xhp</filename>
-</topic>
-<history>
-<created date="2004-09-28T09:50:02">UFI: Fontwork Toolbar</created>
-<lastedited date="2007-01-17T09:50:08">DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="fontwork">
-<paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork</link></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Fontwork toolbar opens when you select a Fontwork object.</paragraph>
-</section>
-<paragraph role="heading" id="par_idN1056D" xml-lang="en-US" level="2" l10n="NEW">Fontwork Gallery</paragraph>
-<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SHAPE_FLOATER" id="bm_id7158421" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SHAPE_TYPES" id="bm_id5036025" localize="false"/>
+      <topic id="textsharedfontwork_toolbarxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Fontwork</title>
+         <filename>/text/shared/fontwork_toolbar.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="fontwork">
+         <paragraph xml-lang="en-US" id="par_idN1055A" role="heading" level="1" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph" l10n="NEW">The Fontwork toolbar opens when you select a Fontwork object.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN1056D" role="heading" level="2" l10n="NEW">Fontwork Gallery</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10571" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontworkShapeTypes" id="bm_id1966307" localize="false"/>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Fontwork Shape</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Fontwork Shape</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SAME_LETTER_HEIGHTS" id="bm_id2198858" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontworkSameLetterHeights" id="bm_id3509323" localize="false"/>
-<paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="2" l10n="NEW">Fontwork Same Letter Heights</paragraph>
-<paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the letter height of the selected Fontwork objects from normal to the same height for all objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105A6" role="heading" level="2" l10n="NEW">Fontwork Same Letter Heights</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105AA" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the letter height of the selected Fontwork objects from normal to the same height for all objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_ALIGNMENT_FLOATER" id="bm_id7484969" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontworkAlignmentFloater" id="bm_id8592791" localize="false"/>
-<paragraph role="heading" id="par_idN105C1" xml-lang="en-US" level="2" l10n="NEW">Fontwork Alignment</paragraph>
-<paragraph role="paragraph" id="par_idN105C5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Alignment window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CALL" id="bm_id734885" localize="false"/>
-<paragraph role="paragraph" id="par_idN105DC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to apply the alignment to the selected Fontwork objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105C1" role="heading" level="2" l10n="NEW">Fontwork Alignment</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105C5" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Alignment window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FontWork1TBO" id="bm_id734885" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN105DC" role="paragraph" l10n="NEW"><ahelp hid=".">Click to apply the alignment to the selected Fontwork objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_CHARACTER_SPACING_FLOATER" id="bm_id1930906" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontworkCharacterSpacingFloater" id="bm_id2658162" localize="false"/>
-<paragraph role="heading" id="par_idN105F3" xml-lang="en-US" level="2" l10n="NEW">Fontwork Character Spacing</paragraph>
-<paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/40018" id="bm_id7804193" localize="false"/>
-<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to apply the character spacing to the selected Fontwork objects.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="3" l10n="NEW">Custom</paragraph>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237899783" id="bm_id2257759" localize="false"/>
-<paragraph role="heading" id="par_idN10638" xml-lang="en-US" level="4" l10n="NEW">Value</paragraph>
-<paragraph role="paragraph" id="par_idN1063C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the Fontwork character spacing value.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1064B" xml-lang="en-US" level="3" l10n="NEW">Kern Character Pairs</paragraph>
-<paragraph role="paragraph" id="par_idN1064F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the <link href="text/shared/00/00000005.xhp#kerning"> kerning</link> of character pairs on and off.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/fontwork.xhp#fontwork"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN105F3" role="heading" level="2" l10n="NEW">Fontwork Character Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105F7" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" id="bm_id7804193" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1060E" role="paragraph" l10n="NEW"><ahelp hid=".">Click to apply the character spacing to the selected Fontwork objects.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1061D" role="heading" level="3" l10n="NEW">Custom</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FontWork2TBO" id="bm_id2257759" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10638" role="heading" level="4" l10n="NEW">Value</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1063C" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the Fontwork character spacing value.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1064B" role="heading" level="3" l10n="NEW">Kern Character Pairs</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the <link href="text/shared/00/00000005.xhp#kerning"> kerning</link> of character pairs on and off.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/fontwork.xhp#fontwork"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index 186deae3c7..14126e9352 100755
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: aaa_start.xhp,v $
- * $Revision: 1.5.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..45deab4bfe 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessibility.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -36,15 +33,8 @@
 <title xml-lang="en-US" id="tit">Accessibility in %PRODUCTNAME</title>
 <filename>/text/shared/guide/accessibility.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>
-  
-  
-  
   <bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
   <list type="unordered">
@@ -59,15 +49,15 @@
    </listitem>
    <listitem>
     <paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
-    <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+    <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
    </listitem>
   </list>
-  <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
+  <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
   <section id="relatedtopics">
   <embed href="text/shared/guide/assistive.xhp#assistive"/>
-  <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><link name="Tools - Options - %PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><link name="Tools - Options - %PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp"><item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp"><item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
   <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
   <embed href="text/shared/04/01010000.xhp#common_keys"/>
 	</section>
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 13c0439eed..3ca6aba2ea 100755
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: active_help_on_off.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
 <paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="3" l10n="U" oldref="3">To turn Extended Tips on and off:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph>Tools - Options - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
 <paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="5">A check mark indicates that the extended tips are activated.</paragraph>
 </listitem>
 </list>
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index dd57b5e942..2227463043 100755
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: activex.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,7 +94,8 @@
 <paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph>
 </listitem>
 </list>
-<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+<section id="relatedtopics">
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
 <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
 <embed href="text/shared/guide/doc_open.xhp#doc_open"/>
 <embed href="text/shared/guide/import_ms.xhp#import_ms"/>
diff --git a/helpcontent2/source/text/shared/guide/assistive.xhp b/helpcontent2/source/text/shared/guide/assistive.xhp
index dabe745c9a..4694bb2d45 100644
--- a/helpcontent2/source/text/shared/guide/assistive.xhp
+++ b/helpcontent2/source/text/shared/guide/assistive.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: assistive.xhp,v $
- *
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,9 +94,9 @@
 <paragraph role="note" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="11">When accessibility support in $[officename] is enabled, the Java Runtime Environment is loaded, and increases the startup time for $[officename].</paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance">Tools - Options - $[officename] - Appearance</link></paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01013000.xhp" name="Tools - Options - $[officename] - Accessibility">Tools - Options - $[officename] - Accessibility</link></paragraph>
+<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance">$[officename] - Appearance</link></paragraph>
+<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp" name="$[officename] - Accessibility">$[officename] - Accessibility</link></paragraph>
 <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
 <embed href="text/shared/04/01010000.xhp#common_keys"/>
 </section>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 851d823829..a59255c60b 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,52 +32,53 @@
  
 	
 <meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include">
-<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
-<filename>/text/shared/guide/autocorr_url.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguideautocorr_urlxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Turning off Automatic URL Recognition</title>
+         <filename>/text/shared/guide/autocorr_url.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
-<bookmark_value>recognizing URLs automatically</bookmark_value>
-<bookmark_value>Internet; turning off recognition of addresses</bookmark_value>
-<bookmark_value>automatic hyperlink formatting</bookmark_value>
-<bookmark_value>URL;turning off URL recognition</bookmark_value>
-<bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
-<bookmark_value>links;turning off automatic recognition</bookmark_value>
+      <bookmark_value>recognizing URLs automatically</bookmark_value>
+      <bookmark_value>automatic hyperlink formatting</bookmark_value>
+      <bookmark_value>URL;turning off URL recognition</bookmark_value>
+      <bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
+      <bookmark_value>links;turning off automatic recognition</bookmark_value>
+      <bookmark_value>predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
-<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
-<paragraph role="listitem" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153561" role="paragraph" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149235" role="listitem" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3151246" role="listitem" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148550" role="listitem" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153360" role="listitem" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156423" role="listitem" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/autohide.xhp b/helpcontent2/source/text/shared/guide/autohide.xhp
index ba649d369e..6ec0f9f0de 100644
--- a/helpcontent2/source/text/shared/guide/autohide.xhp
+++ b/helpcontent2/source/text/shared/guide/autohide.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autohide.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/background.xhp b/helpcontent2/source/text/shared/guide/background.xhp
index eaf1a20f12..927f8b3b72 100755
--- a/helpcontent2/source/text/shared/guide/background.xhp
+++ b/helpcontent2/source/text/shared/guide/background.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: background.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_paragraph.xhp b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
index e8e17d00e2..3566abf3ce 100755
--- a/helpcontent2/source/text/shared/guide/border_paragraph.xhp
+++ b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: border_paragraph.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp
index e4467b81af..4455968b8e 100755
--- a/helpcontent2/source/text/shared/guide/border_table.xhp
+++ b/helpcontent2/source/text/shared/guide/border_table.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: border_table.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,9 +40,9 @@
 </topic>
 </meta>
 <body>
-  
-  
-  
+
+
+
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value>
 <bookmark_value>tables in spreadsheets;defining borders</bookmark_value>
 <bookmark_value>borders; for tables</bookmark_value>
@@ -53,7 +50,7 @@
 <bookmark_value>defining;table borders</bookmark_value>
 </bookmark>
   <comment>mw deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link> 
+  <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2" l10n="U" oldref="1">Setting a Predefined Border Style</paragraph>
   <list type="ordered">
@@ -79,6 +76,10 @@
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
    </listitem>
+      <listitem>
+    <paragraph xml-lang="en-US" id="par_id31594132" role="listitem" l10n="NEW">If you select more than one row or column, you can change the middle lines between rows or columns. Select the middle markers in the <emph>User-defined</emph> area.</paragraph>
+   </listitem>
+
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3153526" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
    </listitem>
@@ -93,19 +94,19 @@
    </listitem>
   </list>
   <section id="relatedtopics">
-   
-   
+
+
 <switch select="appl">
-   
+
 <case select="WRITER">
    <embed href="text/swriter/guide/border_object.xhp#border_object"/>
    <embed href="text/swriter/guide/border_page.xhp#border_page"/>
-   
+
 </case>
-   
+
 </switch>
    <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-   
+
   </section>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index 943d1988b5..6a896e43fc 100755
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: breaking_lines.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,61 +29,58 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Line Breaks in Cells</title>
-<filename>/text/shared/guide/breaking_lines.xhp</filename>
-</topic>
-<history>
-<created date="2004-04-27T13:22:20"/>
-<lastedited date="2006-04-19T14:46:12">UFI 04/04/27, added links to this file in scalc/guide/main.xhp and swriter/guide/main.xhp
-YJ: checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Line Breaks in Cells</title>
+         <filename>/text/shared/guide/breaking_lines.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id6305734"><bookmark_value>line breaks; in cells</bookmark_value>
-<bookmark_value>cells; line breaks</bookmark_value>
-<bookmark_value>text flow; in cells</bookmark_value>
-<bookmark_value>text breaks in cells</bookmark_value>
-<bookmark_value>wrapping text; in cells</bookmark_value>
-<bookmark_value>words; wrapping in cells</bookmark_value>
-<bookmark_value>automatic line breaks</bookmark_value>
-<bookmark_value>new lines in cells</bookmark_value>
-<bookmark_value>inserting;line breaks in cells</bookmark_value>
-<bookmark_value>tables;inserting line breaks</bookmark_value>
+      <bookmark_value>cells; line breaks</bookmark_value>
+      <bookmark_value>text flow; in cells</bookmark_value>
+      <bookmark_value>text breaks in cells</bookmark_value>
+      <bookmark_value>wrapping text; in cells</bookmark_value>
+      <bookmark_value>words; wrapping in cells</bookmark_value>
+      <bookmark_value>automatic line breaks</bookmark_value>
+      <bookmark_value>new lines in cells</bookmark_value>
+      <bookmark_value>inserting;line breaks in cells</bookmark_value>
+      <bookmark_value>tables;inserting line breaks</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="par_idN106D5" xml-lang="en-US" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
+<paragraph xml-lang="en-US" id="par_idN106D5" role="heading" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
 </variable></paragraph>
-<paragraph role="heading" id="par_idN106D9" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
-<paragraph role="paragraph" id="par_idN106E3" xml-lang="en-US" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106E6" xml-lang="en-US" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106ED" xml-lang="en-US" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F1" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F9" xml-lang="en-US" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1070A" xml-lang="en-US" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN10718" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN106D9" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106E0" role="paragraph" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106E3" role="paragraph" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0509200914160968" role="note" l10n="NEW">You can search for a newline character in the Find &amp; Replace dialog by searching for \n as a regular expression. You can use the text function CHAR(10) to insert a newline character into a text formula.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106E6" role="heading" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106ED" role="paragraph" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106F1" role="paragraph" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106F9" role="paragraph" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10700" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10707" role="paragraph" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN10718" role="paragraph" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/change_title.xhp b/helpcontent2/source/text/shared/guide/change_title.xhp
index 290dabe1d7..58527f35a4 100755..100644
--- a/helpcontent2/source/text/shared/guide/change_title.xhp
+++ b/helpcontent2/source/text/shared/guide/change_title.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: change_title.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidechange_titlexml" indexer="include" status="PUBLISH">
@@ -51,7 +48,7 @@ YJ: checked</lastedited>
 </bookmark>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="change_title"><link href="text/shared/guide/change_title.xhp" name="Changing the Title of a Document">Changing the Title of a Document</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.<comment>UFI: we don't show the title any more on the title bar - see http://specs.openoffice.org/appwide/module_name_in_caption_bar/module_name_in_caption_bar.sxw</comment></paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.</paragraph>
 <paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="4">How to change the title of the current document</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/shared/guide/chart_axis.xhp b/helpcontent2/source/text/shared/guide/chart_axis.xhp
index bacf064b0b..2a8d55eea5 100755
--- a/helpcontent2/source/text/shared/guide/chart_axis.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_axis.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart_axis.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index 5b072486d9..cdf29addb4 100755
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart_barformat.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_insert.xhp b/helpcontent2/source/text/shared/guide/chart_insert.xhp
index 16242d0d55..e830a22f2c 100644
--- a/helpcontent2/source/text/shared/guide/chart_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_insert.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart_insert.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_legend.xhp b/helpcontent2/source/text/shared/guide/chart_legend.xhp
index 5801e0de05..6e17d903c4 100644
--- a/helpcontent2/source/text/shared/guide/chart_legend.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_legend.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart_legend.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_title.xhp b/helpcontent2/source/text/shared/guide/chart_title.xhp
index ee89c841a4..7b4c54a9b1 100755
--- a/helpcontent2/source/text/shared/guide/chart_title.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_title.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart_title.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 928c7664c8..d0222dcbd6 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: collab.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,26 +40,22 @@
 </topic>
 </meta>
 <body>
-  
-  
-  
 <bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
 <bookmark_value>collaboration</bookmark_value>
 </bookmark>
   <comment>MW changed the index entries to one level entries.</comment>
-  <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> 
+  <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph>
   <comment>Tools - Share Document menu</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
   <comment>Share Document dialog - Share this spreadsheet with other users</comment>
-  
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
-  <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph>Tools - Options - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
   <paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph>
   <paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph>
@@ -90,23 +83,23 @@
    </listitem>
   </list>
   <comment>Resolve Conflicts dialog</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph>
   <comment>Keep Mine</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph>
   <comment>Keep Other</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph>
   <comment>Keep All Mine</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph>
   <comment>Keep All Others</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph>
@@ -127,6 +120,7 @@
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph>
+
   <paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph>
   <paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph>
   <paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph>
@@ -144,10 +138,23 @@
     <paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph>
    </listitem>
   </list>
+
+  <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph>
+  <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph>
+  <list type="unordered">
+   <listitem>
+    <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph>
+   </listitem>
+   <listitem>
+    <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph>
+   </listitem>
+  </list>
+  <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph>
+
   <section id="relatedtopics">
-   
+
    <paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-   
+
   </section>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/configure_overview.xhp b/helpcontent2/source/text/shared/guide/configure_overview.xhp
index cbaaf0b898..0bf4e119f8 100755
--- a/helpcontent2/source/text/shared/guide/configure_overview.xhp
+++ b/helpcontent2/source/text/shared/guide/configure_overview.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configure_overview.xhp,v $
- *
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/contextmenu.xhp b/helpcontent2/source/text/shared/guide/contextmenu.xhp
index 3c8683bfa7..b096269f71 100755
--- a/helpcontent2/source/text/shared/guide/contextmenu.xhp
+++ b/helpcontent2/source/text/shared/guide/contextmenu.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contextmenu.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index b685a7bf2c..9098756ad3 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: copy_drawfunctions.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 3ca3e1144d..53c48ed5ba 100755
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: copytable2application.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index f8cca36797..feaff89db2 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: copytext2application.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index a539c61509..fc83807b1f 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ctl.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,17 +29,12 @@
  *
  ************************************************************************
  -->
-	
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidectlxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Languages Using Complex Text Layout</title>
 <filename>/text/shared/guide/ctl.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:43:30">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153662"><bookmark_value>CTL;complex text layout languages</bookmark_value>
@@ -88,7 +80,7 @@
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/language_select.xhp#language_select"/>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01150300.xhp" name="Tools - Options - Language Settings - Complex Text Layout">Tools - Options - Language Settings - Complex Text Layout</link></paragraph>
+<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01150300.xhp" name="Language Settings - Complex Text Layout">Language Settings - Complex Text Layout</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 21fa70e963..5a812d6cb5 100755
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_addressbook.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,7 +68,7 @@
 <paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Data source</emph> combo box, select the system address book or the data source you want to use as an address book.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Configure</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Address Data Source ...</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="13">In the <emph>Table</emph> combo box, select the database table you want to use as the address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
index 50a78ed064..bd129a0482 100755
--- a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
+++ b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_dbase2office.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
index 4708c94732..9809e47ae8 100644
--- a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
+++ b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_enter_sql.xhp,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,60 +30,57 @@
  ************************************************************************
  -->
  
-<helpdocument version="1.0">
+	
 <meta>
-<topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Executing SQL Commands</title>
-<filename>/text/shared/guide/data_enter_sql.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-14T15:10:58">fpe: changed to match new database interface</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Executing SQL Commands</title>
+         <filename>/text/shared/guide/data_enter_sql.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>SQL; executing SQL commands</bookmark_value>
-<bookmark_value>queries;creating in SQL view</bookmark_value>
-<bookmark_value>commands;SQL</bookmark_value>
-<bookmark_value>executing;SQL commands</bookmark_value>
-</bookmark><comment>mw changed "SQL;executing commands"</comment>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
+      <bookmark_value>queries;creating in SQL view</bookmark_value>
+      <bookmark_value>commands;SQL</bookmark_value>
+      <bookmark_value>executing SQL commands</bookmark_value>
+</bookmark><comment>mw changed "SQL;executing commands"</comment><comment>mw made "executing;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3152801" role="heading" level="1" l10n="U"
+                 oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
-<paragraph role="note" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
-<paragraph role="heading" id="hd_id9577929" xml-lang="en-US" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7923825" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9448530" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon 
-<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154071" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153562" role="note" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9577929" role="heading" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7923825" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9448530" role="paragraph" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon 
+<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
 	</image> or</paragraph>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon 
-<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156212" xml-lang="en-US">Icon</alt>
+            <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon 
+<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
 	</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="96">Click the <emph>Run</emph> icon 
-<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152886" xml-lang="en-US">Icon</alt>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3083443" role="paragraph" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="U" oldref="96">Click the <emph>Run</emph> icon 
+<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
 	</image>. The result of the query is displayed in the upper window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon 
-<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153159" xml-lang="en-US">Icon</alt>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon 
+<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
 	</image> to save the query.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
+         <embed href="text/shared/guide/database_main.xhp#database_main"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_forms.xhp b/helpcontent2/source/text/shared/guide/data_forms.xhp
index aebc732d07..62266338a5 100644
--- a/helpcontent2/source/text/shared/guide/data_forms.xhp
+++ b/helpcontent2/source/text/shared/guide/data_forms.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_forms.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_im_export.xhp b/helpcontent2/source/text/shared/guide/data_im_export.xhp
index 82fe49f2d8..3c7a9e194d 100644
--- a/helpcontent2/source/text/shared/guide/data_im_export.xhp
+++ b/helpcontent2/source/text/shared/guide/data_im_export.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_im_export.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_new.xhp b/helpcontent2/source/text/shared/guide/data_new.xhp
index 3982a178ad..8f5c003b7a 100644
--- a/helpcontent2/source/text/shared/guide/data_new.xhp
+++ b/helpcontent2/source/text/shared/guide/data_new.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_new.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_queries.xhp b/helpcontent2/source/text/shared/guide/data_queries.xhp
index aaac2a2282..0a19014f07 100644
--- a/helpcontent2/source/text/shared/guide/data_queries.xhp
+++ b/helpcontent2/source/text/shared/guide/data_queries.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_queries.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_register.xhp b/helpcontent2/source/text/shared/guide/data_register.xhp
index 313003ed0b..25517a221c 100644
--- a/helpcontent2/source/text/shared/guide/data_register.xhp
+++ b/helpcontent2/source/text/shared/guide/data_register.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_register.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidedata_registerxhp" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Registering and Deleting a Database </title>
@@ -54,7 +50,7 @@
 <paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3" l10n="NEW">To register an existing database file:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="CHG">Click <emph>New</emph> and select the database file.<comment>i60224</comment></paragraph>
@@ -63,7 +59,7 @@
 <paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="3" l10n="NEW">To remove a registered database from %PRODUCTNAME</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW">Select the database file and click <emph>Delete</emph>. </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_report.xhp b/helpcontent2/source/text/shared/guide/data_report.xhp
index abf6e9459f..e325125dc2 100755
--- a/helpcontent2/source/text/shared/guide/data_report.xhp
+++ b/helpcontent2/source/text/shared/guide/data_report.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_report.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_reports.xhp b/helpcontent2/source/text/shared/guide/data_reports.xhp
index a0863872ee..5949820331 100644
--- a/helpcontent2/source/text/shared/guide/data_reports.xhp
+++ b/helpcontent2/source/text/shared/guide/data_reports.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_reports.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search.xhp b/helpcontent2/source/text/shared/guide/data_search.xhp
index 570b08bebc..f0a797cdae 100644
--- a/helpcontent2/source/text/shared/guide/data_search.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_search.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index 05a10019eb..dcbe7f9aa7 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_search2.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
index 4fb9917c12..80bff489dd 100644
--- a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_tabledefine.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,50 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Design</title>
-<filename>/text/shared/guide/data_tabledefine.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view</bookmark_value>
-<bookmark_value>designing; database tables</bookmark_value>
-<bookmark_value>properties;fields in databases</bookmark_value>
-<bookmark_value>fields;database tables</bookmark_value>
-<bookmark_value>AutoValue;database tables</bookmark_value>
-<bookmark_value>primary key;database tables</bookmark_value>
-</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><paragraph role="paragraph" id="par_id3155448" xml-lang="en-US" l10n="E" oldref="103" localize="false"/>
-<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
+      <topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Table Design</title>
+         <filename>/text/shared/guide/data_tabledefine.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view (manually)</bookmark_value>
+      <bookmark_value>designing; database tables</bookmark_value>
+      <bookmark_value>properties;fields in databases</bookmark_value>
+      <bookmark_value>fields;database tables</bookmark_value>
+      <bookmark_value>AutoValue (Base)</bookmark_value>
+      <bookmark_value>primary keys;design view</bookmark_value>
+</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><comment>MW changed Tables in databases, AutoValue and Primary Key entries</comment>
+<paragraph xml-lang="en-US" id="par_id3155448" role="paragraph" l10n="E" oldref="103"
+                 localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U"
+                 oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id1595507" xml-lang="en-US" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
-<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U" oldref="42">Field Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155535" role="paragraph" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146798" role="paragraph" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153349" role="listitem" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1595507" role="listitem" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154760" role="note" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153379" role="heading" level="2" l10n="U"
+                 oldref="42">Field Properties</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144762" role="paragraph" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/database_main.xhp#database_main"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_tables.xhp b/helpcontent2/source/text/shared/guide/data_tables.xhp
index de0cf9c869..43d0cde3f4 100644
--- a/helpcontent2/source/text/shared/guide/data_tables.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tables.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_tables.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_view.xhp b/helpcontent2/source/text/shared/guide/data_view.xhp
index 843fdc6fe0..f2fff1fa7d 100644
--- a/helpcontent2/source/text/shared/guide/data_view.xhp
+++ b/helpcontent2/source/text/shared/guide/data_view.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: data_view.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/database_main.xhp b/helpcontent2/source/text/shared/guide/database_main.xhp
index 1d49cc5eec..2039a3175f 100755
--- a/helpcontent2/source/text/shared/guide/database_main.xhp
+++ b/helpcontent2/source/text/shared/guide/database_main.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database_main.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index f1369473ab..9812393661 100755..100644
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,41 +28,89 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
-<title id="tit" xml-lang="en-US">About Digital Signatures</title>
-<filename>/text/shared/guide/digital_signatures.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">About Digital Signatures</title>
+         <filename>/text/shared/guide/digital_signatures.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
-<bookmark_value>digital signatures;overview</bookmark_value>
-<bookmark_value>security;digital signatures</bookmark_value>
+      <bookmark_value>digital signatures;overview</bookmark_value>
+      <bookmark_value>security;digital signatures</bookmark_value>
 </bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
-<paragraph role="heading" id="hd_id2767418" xml-lang="en-US" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
+<paragraph xml-lang="en-US" id="hd_id2767418" role="heading" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
-<paragraph role="heading" id="hd_id6564531" xml-lang="en-US" level="2" l10n="NEW">Certificates</paragraph>
-<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
-<paragraph role="heading" id="par_idN1066D" xml-lang="en-US" level="2" l10n="NEW">Save and sign the document</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
-<paragraph role="heading" id="par_idN10674" xml-lang="en-US" level="2" l10n="NEW">Open a signed document</paragraph>
-<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
-<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
-<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
-<paragraph role="heading" id="hd_id9354228" xml-lang="en-US" level="2" l10n="NEW">Security Warnings</paragraph>
-<paragraph role="paragraph" id="par_id2372508" xml-lang="en-US" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
-<paragraph role="paragraph" id="par_id7953123" xml-lang="en-US" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
-<paragraph role="paragraph" id="par_id6195257" xml-lang="en-US" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
-<paragraph role="warning" id="par_id8635517" xml-lang="en-US" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
-<paragraph role="paragraph" id="par_id6075624" xml-lang="en-US" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
-<paragraph role="warning" id="par_id6819971" xml-lang="en-US" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3204443" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id486465" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id3448591" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6564531" role="heading" level="2" l10n="NEW">Certificates</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="2" l10n="NEW">Save and sign the document</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10674" role="heading" level="2" l10n="NEW">Open a signed document</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0821200911571878" role="paragraph" l10n="NEW">You can see any of the following icons and messages when you open a signed document.</paragraph>
+      <table id="tbl_id0821200912400398">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504050" role="tablehead" l10n="NEW">Icon in Status bar</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504061" role="tablehead" l10n="NEW">Signature status</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504010" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912421569">Icon</alt>
+	</image></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504189" role="tablecontent" l10n="NEW">The signature is valid.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id082120091250418" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912431081">Icon</alt>
+	</image></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent" l10n="NEW">The signature is OK, but the certificates could not be validated.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504237" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912435090" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id0821200912435090">Icon</alt>
+	</image></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0821200912504233" role="tablecontent" l10n="NEW">The signature is invalid.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id0821200910191787" role="heading" level="3" l10n="NEW">Signatures and software versions</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0821200910191747" role="paragraph" l10n="NEW">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id0821200910191774" role="paragraph" l10n="NEW">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the documents are signed" when loaded in the newer software.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2008200911583098" role="note" l10n="NEW">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2 and StarOffice 9.2 all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9354228" role="heading" level="2" l10n="NEW">Security Warnings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8635517" role="warning" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
index 21fca6ab59..8d917da300 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: digitalsign_receive.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
   <paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">You must use the %PRODUCTNAME file dialogs to use WebDAV over HTTPS.</paragraph>
   <list type="ordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog box.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id1227759" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
@@ -78,24 +75,24 @@
   </list>
   <paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">If there is a mismatch of the domain name given in the certificate and the domain name you entered in the file dialog, then you see a dialog that allows you to choose from any of the following options:</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/1311773189" id="bm_id9141819" localize="false"/>
+<!-- removed HID 1311773189 -->
   <paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW"> <emph>View Certificate</emph> - <ahelp hid=".">Opens the View Certificate dialog.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/1311773188" id="bm_id6354869" localize="false"/>
+<!-- removed HID 1311773188 -->
   <paragraph xml-lang="en-US" id="par_id8111819" role="paragraph" l10n="NEW"> <emph>Continue</emph> - <ahelp hid=".">If you are sure both domains are the same, click the Continue button.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id9116794" role="paragraph" l10n="NEW"> <emph>Cancel Connection</emph> - Cancels the connection.</paragraph>
   <paragraph xml-lang="en-US" id="par_id4381847" role="paragraph" l10n="NEW">If you click <emph>Continue</emph>, you may see a dialog that asks you to enter your user name and password.</paragraph>
   <comment>user name</comment>
   
-<bookmark xml-lang="en-US" branch="hid/1311344666" id="bm_id2685323" localize="false"/>
+<!-- removed HID 1311344666 -->
   <paragraph xml-lang="en-US" id="par_id1336710" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your user name to log on to the WebDAV server.</ahelp></paragraph>
   <comment>password</comment>
   
-<bookmark xml-lang="en-US" branch="hid/1311344669" id="bm_id6042664" localize="false"/>
+<!-- removed HID 1311344669 -->
   <paragraph xml-lang="en-US" id="par_id1221655" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your password.</ahelp></paragraph>
   <comment>remember password till end of session</comment>
   
-<bookmark xml-lang="en-US" branch="hid/1311343648" id="bm_id7889950" localize="false"/>
+<!-- removed HID 1311343648 -->
   <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
   <section id="relatedtopics">
    
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index 774e0f4069..0aa75256bf 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: digitalsign_send.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,109 +29,88 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
-<filename>/text/shared/guide/digitalsign_send.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
+         <filename>/text/shared/guide/digitalsign_send.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>signing documents with digital signatures</bookmark_value>
-<bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
-</bookmark>
-  <comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
-  <paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link> 
-</variable></paragraph>
-  <comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
-  <paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
-  
+      <bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
+</bookmark><comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
+<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
+</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
+<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
 <switch select="sys">
-  
 <case select="WIN">
-  <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
-  
+<paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
 </case>
-  
 <default>
-  <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
-   </listitem>
-  </list>
-  
+<paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.<comment>how about Mac OS X?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
+         </listitem>
+      </list>
 </default>
-  
 </switch>
-  <paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon 
-<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id262764">icon</alt>
-	</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon 
-<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id9252296">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon 
+<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id262764">Icon</alt>
 	</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
-  <comment>WebDAV see issue 32935</comment>
-  <comment>main dialog IDs are here to lead the user initially to this help page</comment>
-  <comment>Examine certificate button</comment>
-  
-<bookmark xml-lang="en-US" branch="hid/1311740419" id="bm_id2454298" localize="false"/>
-  <paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph>
-  <comment>Accept this certificate temporarily for this session radio button</comment>
-  
-<bookmark xml-lang="en-US" branch="hid/1311736321" id="bm_id2307199" localize="false"/>
-  <paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph>
-  <comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
-  
-<bookmark xml-lang="en-US" branch="hid/1311736326" id="bm_id9983825" localize="false"/>
-  <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
-  <section id="relatedtopics">
-   
-   <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon 
+<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id9252296">Icon</alt>
+	</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph><comment>WebDAV see issue 32935</comment><comment>main dialog IDs are here to lead the user initially to this help page</comment><comment>Examine certificate button</comment>
+<!-- removed HID 1311740419 -->
+<paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph><comment>Accept this certificate temporarily for this session radio button</comment>
+<!-- removed HID 1311736321 -->
+<paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph><comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
+<!-- removed HID 1311736326 -->
+<paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index f98667aeb4..cdea018b30 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc_autosave.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,7 +59,7 @@
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -71,7 +68,7 @@
 <paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="CHG" oldref="6">If the <emph>Always create backup copy</emph> option is selected, the old version of the file is saved to the backup directory whenever you save the current version of the file. </paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph>Tools - Options - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="8">The backup copy has the same name as the document, but the extension is .BAK. If the backup folder already contains such a file, it will be overwritten without warning.</paragraph>
@@ -80,7 +77,7 @@
 <paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
@@ -92,7 +89,7 @@
 <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
 <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
 <paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
 <paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report Tool</link></paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index 745b7ebecf..e62f2c692f 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc_open.xhp,v $
- * $Revision: 1.15.4.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,7 +72,7 @@
 <paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
 <paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
 <paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph>.</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
@@ -88,7 +85,7 @@
 <paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 3a4fca1ed1..19f88f17d3 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc_save.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,8 +60,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt>
-	</image></paragraph>
+<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
@@ -72,7 +68,7 @@
 </tablerow>
 </table>
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
 <paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
 <paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
 <paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
@@ -139,7 +135,7 @@
 <embed href="text/shared/00/00000021.xhp#xmlformat"/>
 <paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
 <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop.xhp b/helpcontent2/source/text/shared/guide/dragdrop.xhp
index fc6d407bce..ac2f4041fa 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
index c2a327abc9..62849a2c1a 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop_beamer.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 9601093494..4c793cf502 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop_fromgallery.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index c4baa16d10..c795bf2f61 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop_gallery.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index 0f1f0a7034..c3beacc89d 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop_graphic.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
index 81fb5cf138..a8ef05a7e0 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdrop_table.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
index e046bebe34..b00ca693e2 100755
--- a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edit_symbolbar.xhp,v $
- *
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index 021f2daa68..dcdabf8f5c 100755
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: email.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,14 +50,13 @@
 <bookmark_value>drawings; sending as e-mail</bookmark_value>
 <bookmark_value>presentations; sending as e-mail</bookmark_value>
 <bookmark_value>attachments in e-mails</bookmark_value>
-</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link>
-</variable></paragraph>
+</bookmark>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Tools - Options - Internet - E-mail</emph>. 
-</caseinline></switchinline></paragraph>
+<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/error_report.xhp b/helpcontent2/source/text/shared/guide/error_report.xhp
index bef3d05e18..2eb0204da4 100644
--- a/helpcontent2/source/text/shared/guide/error_report.xhp
+++ b/helpcontent2/source/text/shared/guide/error_report.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: error_report.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,46 +29,36 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Error Report Tool</title>
-<filename>/text/shared/guide/error_report.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:54:29">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Error Report Tool</title>
+         <filename>/text/shared/guide/error_report.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150616"><bookmark_value>Error Report Tool</bookmark_value>
-<bookmark_value>reports;error reports</bookmark_value>
-<bookmark_value>crash reports</bookmark_value>
-<bookmark_value>activating;Error Report Tool</bookmark_value>
+      <bookmark_value>reports;error reports</bookmark_value>
+      <bookmark_value>crash reports</bookmark_value>
+      <bookmark_value>activating;Error Report Tool</bookmark_value>
 </bookmark><comment>MW changed "reporting..." to "reports;"</comment>
-<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="1" l10n="U" oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
+<paragraph xml-lang="en-US" id="hd_id3150616" role="heading" level="1" l10n="U"
+                 oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs. If the program enters into an endless loop, so that it does not respond to mouse-clicks or keypresses, you can also start the Error Report Tool manually.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="3">Sun Microsystems is committed to respecting your online privacy and recognizes your need for appropriate protection and management of any personally identifiable information you share with us. See the statement at http://www.sun.com/privacy/ on your online data privacy at Sun Microsystems.</paragraph>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
-<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically. However, if the program seems to be stuck and the tool does not start automatically, you can start the tool manually:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="6">Go to the {office_install_path}<switchinline select="sys"><caseinline select="WIN">\ 
-</caseinline><defaultinline>/</defaultinline></switchinline>program folder and start the crashrep<switchinline select="sys"><caseinline select="WIN">.exe 
-</caseinline></switchinline> file.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
-<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
-<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
-<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
-<paragraph role="warning" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
-<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
-<paragraph role="heading" id="hd_id3150792" xml-lang="en-US" level="2" l10n="U" oldref="13">What Data is Sent?</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs.<comment>removed sentene about manually - i96770</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3159399" role="heading" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150504" role="paragraph" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149670" role="warning" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153526" role="paragraph" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="2" l10n="U"
+                 oldref="13">What Data is Sent?</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151177" role="paragraph" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 44fb30f082..e9d5e1909e 100755
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: export_ms.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,7 +66,7 @@
 <paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Standard file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
 </section>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index aae5cd1ff7..30c42f8c56 100755
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fax.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@ checked - yj</lastedited>
 <paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/filternavigator.xhp b/helpcontent2/source/text/shared/guide/filternavigator.xhp
index 716e6d5cd4..88dfc2e075 100644
--- a/helpcontent2/source/text/shared/guide/filternavigator.xhp
+++ b/helpcontent2/source/text/shared/guide/filternavigator.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filternavigator.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/find_attributes.xhp b/helpcontent2/source/text/shared/guide/find_attributes.xhp
index c825e9ade7..f48d268976 100644
--- a/helpcontent2/source/text/shared/guide/find_attributes.xhp
+++ b/helpcontent2/source/text/shared/guide/find_attributes.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: find_attributes.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index b01bc6ebdc..c119756122 100755
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flat_icons.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ checked -yj</lastedited>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="CHG" oldref="4">You can change the icon view between small and large icons.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - Options - $[officename]</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>View</emph> tab page, select the <emph>Toolbar icon size</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
index 2c4c253758..ced9492191 100644
--- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: floating_toolbar.xhp,v $
- * $Revision: 1.16.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index d7f5a07157..90247d93ce 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,97 +31,97 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
-<filename>/text/shared/guide/fontwork.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
+         <filename>/text/shared/guide/fontwork.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3696707"><bookmark_value>graphical text art</bookmark_value>
-<bookmark_value>designing; fonts</bookmark_value>
-<bookmark_value>TextArt, see Fontwork</bookmark_value>
-<bookmark_value>WordArt, see Fontwork</bookmark_value>
-<bookmark_value>Fontwork icons</bookmark_value>
-<bookmark_value>text effects</bookmark_value>
-<bookmark_value>effects; Fontwork icons</bookmark_value>
-<bookmark_value>text; Fontwork icons</bookmark_value>
-<bookmark_value>3D text creation</bookmark_value>
-<bookmark_value>rotating;3D text</bookmark_value>
-<bookmark_value>editing;Fontwork objects</bookmark_value>
-<bookmark_value>inserting;Fontwork objects</bookmark_value>
-</bookmark>
-  <comment>MW changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link> 
+      <bookmark_value>designing; fonts</bookmark_value>
+      <bookmark_value>TextArt, see Fontwork</bookmark_value>
+      <bookmark_value>WordArt, see Fontwork</bookmark_value>
+      <bookmark_value>Fontwork</bookmark_value>
+      <bookmark_value>text effects</bookmark_value>
+      <bookmark_value>effects; Fontwork icons</bookmark_value>
+      <bookmark_value>text; Fontwork icons</bookmark_value>
+      <bookmark_value>3D text creation</bookmark_value>
+      <bookmark_value>rotating;3D text</bookmark_value>
+      <bookmark_value>editing;Fontwork objects</bookmark_value>
+      <bookmark_value>inserting;Fontwork objects</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon. 
-<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id7040009">Fontwork icon</alt>
+      <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
+<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
 	</image></paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="NEW">Click the Fontwork object.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="NEW">Click the Fontwork object to select it.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
-   <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
-   
-  </section>
- </body>
-</helpdocument>
+         </listitem>
+         <listitem>
+
+	 <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+
+            <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
+         <embed href="text/shared/01/05280000.xhp#fntwrk"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp
index 9644516874..0dec8b59a3 100755
--- a/helpcontent2/source/text/shared/guide/formfields.xhp
+++ b/helpcontent2/source/text/shared/guide/formfields.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formfields.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,79 +31,66 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
-<filename>/text/shared/guide/formfields.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
+         <filename>/text/shared/guide/formfields.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>command buttons, see push buttons</bookmark_value>
-<bookmark_value>controls;adding to documents</bookmark_value>
-<bookmark_value>inserting;push buttons</bookmark_value>
-<bookmark_value>keys;adding push buttons</bookmark_value>
-<bookmark_value>buttons;adding push buttons</bookmark_value>
-<bookmark_value>press buttons, see push buttons</bookmark_value>
-<bookmark_value>push buttons;adding to documents</bookmark_value>
-</bookmark>
-  <comment>MW changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link> 
+      <bookmark_value>controls;adding to documents</bookmark_value>
+      <bookmark_value>inserting;push buttons</bookmark_value>
+      <bookmark_value>keys;adding push buttons</bookmark_value>
+      <bookmark_value>buttons;adding push buttons</bookmark_value>
+      <bookmark_value>press buttons, see push buttons</bookmark_value>
+      <bookmark_value>push buttons;adding to documents</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
-   </listitem>
-  </list>
-  <list type="ordered" startwith="2">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
-   </listitem>
-  </list>
-  <list type="ordered" startwith="3">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index b23cc2f0b9..42ffad6a96 100755
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallery_insert.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/groups.xhp b/helpcontent2/source/text/shared/guide/groups.xhp
index d40b58e664..1c403a5832 100644
--- a/helpcontent2/source/text/shared/guide/groups.xhp
+++ b/helpcontent2/source/text/shared/guide/groups.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groups.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index ec560220f6..9b30ae6c30 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperlink_edit.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
index 079c8d999e..086c1678c2 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperlink_insert.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index f10a2fcbb1..f94ada5bef 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperlink_rel_abs.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="46">When you include hyperlinks, two factors must be taken into account: whether they are set as relative or absolute on saving, and whether or not the file is present.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
+<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.sun.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
+<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.example.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="51">$[officename] also reacts differently, depending on whether the file referred to in the link exists, and where it is located. $[officename] checks every new link and sets a target and protocol automatically. The result can be seen in the generated HTML code after saving the source document.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
index 7d8f67dbdd..d97a2dc8b9 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperlink_search.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,7 +63,7 @@ checked - yj</lastedited>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar"><emph>Tools - Options - Internet - Search</emph></link> to define the search options.</paragraph>
+<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</link></emph> to define the search options.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4204c518e..b4a3f896e1 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemap.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,26 +31,21 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
-<filename>/text/shared/guide/imagemap.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
+         <filename>/text/shared/guide/imagemap.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>ImageMap; editor</bookmark_value>
-<bookmark_value>editors; ImageMap editor</bookmark_value>
-<bookmark_value>images; ImageMap</bookmark_value>
-<bookmark_value>pictures; ImageMap</bookmark_value>
-<bookmark_value>hotspots</bookmark_value>
-<bookmark_value>URL;in pictures</bookmark_value>
-</bookmark>
-  <comment>mw added 2 index entries</comment>
-  <paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link> 
+      <bookmark_value>editors; ImageMap editor</bookmark_value>
+      <bookmark_value>images; ImageMap</bookmark_value>
+      <bookmark_value>pictures; ImageMap</bookmark_value>
+      <bookmark_value>hotspots;adding to images</bookmark_value>
+      <bookmark_value>URL;in pictures</bookmark_value>
+</bookmark><comment>mw added 2 index entries</comment><comment>MW made "hotspots" a two level entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW">An ImageMap allows you to attach URLs to specific areas, called hotspots, on a picture in your document. An image map is a group of one or more hotspots.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW">You can draw three types of hotspots: rectangles, ellipses, and polygons. When you click a hotspot, the URL is opened in the browser window or frame that you specify. You can also specify the text that appears when your mouse rests on the hotspot.</paragraph>
@@ -71,7 +62,7 @@
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">Use the icons in the ImageMap Editor to draw a hotspot shape, for example a rectangle, over the image at the background.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+    <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_idN106AB" role="paragraph" l10n="NEW">Enter the "Address" URL that will be shown in a Web browser when the user clicks the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index ed09d43352..ae56c248b3 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: import_ms.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,31 +31,33 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Opening documents saved in other formats</title>
-<filename>/text/shared/guide/import_ms.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+      <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title>
+         <filename>/text/shared/guide/import_ms.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="chapter_all">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153988"><bookmark_value>Microsoft Office;opening Microsoft documents</bookmark_value>
-<bookmark_value>documents; importing</bookmark_value>
-<bookmark_value>importing; documents in other formats</bookmark_value>
-<bookmark_value>opening; documents from other formats</bookmark_value>
-<bookmark_value>loading; documents from other formats</bookmark_value>
-<bookmark_value>converting;Microsoft documents</bookmark_value>
-<bookmark_value>saving; default file formats</bookmark_value>
-<bookmark_value>defaults; file formats in file dialogs</bookmark_value>
-<bookmark_value>file formats; saving always in other formats</bookmark_value>
-<bookmark_value>Microsoft Office; as standard file format</bookmark_value>
-<bookmark_value>files;importing</bookmark_value>
-<bookmark_value>XML converters</bookmark_value>
-<bookmark_value>converters; XML</bookmark_value>
-<bookmark_value>Document Converter Wizard</bookmark_value>
-<bookmark_value>wizards; document converter</bookmark_value>
-</bookmark><comment>MW made file import a two level entry ("files;importing")</comment><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
+         <bookmark_value>documents; importing</bookmark_value>
+         <bookmark_value>importing; documents in other formats</bookmark_value>
+         <bookmark_value>opening; documents from other formats</bookmark_value>
+         <bookmark_value>loading; documents from other formats</bookmark_value>
+         <bookmark_value>converting;Microsoft documents</bookmark_value>
+         <bookmark_value>saving; default file formats</bookmark_value>
+         <bookmark_value>defaults;document formats in file dialogs</bookmark_value>
+         <bookmark_value>file formats; saving always in other formats</bookmark_value>
+         <bookmark_value>Microsoft Office; as default file format</bookmark_value>
+         <bookmark_value>files;importing</bookmark_value>
+         <bookmark_value>XML converters</bookmark_value>
+         <bookmark_value>converters; XML</bookmark_value>
+         <bookmark_value>Document Converter Wizard</bookmark_value>
+         <bookmark_value>wizards; document converter</bookmark_value>
+	 <bookmark_value>converters; document converter</bookmark_value>
+         <bookmark_value>files, see also documents</bookmark_value>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
 <list type="ordered">
@@ -73,7 +71,7 @@
 <paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Standard file format</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
 <paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
 <list type="unordered">
@@ -82,27 +80,29 @@
 </listitem>
 </list>
 <switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id4563127" xml-lang="en-US" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id9207434" xml-lang="en-US" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
-<paragraph role="listitem" id="par_id7215491" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id2299874" xml-lang="en-US" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<paragraph role="listitem" id="par_id1727347" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id9207434" role="listitem" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id7215491" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id2299874" role="listitem" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id1727347" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
+            </listitem>
+         </list>
 </case>
-</switch></section>
-<section id="relatedtopics">
-<embed href="text/shared/00/00000021.xhp#xmlformat"/>
-<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+</switch>
 </section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <embed href="text/shared/00/00000021.xhp#xmlformat"/>
+         <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
+         <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+         <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+         <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+         <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index c0f06f2f30..f40f0da77f 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_bitmap.xhp,v $
- * $Revision: 1.14.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,8 +76,7 @@
 <paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
 <paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
 <paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
-<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index 1a69bdf849..8a238e241b 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17.4.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,70 +32,71 @@
  
 	
 <meta>
-<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
-<title id="tit" xml-lang="en-US">Editing Graphic Objects </title>
-<filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Editing Graphic Objects </title>
+         <filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>resizing, see also scaling/zooming</bookmark_value>
-<bookmark_value>scaling, see also zooming</bookmark_value>
-<bookmark_value>drawings, see also draw objects</bookmark_value>
-<bookmark_value>graphic objects, see also draw objects</bookmark_value>
-<bookmark_value>text; drawing pictures</bookmark_value>
-<bookmark_value>inserting; drawings</bookmark_value>
-<bookmark_value>pictures; drawing</bookmark_value>
-<bookmark_value>objects; copying when moving in presentations</bookmark_value>
-<bookmark_value>draw objects; adding/editing/copying</bookmark_value>
-<bookmark_value>circle drawings</bookmark_value>
-<bookmark_value>square drawings</bookmark_value>
-<bookmark_value>handles; scaling</bookmark_value>
-<bookmark_value>scaling; objects</bookmark_value>
-<bookmark_value>objects;moving and resizing with mouse</bookmark_value>
-<bookmark_value>resizing;objects, by mouse</bookmark_value>
-<bookmark_value>copying; draw objects</bookmark_value>
-<bookmark_value>pasting;draw objects</bookmark_value>
-<bookmark_value>editing;draw objects</bookmark_value>
-<bookmark_value>pictures;scaling/resizing</bookmark_value>
+      <bookmark_value>scaling, see also zooming</bookmark_value>
+      <bookmark_value>drawings, see also draw objects</bookmark_value>
+      <bookmark_value>graphic objects, see draw objects</bookmark_value>
+      <bookmark_value>text; drawing pictures</bookmark_value>
+      <bookmark_value>inserting; drawings</bookmark_value>
+      <bookmark_value>pictures; drawing</bookmark_value>
+      <bookmark_value>objects; copying when moving in presentations</bookmark_value>
+      <bookmark_value>draw objects; adding/editing/copying</bookmark_value>
+      <bookmark_value>circle drawings</bookmark_value>
+      <bookmark_value>square drawings</bookmark_value>
+      <bookmark_value>handles; scaling</bookmark_value>
+      <bookmark_value>scaling; objects</bookmark_value>
+      <bookmark_value>objects;moving and resizing with mouse</bookmark_value>
+      <bookmark_value>resizing;objects, by mouse</bookmark_value>
+      <bookmark_value>copying; draw objects</bookmark_value>
+      <bookmark_value>pasting;draw objects</bookmark_value>
+      <bookmark_value>editing;draw objects</bookmark_value>
+      <bookmark_value>pictures;scaling/resizing</bookmark_value>
 </bookmark><comment>MW added "graphic objects, see also..."</comment>
-<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
+<paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon. 
+      <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon. 
 </caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon. 
 </caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key. 
 </caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id9448225" xml-lang="en-US" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id224616" xml-lang="en-US" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command 
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7199316" xml-lang="en-US" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
 </case>
@@ -124,5 +122,5 @@
 </case>
 </switch>
 </section>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index eed0aeebac..ad1e8063e0 100755..100644
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insert_specialchar.xhp,v $
- * $Revision: 1.12.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -64,13 +61,13 @@
 <paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find &amp; Replace</emph> dialog) you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard. 
+<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Sun Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers. 
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys. 
+<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h. 
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
 </caseinline></switchinline></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/integratinguno.xhp b/helpcontent2/source/text/shared/guide/integratinguno.xhp
index f4057127b1..426c22d62b 100755
--- a/helpcontent2/source/text/shared/guide/integratinguno.xhp
+++ b/helpcontent2/source/text/shared/guide/integratinguno.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: integratinguno.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index df46aff9da..a578bc236b 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.15.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,370 +31,415 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Shortcuts (%PRODUCTNAME Accessibility)</title>
-<filename>/text/shared/guide/keyboard.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Shortcuts (%PRODUCTNAME Accessibility)</title>
+         <filename>/text/shared/guide/keyboard.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158421"><bookmark_value>accessibility;general shortcuts</bookmark_value>
-<bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
+      <bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3158421" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
+<paragraph xml-lang="en-US" id="hd_id3158421" role="heading" level="1" l10n="U"
+                 oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
-<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="2" l10n="U" oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
-<paragraph role="heading" id="hd_id3154749" xml-lang="en-US" level="3" l10n="U" oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
-<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="37">menu bar,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="35">every free window from left to right,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="34">document</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>. 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
-<paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="21">Calling a menu command</paragraph>
-<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
-<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
-<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="17">Executing an icon command</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
-<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
-<paragraph role="heading" id="hd_id3150440" xml-lang="en-US" level="3" l10n="U" oldref="14">Special hints for toolbars</paragraph>
-<paragraph role="paragraph" id="par_id3149983" xml-lang="en-US" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="3" l10n="U" oldref="11">Selection from a combo box</paragraph>
-<table id="tbl_id3147427">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="E">
-<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.7602inch" height="0.4898inch" localize="true"><alt id="alt_id3148645" xml-lang="en-US">Combo box</alt>
+      <paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145382" role="paragraph" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
+      <embed href="text/shared/00/00000099.xhp#keys"/>
+      <paragraph xml-lang="en-US" id="hd_id3166460" role="heading" level="2" l10n="U"
+                 oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154749" role="heading" level="3" l10n="U"
+                 oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156329" role="paragraph" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150669" role="listitem" l10n="U" oldref="37">menu bar,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149234" role="listitem" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="35">every free window from left to right,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="34">document</paragraph>
+         </listitem>
+      </list><comment>removed para about Ctrl+Tab</comment>
+<paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 to switch through objects in the opposite direction.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3161656" role="heading" level="3" l10n="U"
+                 oldref="21">Calling a menu command</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151056" role="paragraph" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153381" role="paragraph" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147086" role="heading" level="3" l10n="U"
+                 oldref="17">Executing an icon command</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144433" role="paragraph" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150449" role="listitem" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150440" role="heading" level="3" l10n="U"
+                 oldref="14">Special hints for toolbars</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149983" role="paragraph" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="3" l10n="U"
+                 oldref="11">Selection from a combo box</paragraph>
+      <table id="tbl_id3147427">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146986" role="paragraph" l10n="E">
+<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.15in" height="0.3165in" localize="true"><alt xml-lang="en-US" id="alt_id3148645">Combo box</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
-<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="3" l10n="U" oldref="41">Selection in Tables</paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="45">Shift+Spacebar: selection of the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
-<paragraph role="listitem" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155083" xml-lang="en-US" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147497" xml-lang="en-US" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154479" xml-lang="en-US" level="3" l10n="U" oldref="148">Selecting objects</paragraph>
-<paragraph role="paragraph" id="par_id3148993" xml-lang="en-US" l10n="CHG" oldref="149">Press <item type="keycode">Shift+F4</item> to select the first object in the current document. When an object is selected, press <item type="keycode">Tab</item> to select the next object, or press <item type="keycode">Esc</item> to go back to the text.</paragraph>
-<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="3" l10n="U" oldref="54">Edit Objects</paragraph>
-<paragraph role="paragraph" id="par_id3156379" xml-lang="en-US" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
-<paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="3" l10n="U" oldref="55">Edit Position and Size of Objects</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
-<paragraph role="listitem" id="par_id3145619" xml-lang="en-US" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="61">Edit the Anchors of Objects</paragraph>
-<paragraph role="paragraph" id="par_id3148534" xml-lang="en-US" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="63">Select the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly. 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149666" role="paragraph" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155366" role="paragraph" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id3150685" role="heading" level="3" l10n="U"
+                 oldref="41">Selection in Tables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154014" role="listitem" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147396" role="listitem" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149488" role="listitem" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar: switches between selection of the current column and cancellation of this selection.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145251" role="listitem" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150592" role="heading" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153221" role="listitem" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3148456" role="listitem" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149400" role="listitem" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155083" role="listitem" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147497" role="listitem" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3146988" role="heading" level="3" l10n="U"
+                 oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147176" role="listitem" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153707" role="listitem" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154479" role="heading" level="3" l10n="U"
+                 oldref="148">Selecting objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press Shift+F4 to select the first object in the current document. When an object is selected, press Tab to select the next object, or press Esc to go back to the text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152962" role="heading" level="3" l10n="U"
+                 oldref="54">Edit Objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="3" l10n="U"
+                 oldref="55">Edit Position and Size of Objects</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148405" role="listitem" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147345" role="listitem" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3147361" role="heading" level="3" l10n="U"
+                 oldref="61">Edit the Anchors of Objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148534" role="paragraph" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3163808" role="listitem" l10n="U" oldref="63">Select the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150646" role="listitem" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150940" role="listitem" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
 </caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148393" xml-lang="en-US" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="133">Controlling the Dividing Lines</paragraph>
-<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163668" xml-lang="en-US" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148426" xml-lang="en-US" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150383" xml-lang="en-US" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150369" xml-lang="en-US" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
-</listitem>
-</list>
-<section id="datenquellentext">
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="112">Controlling the Data Source View</paragraph>
-<paragraph role="paragraph" id="par_id3150515" xml-lang="en-US" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
-<paragraph role="paragraph" id="par_id3159109" xml-lang="en-US" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
-<paragraph role="paragraph" id="par_id3153229" xml-lang="en-US" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3150312" xml-lang="en-US" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
-<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="118">Shortcuts in the Query Design Window</paragraph>
-<paragraph role="paragraph" id="par_id3152455" xml-lang="en-US" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
-<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
-<paragraph role="heading" id="hd_id3156288" xml-lang="en-US" level="3" l10n="U" oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
-<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3154529" xml-lang="en-US" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
-<paragraph role="paragraph" id="par_id3159624" xml-lang="en-US" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
-<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
-<paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="U" oldref="129">Shift+Space key: selects the column in the selection area, so you can open its context menu.</paragraph>
-<paragraph role="paragraph" id="par_id3156198" xml-lang="en-US" l10n="U" oldref="130">Space key: selects the row. Cancels previous selection.</paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
-<paragraph role="heading" id="hd_id3146152" xml-lang="en-US" level="3" l10n="U" oldref="131">Keys in the Table Design Window</paragraph>
-<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
-</section>
-<section id="imagemaptext">
-<paragraph role="heading" id="hd_id3145075" xml-lang="en-US" level="2" l10n="U" oldref="74">Controlling the ImageMap Editor</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147073" xml-lang="en-US" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153285" xml-lang="en-US" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
-</listitem>
-</list>
-</section>
-<paragraph role="heading" id="hd_id3145377" xml-lang="en-US" level="2" l10n="U" oldref="46">Controlling the Help</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
-<paragraph role="heading" id="hd_id3154960" xml-lang="en-US" level="3" l10n="U" oldref="48">Navigating the main help pages</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151300" xml-lang="en-US" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154912" xml-lang="en-US" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150894" xml-lang="en-US" level="2" l10n="U" oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
-<paragraph role="heading" id="hd_id3153975" xml-lang="en-US" level="3" l10n="U" oldref="82">Ruler</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151000" xml-lang="en-US" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159203" xml-lang="en-US" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154538" xml-lang="en-US" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155382" xml-lang="en-US" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155894" xml-lang="en-US" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154765" xml-lang="en-US" l10n="U" oldref="91">Delete key: delete a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154650" xml-lang="en-US" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145368" xml-lang="en-US" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155914" xml-lang="en-US" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147492" xml-lang="en-US" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145216" xml-lang="en-US" level="3" l10n="U" oldref="96">Preview</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155148" xml-lang="en-US" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150780" xml-lang="en-US" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153559" xml-lang="en-US" l10n="U" oldref="102">Space key: select the current column and deselect all of the other columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153804" xml-lang="en-US" l10n="U" oldref="103">Ctrl+Space key: select or deselect the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154171" xml-lang="en-US" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156368" xml-lang="en-US" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151192" xml-lang="en-US" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150416" xml-lang="en-US" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146103" xml-lang="en-US" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153298" xml-lang="en-US" level="2" l10n="U" oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153073" xml-lang="en-US" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/04/01010000.xhp#common_keys"/>
-<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153919" role="listitem" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148393" role="listitem" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145615" role="listitem" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145135" role="listitem" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145256" role="listitem" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149527" role="listitem" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+                 oldref="133">Controlling the Dividing Lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3158413" role="paragraph" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149814" role="listitem" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3158444" role="listitem" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3163668" role="listitem" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148426" role="listitem" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151277" role="listitem" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150383" role="listitem" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150369" role="listitem" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
+         </listitem>
+      </list>
+      <section id="datenquellentext">
+         <paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U"
+                    oldref="112">Controlling the Data Source View</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150515" role="paragraph" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159109" role="paragraph" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153229" role="paragraph" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150312" role="paragraph" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147171" role="heading" level="3" l10n="U"
+                    oldref="118">Shortcuts in the Query Design Window</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152455" role="paragraph" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151180" role="paragraph" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3156288" role="heading" level="3" l10n="U"
+                    oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145384" role="paragraph" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154529" role="paragraph" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3153816" role="heading" level="3" l10n="U"
+                    oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152896" role="paragraph" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3146152" role="heading" level="3" l10n="U"
+                    oldref="131">Keys in the Table Design Window</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151243" role="paragraph" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
+      </section>
+      <section id="imagemaptext">
+         <paragraph xml-lang="en-US" id="hd_id3145075" role="heading" level="2" l10n="U"
+                    oldref="74">Controlling the ImageMap Editor</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3159096" role="listitem" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3156016" role="listitem" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3149587" role="listitem" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3154343" role="listitem" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3147073" role="listitem" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153285" role="listitem" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3145377" role="heading" level="2" l10n="U"
+                 oldref="46">Controlling the Help</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149441" role="paragraph" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154960" role="heading" level="3" l10n="U"
+                 oldref="48">Navigating the main help pages</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151300" role="listitem" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155537" role="listitem" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154912" role="listitem" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150894" role="heading" level="2" l10n="U"
+                 oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153975" role="heading" level="3" l10n="U"
+                 oldref="82">Ruler</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152869" role="listitem" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151000" role="listitem" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159203" role="listitem" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154538" role="listitem" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155382" role="listitem" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155894" role="listitem" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145195" role="listitem" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154647" role="listitem" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154765" role="listitem" l10n="U" oldref="91">Delete key: delete a split</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154650" role="listitem" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145368" role="listitem" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155914" role="listitem" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147492" role="listitem" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145216" role="heading" level="3" l10n="U"
+                 oldref="96">Preview</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150780" role="listitem" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153811" role="listitem" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146962" role="listitem" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147512" role="listitem" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154733" role="listitem" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154171" role="listitem" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156368" role="listitem" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151192" role="listitem" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150416" role="listitem" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166442" role="listitem" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146103" role="listitem" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145116" role="listitem" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2" l10n="U"
+                 oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153073" role="listitem" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153295" role="listitem" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153958" role="listitem" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/04/01010000.xhp#common_keys"/>
+      <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/labels.xhp b/helpcontent2/source/text/shared/guide/labels.xhp
index dd355b6918..3e343e0c0f 100755
--- a/helpcontent2/source/text/shared/guide/labels.xhp
+++ b/helpcontent2/source/text/shared/guide/labels.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: labels.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/labels_database.xhp b/helpcontent2/source/text/shared/guide/labels_database.xhp
index ea304c8e66..8f7f9f7e52 100644
--- a/helpcontent2/source/text/shared/guide/labels_database.xhp
+++ b/helpcontent2/source/text/shared/guide/labels_database.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: labels_database.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,67 +29,53 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Address Labels</title>
-<filename>/text/shared/guide/labels_database.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing Address Labels</title>
+         <filename>/text/shared/guide/labels_database.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147399"><bookmark_value>address labels from databases</bookmark_value>
-<bookmark_value>labels; from databases</bookmark_value>
-<bookmark_value>stickers</bookmark_value>
-<bookmark_value>databases;creating labels</bookmark_value>
-</bookmark><comment>mw deleted "creating;"</comment><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
+      <bookmark_value>labels; from databases</bookmark_value>
+      <bookmark_value>stickers</bookmark_value>
+      <bookmark_value>databases;creating labels</bookmark_value>
+</bookmark><comment>mw deleted "creating;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147399" role="heading" level="1" l10n="U"
+                 oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="CHG" oldref="37">Select the format of the label sheets you want to print on. Remember to mark <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10687" xml-lang="en-US" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="38">When you see the label document, open the data source view by choosing <emph>View - Data Sources</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="58">In the data source view, select your address data source table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="39">Drag the data fields needed for the Address individually into the top left label. For example, click on the column header NAME and, keeping the mouse button depressed, drag it into the label. This inserts a field. Put the fields in order to complete the address in the first label at top left.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="40">Place the cursor at the last text position (after the last field) in the first label.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Insert - Fields - Other</emph>, and go to the <emph>Database</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="42">Select the type <emph>Next record</emph>, click on <emph>Insert</emph> and then on <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="43">You can now synchronize the labels. Click on the <emph>Synchronize</emph>
-<emph>Labels</emph> button in the small window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="44">In the data source view, select the records for which you would like address stickers, by clicking on the row headers to the left. Use the <item type="keycode">Shift</item> or <item type="keycode">Ctrl</item> key in the usual way to select several records at the same time.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3146972" xml-lang="en-US" l10n="CHG" oldref="45">On the Table Data bar, click the <emph>Data to Fields</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148484" xml-lang="en-US" l10n="CHG" oldref="25">You can then save and/or print the label document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8476821" xml-lang="en-US" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/labels.xhp#labels"/>
-</section>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="37">On the <emph>Labels</emph> tab page, select the format of the label sheets you want to print on. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0130200903370863" role="paragraph" l10n="NEW">Choose the database and table from which to get the data.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id013020090337089" role="paragraph" l10n="NEW">Select a database field of which you want to print the contents. Click the button that shows a left arrow to insert the database field into the Label Text box.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id0130200903370930" role="paragraph" l10n="NEW">Continue to select and insert database fields if you want more fields on every label. You can press Enter to insert a new line, and you can type any character to insert fixed text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0130200903370924" role="paragraph" l10n="NEW">Optionally, if you want to type more text, apply formatting, or insert images and line art, you should enable <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. If you enable this, once you leave the Labels dialog box a small window opens with a Synchronize button. Now you only need to work on the first label on the labels document, then click the Synchronize button to copy your work to every label of the document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10687" role="paragraph" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148685" role="paragraph" l10n="CHG" oldref="38">When you see the label document, you might want to temporarily enable <item type="menuitem">View - Field Names</item>. This displays the fields in a more visible manner, so that you can arrange and edit label contents more easily.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148484" role="paragraph" l10n="CHG" oldref="25">You can save and/or print the label document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8476821" role="paragraph" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog. In the Mail Merge dialog, you can select the records for which you want to print labels.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/labels.xhp#labels"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 67297ff33f..bdccb0a0cc 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: language_select.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,163 +29,154 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting the Document Language</title>
-<filename>/text/shared/guide/language_select.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Selecting the Document Language</title>
+         <filename>/text/shared/guide/language_select.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>languages; selecting for text</bookmark_value>
-<bookmark_value>documents; languages</bookmark_value>
-<bookmark_value>characters; language selection</bookmark_value>
-<bookmark_value>character styles;language selection</bookmark_value>
-<bookmark_value>text; language selection</bookmark_value>
-<bookmark_value>paragraph styles; languages</bookmark_value>
-<bookmark_value>drawings; languages</bookmark_value>
-<bookmark_value>defaults;languages</bookmark_value>
-<bookmark_value>spellcheck; default languages</bookmark_value>
-<bookmark_value>dictionaries, see also languages</bookmark_value>
-</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment><paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
+      <bookmark_value>documents; languages</bookmark_value>
+      <bookmark_value>characters; language selection</bookmark_value>
+      <bookmark_value>character styles;language selection</bookmark_value>
+      <bookmark_value>text; language selection</bookmark_value>
+      <bookmark_value>paragraph styles; languages</bookmark_value>
+      <bookmark_value>drawings; languages</bookmark_value>
+      <bookmark_value>defaults;languages</bookmark_value>
+      <bookmark_value>spellcheck; default languages</bookmark_value>
+      <bookmark_value>dictionaries, see also languages</bookmark_value>
+</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153093" xml-lang="en-US" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152938" xml-lang="en-US" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="15">Applying a language directly to selected text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
-<paragraph role="heading" id="hd_id3154272" xml-lang="en-US" level="2" l10n="U" oldref="21">Selecting a language for a Character Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145649" xml-lang="en-US" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150753" xml-lang="en-US" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150321" xml-lang="en-US" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
-</listitem>
-</list><comment>UFI: see i76182</comment><paragraph role="heading" id="hd_id8703268" xml-lang="en-US" level="2" l10n="NEW">Adding More Text Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7919248" xml-lang="en-US" l10n="CHG">In OpenOffice.org software, you can choose <item type="menuitem">File - Wizards - Install new dictionaries</item> to open a Writer document which helps you to install more languages.<comment>this document is only available with OOo, not SO</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5174108" xml-lang="en-US" l10n="NEW">The document contains pages in many different languages. Click your own language on the first page to see the following instructions in your own language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2897427" xml-lang="en-US" l10n="NEW">Click the big button in the middle of the document page. This starts a macro to display more info and download the dictionary files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3906979" xml-lang="en-US" l10n="NEW">Select to install the new files for the current user only or for all users (which requires write permission to the shared folder).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3998535" xml-lang="en-US" l10n="NEW">Click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6273995" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> button. After some short delay, you see a list of available Spelling dictionaries.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4401684" xml-lang="en-US" l10n="NEW">Select the languages for Spelling and click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7082430" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> and select languages for Hyphenation and for Thesaurus.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7718741" xml-lang="en-US" l10n="CHG">The macro downloads the files to the appropriate folder. After you click Finish, you must close OpenOffice.org software (including the Quickstarter), and restart.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9100924" xml-lang="en-US" level="2" l10n="NEW">Setting UI Language</paragraph>
-<paragraph role="paragraph" id="par_id2761314" xml-lang="en-US" l10n="NEW">A standard installation of OpenOffice.org software will give you a user interface (UI) of your chosen language.</paragraph>
-<paragraph role="paragraph" id="par_id3912778" xml-lang="en-US" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3163853" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id121158" xml-lang="en-US" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3806878" xml-lang="en-US" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id130619" xml-lang="en-US" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9999694" xml-lang="en-US" level="2" l10n="NEW">Adding More UI Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">Open your Web browser and enter <link href="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/">http://oootranslation.services.openoffice.org/pub/OpenOffice.org/</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US" l10n="CHG">Select and download the correct language pack for your version of OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9852900" xml-lang="en-US" l10n="CHG">Close OpenOffice.org software (also close the Quickstarter, if you enabled it).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3791924" xml-lang="en-US" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150043" xml-lang="en-US" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3152483" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153093" role="listitem" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152578" role="listitem" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152886" role="listitem" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3152938" role="heading" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150872" role="listitem" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145367" role="listitem" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166413" role="listitem" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156283" role="listitem" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154942" role="listitem" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145801" role="heading" level="2" l10n="U"
+                 oldref="15">Applying a language directly to selected text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148455" role="listitem" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159348" role="listitem" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155600" role="listitem" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154164" role="paragraph" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154272" role="heading" level="2" l10n="U"
+                 oldref="21">Selecting a language for a Character Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145649" role="listitem" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146792" role="listitem" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150753" role="listitem" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150321" role="listitem" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154756" role="listitem" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155766" role="listitem" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
+         </listitem>
+      </list><comment>UFI: see i76182</comment>
+<paragraph xml-lang="en-US" id="hd_id8703268" role="heading" level="2" l10n="NEW">Adding More Text Languages</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7919248" role="paragraph" l10n="CHG">Dictionaries are supplied and installed as extensions. Choose <item type="menuitem">Tools - Language - More Dictionaries Online</item> to open the dictionaries page in your default web browser.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5174108" role="paragraph" l10n="NEW">Select a dictionary in the list of descriptions. Click the heading in a dictionary description that you want to get.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2897427" role="paragraph" l10n="NEW">In the next page, click the Get It icon to download the dictionary extension. Note the folder name to which your browser downloads the file. Download additional dictionaries as you like.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3906979" role="paragraph" l10n="NEW">In %PRODUCTNAME, choose <item type="menuitem">Tools - Extension Manager</item> and click Add to install the downloaded extensions.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0220200911174493" role="paragraph" l10n="NEW">After you installed the extensions, you should close %PRODUCTNAME (including the Quickstarter), and restart.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id9100924" role="heading" level="2" l10n="NEW">Setting UI Language</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2761314" role="paragraph" l10n="NEW">A standard installation of %PRODUCTNAME software will give you a user interface (UI) of your chosen language.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 001bd5d320..b8077e2d27 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,10 +54,10 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -83,7 +80,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index e0ead9a6f2..9f700c0f6d 100755
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index d952faeb16..f1b9ab30ee 100755
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyles.xhp b/helpcontent2/source/text/shared/guide/linestyles.xhp
index e3e8eb2c6d..5077669185 100644
--- a/helpcontent2/source/text/shared/guide/linestyles.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyles.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linestyles.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/macro_recording.xhp b/helpcontent2/source/text/shared/guide/macro_recording.xhp
index c5485e5adf..433c1b06ed 100755
--- a/helpcontent2/source/text/shared/guide/macro_recording.xhp
+++ b/helpcontent2/source/text/shared/guide/macro_recording.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macro_recording.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/main.xhp b/helpcontent2/source/text/shared/guide/main.xhp
index 6a803b8cf6..63189316da 100755
--- a/helpcontent2/source/text/shared/guide/main.xhp
+++ b/helpcontent2/source/text/shared/guide/main.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 3bfdd7593b..d7c15f231a 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -178,4 +174,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index e0abf3e302..3c120e58e1 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: measurement_units.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
 <paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
@@ -74,6 +71,6 @@
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="8"><link href="text/shared/00/00000003.xhp" name="Entering measurement units directly">Entering measurement units directly</link></paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General">Tools - Options - %PRODUCTNAME Writer - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - General">%PRODUCTNAME Writer - General</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 0c4b9f7ee5..8e96a8fc24 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: microsoft_terms.xhp,v $
- * $Revision: 1.10.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,14 +78,6 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/01/04050000.xhp" name="Notes">Notes</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
 <paragraph role="tablecontent" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="10">Compare and Merge Documents</paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
index ee361a7516..83a504f41d 100644
--- a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
+++ b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mobiledevicefilters.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index f80cce2b39..8bd6fd0ce7 100755
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ms_doctypes.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index f230251017..3953867cb0 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,24 +29,22 @@
  *
  ************************************************************************
  -->
- 
-	
+
 <meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
-<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
-<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+         <title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+         <filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
-<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
-<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
+      <bookmark_value>import restrictions for Microsoft Office</bookmark_value>
+      <bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
 </bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
 <paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
-</variable></paragraph>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
 <paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
 <list type="ordered">
@@ -193,12 +188,11 @@
 </tablecell>
 </tablerow>
 </table>
-
-<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
+<paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Starting from OpenOffice.org 3.2 or StarOffice 9.2, Microsoft Office files that are encrypted by AES128 can be opened. Other encryption methods are not supported.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+         <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+         <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 5525bec140..4be6b989a0 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ms_user.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -103,10 +100,10 @@
 <paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Standard file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
+<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph>
@@ -125,14 +122,14 @@
 </list>
 <paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
 <paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
 <paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link></emph> to set the VBA macro handling of $[officename].</paragraph>
 </listitem>
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
@@ -141,8 +138,7 @@
 <embed href="text/shared/guide/import_ms.xhp#import_ms"/>
 <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
 <switch select="sys">
-<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-</case>
+<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/></case>
 </switch>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp
index f5845582ea..252bc73afd 100755
--- a/helpcontent2/source/text/shared/guide/navigator.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigator.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or notes.</paragraph>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
 <paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="CHG" oldref="7">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
index 7279578f79..21480ff301 100644
--- a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigator_setcursor.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/navpane_on.xhp b/helpcontent2/source/text/shared/guide/navpane_on.xhp
index e32be5521b..48aa7503bc 100644
--- a/helpcontent2/source/text/shared/guide/navpane_on.xhp
+++ b/helpcontent2/source/text/shared/guide/navpane_on.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navpane_on.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/numbering_stop.xhp b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
index 05d81143f9..28d5719ec6 100644
--- a/helpcontent2/source/text/shared/guide/numbering_stop.xhp
+++ b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numbering_stop.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,84 +29,86 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning off Bullets and Numbering for Individual Paragraphs</title>
-<filename>/text/shared/guide/numbering_stop.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:14:55">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Turning off Bullets and Numbering for Individual Paragraphs</title>
+         <filename>/text/shared/guide/numbering_stop.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154186"><bookmark_value>numbering; turning off</bookmark_value>
-<bookmark_value>bullets; turning off</bookmark_value>
-<bookmark_value>removing, see also deleting</bookmark_value>
-<bookmark_value>removing;bullets and numbering</bookmark_value>
-<bookmark_value>keyboard;removing numbering</bookmark_value>
+      <bookmark_value>bullets; turning off</bookmark_value>
+      <bookmark_value>removing, see also deleting</bookmark_value>
+      <bookmark_value>removing;bullets and numbering</bookmark_value>
+      <bookmark_value>keyboard;removing numbering</bookmark_value>
 </bookmark><comment>MW added "removing, see also deleting"</comment>
-<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
+<paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="1" l10n="U"
+                 oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
 </variable></paragraph>
 <switch select="appl">
+<case select="CALC"><comment>no bullets for Calc</comment>
+<paragraph xml-lang="en-US" id="par_id0202200910470118" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+</case>
+<case select="MATH"><comment>no bullets for Math</comment><comment>don't care for Math by now. Issue 98726</comment>
+</case>
 <case select="WRITER">
 <table id="tbl_id3155338">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="E">
-<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153527" xml-lang="en-US">Icon</alt>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
 	</image></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
+               <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="E">
+<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147618" role="paragraph" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 </case>
-<default>
+<default><comment>Impress, Draw</comment>
 <table id="tbl_id3159157">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3158432" xml-lang="en-US">Icon</alt>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="E">
+<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144511" role="paragraph" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 </default>
 </switch>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard: 
+<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard: 
 </caseinline></switchinline></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key. 
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key. 
 </caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph. 
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph. 
 </caseinline></switchinline></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops. 
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops. 
 </caseinline></switchinline></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
+         <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+         <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+         <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+         <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+         <embed href="text/swriter/guide/captions.xhp#captions"/>
+         <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pageformat_max.xhp b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
index 7e1a5c3b71..bca3d7b1d9 100755
--- a/helpcontent2/source/text/shared/guide/pageformat_max.xhp
+++ b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageformat_max.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index bbd77b9aba..7acfd8101a 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,127 +29,129 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include">
-<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
-<filename>/text/shared/guide/paintbrush.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="paintbrush">
+      <topic id="textsharedguidepaintbrushxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
+         <filename>/text/shared/guide/paintbrush.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="paintbrush">
 <bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
-<bookmark_value>formatting;copying</bookmark_value>
-<bookmark_value>copying;formatting</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
+         <bookmark_value>formatting;copying</bookmark_value>
+         <bookmark_value>copying;formatting</bookmark_value>
+         <bookmark_value>Paintbrush</bookmark_value>
+</bookmark><comment>MW added "Paintbrush"</comment>
+<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
 </variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
-<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon 
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">You can use the Format Paintbrush tool to copy formatting from a text selection or from an object and apply the formatting to another text selection or object.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id101920091122570" role="note" l10n="NEW">In Calc, the Format Paintbrush only applies to cell formatting.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106DD" role="paragraph" l10n="NEW">Select the text or object whose formatting you want to copy.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="2">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
 	</image>. After you apply all the formatting, click the icon again.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
-<table id="tbl_id599688">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
+      <table id="tbl_id599688">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10691" role="tablehead" l10n="NEW">Type of Selection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10697" role="tablehead" l10n="NEW">Comment</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1069E" role="tablecontent" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106A4" role="tablecontent" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106AB" role="tablecontent" l10n="NEW">Text is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106B1" role="tablecontent" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106C5" role="tablecontent" l10n="NEW">Object is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106CB" role="tablecontent" l10n="NEW">Copies the object formatting that is defined in the <item type="menuitem">Format - Graphics</item> or <item type="menuitem">Format - Drawing Object</item> dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106D2" role="tablecontent" l10n="NEW">Form control is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106D8" role="tablecontent" l10n="NEW">Not supported</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Drawing object is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106EC" role="tablecontent" l10n="CHG">Text within Calc cells is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106F2" role="tablecontent" l10n="NEW">Not supported</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106F9" role="tablecontent" l10n="NEW">Writer table or cells are selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN106FF" role="tablecontent" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the <item type="menuitem">Format - Table</item> dialog. The paragraph and character formatting are also copied.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10706" role="tablecontent" l10n="NEW">Calc table or cells are selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1070C" role="tablecontent" l10n="NEW">Copies the formatting that is specified in the <item type="menuitem">Format - Cells</item> dialog as well as the formatting of the cell contents</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp
index e1da77a404..10f7c8df53 100755
--- a/helpcontent2/source/text/shared/guide/pasting.xhp
+++ b/helpcontent2/source/text/shared/guide/pasting.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pasting.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index 6a430cb51f..dc3b8e2eab 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_blackwhite.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,110 +27,88 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing in Black and White</title>
-<filename>/text/shared/guide/print_blackwhite.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-08T12:15:36">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing in Black and White</title>
+         <filename>/text/shared/guide/print_blackwhite.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150125"><bookmark_value>printing; black and white</bookmark_value>
-<bookmark_value>black and white printing</bookmark_value>
-<bookmark_value>colors; not printing</bookmark_value>
-<bookmark_value>text; printing in black</bookmark_value>
+      <bookmark_value>black and white printing</bookmark_value>
+      <bookmark_value>colors; not printing</bookmark_value>
+      <bookmark_value>text; printing in black</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150125" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
+<paragraph xml-lang="en-US" id="hd_id3150125" role="heading" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="2" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>Print</emph> dialog opens.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>OK</emph> in the <emph>Print</emph> dialog.</paragraph>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Impress </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Draw</emph>, as appropriate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154307" xml-lang="en-US" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - Options</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="15">
-<emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-<paragraph role="listitem" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="16">
-<emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="2" l10n="U" oldref="17">Printing only text in black and white</paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="19">Printing all text documents with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer/Web</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="24">Printing the current text document with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>File - Print</emph>. This opens the <emph>Print</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="26">Click the <emph>Options</emph> button. This opens the <emph>Printer Options</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Under <emph>Contents</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3155308" xml-lang="en-US" l10n="U" oldref="28">The text document or HTML document now being printed will be printed in black text.</paragraph>
-</listitem>
+      <paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149346" role="listitem" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>General</emph> tab page of the dialog opens.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155892" role="listitem" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145313" role="listitem" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153345" role="listitem" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>Print</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="1" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="CHG" oldref="10">Choose Tools - Options - %PRODUCTNAME Impress or Tools - Options - %PRODUCTNAME Draw, as appropriate.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150275" role="listitem" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147573" role="listitem" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154307" role="listitem" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - %PRODUCTNAME Draw/Impress</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149786" role="listitem" l10n="U" oldref="15">
+               <emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3145610" role="listitem" l10n="U" oldref="16">
+               <emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153896" role="heading" level="1" l10n="U"
+                 oldref="17">Printing only text in black and white</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="1" l10n="U"
+                 oldref="19">Printing all text documents with black and white text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150541" role="listitem" l10n="U" oldref="20">Choose Tools - Options - %PRODUCTNAME Writer or Tools - Options - %PRODUCTNAME Writer/Web.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147084" role="listitem" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3144762" role="listitem" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3148920" role="heading" level="1" l10n="U"
+                 oldref="24">Printing the current text document with black and white text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152933" role="listitem" l10n="U" oldref="25">Choose <emph>File - Print</emph>. Then click the <emph>%PRODUCTNAME Writer</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149667" role="listitem" l10n="U" oldref="27">Choose <emph>Print text in black</emph> and click <emph>Print</emph>.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
 </list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
-</body>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3153726" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154146" role="paragraph" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 6ae84df1a2..7701f5976c 100755
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_faster.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
 <paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">You can decide to reduce the data necessary to print your document. The settings can be defined differently for printing directly to the printer or for printing to a file.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - $[officename] - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click one of the following settings options: </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index b42a207520..d211c9ca54 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,121 +29,124 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedguideprotectionxml" indexer="include">
-<title id="tit" xml-lang="en-US">Protecting Content in %PRODUCTNAME</title>
-<filename>/text/shared/guide/protection.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguideprotectionxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+         <filename>/text/shared/guide/protection.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
-<bookmark_value>protected contents</bookmark_value>
-<bookmark_value>contents protection</bookmark_value>
-<bookmark_value>encryption of contents</bookmark_value>
-<bookmark_value>passwords for protecting contents</bookmark_value>
-<bookmark_value>security;protecting contents</bookmark_value>
-<bookmark_value>form controls; protecting</bookmark_value>
-<bookmark_value>draw objects;protecting</bookmark_value>
-<bookmark_value>OLE objects;protecting</bookmark_value>
-<bookmark_value>graphics;protecting</bookmark_value>
-<bookmark_value>frames;protecting</bookmark_value>
+      <bookmark_value>protected contents</bookmark_value>
+      <bookmark_value>contents protection</bookmark_value>
+      <bookmark_value>encryption of contents</bookmark_value>
+      <bookmark_value>passwords for protecting contents</bookmark_value>
+      <bookmark_value>security;protecting contents</bookmark_value>
+      <bookmark_value>form controls; protecting</bookmark_value>
+      <bookmark_value>draw objects;protecting</bookmark_value>
+      <bookmark_value>OLE objects;protecting</bookmark_value>
+      <bookmark_value>graphics;protecting</bookmark_value>
+      <bookmark_value>frames;protecting</bookmark_value>
 </bookmark><comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
-<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
-<table id="tbl_id3145071">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+      <table id="tbl_id3145071">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="6">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145121" role="paragraph" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="warning" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
-<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
-<paragraph role="paragraph" id="par_id3161646" xml-lang="en-US" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
-<table id="tbl_id3148797">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="12">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="14">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155113" xml-lang="en-US" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
-<paragraph role="paragraph" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
-<table id="tbl_id3158447">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147131" xml-lang="en-US" l10n="U" oldref="54">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150088" xml-lang="en-US" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="56">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153657" xml-lang="en-US" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3145068" role="warning" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U"
+                 oldref="10">Protecting Revision Marking</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
+      <table id="tbl_id3148797">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+<comment>MW moved contents of "Protecting Cell Ranges in Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U"
+                 oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
+      <table id="tbl_id3158447">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147131" role="paragraph" l10n="U" oldref="54">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150088" role="paragraph" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147510" role="paragraph" l10n="U" oldref="56">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153657" role="paragraph" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3152992" xml-lang="en-US" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
-<paragraph role="paragraph" id="par_id3166429" xml-lang="en-US" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
-<table id="tbl_id3151062">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153226" xml-lang="en-US" l10n="U" oldref="60">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148815" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156289" xml-lang="en-US" l10n="U" oldref="62">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="63">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="hd_id3152992" role="heading" level="2" l10n="U"
+                 oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
+      <table id="tbl_id3151062">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153226" role="paragraph" l10n="U" oldref="60">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148815" role="paragraph" l10n="CHG" oldref="61">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156289" role="paragraph" l10n="U" oldref="62">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="63">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 <comment>removed webdav text, see i71792</comment><comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment><embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-<paragraph role="paragraph" id="par_idN10B8C" xml-lang="en-US" l10n="NEW">
+      <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+      <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+      <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW">
 <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
 </paragraph>
-<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
-<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp
index 0b50937dcf..eef290f303 100755
--- a/helpcontent2/source/text/shared/guide/redlining.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: redlining.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,39 +27,37 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording and Displaying Changes</title>
-<filename>/text/shared/guide/redlining.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:41:19">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Recording and Displaying Changes</title>
+         <filename>/text/shared/guide/redlining.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>marking changes</bookmark_value>
-<bookmark_value>changes; review function</bookmark_value>
-<bookmark_value>review function; recording changes example</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
+      <bookmark_value>highlighting changes</bookmark_value>
+      <bookmark_value>changes; review function</bookmark_value>
+      <bookmark_value>review function; recording changes example</bookmark_value>
+      <bookmark_value>Track Changes, see review function</bookmark_value>
+</bookmark><comment>MW addes a cross-reference</comment><comment>MW added "highlighting changes"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
 </variable></paragraph>
-<paragraph role="note" id="par_id4013794" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
-<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
-<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
-<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
-<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id4013794" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+      <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
+      <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+      <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+      <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+      <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 310e844612..64129ac46e 100755
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redlining_accept.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
index b6bb0aa8eb..665e2d72da 100755
--- a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redlining_doccompare.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
index 54e47cad02..d275d18a14 100755
--- a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redlining_docmerge.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index ba20ac7a54..112094d568 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: redlining_enter.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,60 +29,56 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording Changes</title>
-<filename>/text/shared/guide/redlining_enter.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:53:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Recording Changes</title>
+         <filename>/text/shared/guide/redlining_enter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>changes; recording</bookmark_value>
-<bookmark_value>recording; changes</bookmark_value>
-<bookmark_value>comments; on changes</bookmark_value>
-<bookmark_value>settings;tracking changes</bookmark_value>
-</bookmark><comment>UFI: deleted index review function;recording changes</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
+      <bookmark_value>recording; changes</bookmark_value>
+      <bookmark_value>comments; on changes</bookmark_value>
+      <bookmark_value>review function;tracking changes</bookmark_value>
+</bookmark><comment>UFI: deleted index review function;recording changes</comment><comment>MW changed "settings;tracking changes" </comment>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
 </variable></paragraph>
-<paragraph role="note" id="par_id7271645" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
-<table id="tbl_id3147399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="17">1.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="18">2.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="19">3.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id7271645" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
+      <table id="tbl_id3147399">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="18">2.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="19">3.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph>
 <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
 <paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
 <paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/redlining.xhp#redlining"/>
 <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/helpcontent2/source/text/shared/guide/redlining_protect.xhp b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
index d7d7a7133d..b38bc5ea64 100755
--- a/helpcontent2/source/text/shared/guide/redlining_protect.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redlining_protect.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_versions.xhp b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
index 43ef11c539..fe8fdaff61 100755
--- a/helpcontent2/source/text/shared/guide/redlining_versions.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redlining_versions.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/round_corner.xhp b/helpcontent2/source/text/shared/guide/round_corner.xhp
index 6abf932189..cd5f1977f0 100644
--- a/helpcontent2/source/text/shared/guide/round_corner.xhp
+++ b/helpcontent2/source/text/shared/guide/round_corner.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: round_corner.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 0b02734ac4..2f4c52037d 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scripting.xhp,v $
- * $Revision: 1.17.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,200 +32,198 @@
  
 	
 <meta>
-<topic id="textsharedguidescriptingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
-<filename>/text/shared/guide/scripting.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidescriptingxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Scripting %PRODUCTNAME</title>
+         <filename>/text/shared/guide/scripting.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id5277565"><bookmark_value>assigning scripts</bookmark_value>
-<bookmark_value>programming;scripting</bookmark_value>
-<bookmark_value>form controls;assigning macros</bookmark_value>
-<bookmark_value>pictures;assigning macros</bookmark_value>
-<bookmark_value>hyperlinks;assigning macros</bookmark_value>
-<bookmark_value>shortcut keys;assigning macros</bookmark_value>
-<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
-<bookmark_value>menus;assigning macros</bookmark_value>
-<bookmark_value>events;assigning scripts</bookmark_value>
+      <bookmark_value>programming;scripting</bookmark_value>
+      <bookmark_value>form controls;assigning macros</bookmark_value>
+      <bookmark_value>pictures;assigning macros</bookmark_value>
+      <bookmark_value>hyperlinks;assigning macros</bookmark_value>
+      <bookmark_value>shortcut keys;assigning macros</bookmark_value>
+      <bookmark_value>controls;assigning macros (Basic)</bookmark_value>
+      <bookmark_value>menus;assigning macros</bookmark_value>
+      <bookmark_value>events;assigning scripts</bookmark_value>
 </bookmark><comment>MW deleted "programming;...",  "scripting in programming", "BeanShell scripting", "Basic;..."  and "java;..."</comment><comment>MW added "controls;..",  "menus;..." and "events;..."</comment>
-<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+<paragraph xml-lang="en-US" id="par_idN1070A" role="heading" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">JavaScript</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1091F" xml-lang="en-US" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1093D" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10770" xml-lang="en-US" l10n="NEW">A list of the script functions appears in the <emph>Functions</emph> list box. Select a function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10778" xml-lang="en-US" l10n="NEW">Click <emph>New</emph> to create a new menu assignment. The new menu entry appears in the <emph>Menu entries</emph> list box. Click the menu entry and enter text to rename the entry.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10783" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10787" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A61" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A65" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A69" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Functions</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A71" xml-lang="en-US" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
-<paragraph role="paragraph" id="par_idN10A74" xml-lang="en-US" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A78" xml-lang="en-US" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1078A" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1078E" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A16" xml-lang="en-US" l10n="NEW">Click <emph>Assign Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A9E" xml-lang="en-US" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAA" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAE" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Macros</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB9" xml-lang="en-US" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ABD" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEB" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEF" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10798" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1079C" xml-lang="en-US" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B15" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B19" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B21" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079F" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A3" xml-lang="en-US" l10n="NEW">Select the graphic in your document. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3B" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3F" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107A6" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a form control</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107AA" xml-lang="en-US" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B59" xml-lang="en-US" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B5D" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B61" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107AD" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107B1" xml-lang="en-US" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B7F" xml-lang="en-US" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B87" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B8B" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10728" role="paragraph" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">%PRODUCTNAME Basic</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">JavaScript</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1073D" role="paragraph" l10n="CHG">BeanShell</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10758" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1093D" role="paragraph" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10770" role="paragraph" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10778" role="paragraph" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10783" role="heading" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10787" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A61" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A65" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A69" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A71" role="paragraph" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10A74" role="paragraph" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A78" role="paragraph" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1078A" role="heading" level="2" l10n="NEW">To assign a script to an event</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1078E" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A16" role="paragraph" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10A9E" role="paragraph" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AA6" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AAA" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AAE" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AB6" role="paragraph" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10AB9" role="paragraph" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10ABD" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AE7" role="paragraph" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AEB" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AEF" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10AF7" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10798" role="heading" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1079C" role="paragraph" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B15" role="paragraph" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B19" role="paragraph" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B21" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1079F" role="heading" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107A3" role="paragraph" l10n="NEW">Select the graphic in your document. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B3B" role="paragraph" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B3F" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107A6" role="heading" level="2" l10n="NEW">To assign a script to a form control</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107AA" role="paragraph" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B59" role="paragraph" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B5D" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B61" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107AD" role="heading" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107B1" role="paragraph" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B7F" role="paragraph" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B87" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10B8B" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index a67d920de0..943ae48bf2 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index bfcb8a69a3..23d61bb1e6 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spadmin.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +29,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
+<title id="tit" xml-lang="en-US">Setting up Printer and Fax Under UNIX Based Platforms</title>
 <filename>/text/shared/guide/spadmin.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="chapter_all">
@@ -55,14 +48,14 @@
 <bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
 <bookmark_value>converters; PostScript, UNIX</bookmark_value>
 <bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
-<bookmark_value>fonts; adding under UNIX</bookmark_value>
-<bookmark_value>typefaces; adding under UNIX</bookmark_value>
 </bookmark><comment>mw deleted "printer programs under UNIX",  "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
 <paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
-<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
+<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer and Fax Under UNIX Based Platforms">Setting up Printer and Fax Under UNIX Based Platforms</link>
 </variable></paragraph>
 <section id="chapter_body">
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers, faxes and fonts for use with the $[officename] software.</paragraph>
+<paragraph role="paragraph" id="par_id3159876" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses the installed fonts of your system. In a text document you can select from all printable fonts. In an HTML document or in Web layout, only fonts that are visible on screen are offered. In spreadsheets and drawings you can select from all installed fonts.</paragraph>
+
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph>
 <list type="unordered">
 <listitem>
@@ -74,7 +67,7 @@
 </list>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
 <paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
-<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="285">The system administrator can also add fonts for all users in the server installation. However, these fonts are available only after restarting the $[officename] software.</paragraph>
+
 <paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
 <paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
@@ -171,8 +164,7 @@
 <paragraph role="listitem" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="137">To delete the selected printer, click <emph>Remove</emph>. The default printer or a printer that has been created by the system administrator in a server installation cannot be removed using this dialog.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer 
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer </caseinline></switchinline></paragraph>
 <list type="unordered">
 <listitem>
 <paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="31">To make the printer selected from the <emph>Installed printers</emph> list box the default printer, double-click its name or click the <emph>Default</emph> button.</paragraph>
@@ -207,7 +199,7 @@
 <paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
 <paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
 <paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
-<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
 <paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>
 <paragraph role="heading" id="hd_id3146929" xml-lang="en-US" level="2" l10n="U" oldref="306">Connecting a PostScript to PDF Converter</paragraph>
@@ -230,89 +222,7 @@
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
-<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
-<paragraph role="heading" id="hd_id3156195" xml-lang="en-US" level="2" l10n="U" oldref="143">Installing Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="144">When you are working with the $[officename] software you might notice that a different number of fonts is provided depending on the document type being used. This is because not all of the fonts can be used in every case.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="145">Therefore, only those fonts will be shown in the font selection box when working with a text document which can also be printed, as it is assumed that you will only want to use those fonts that you can actually have printed on paper.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157982" xml-lang="en-US" l10n="CHG" oldref="146">In an HTML document or in Web layout, only fonts that are available on screen are offered.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="147">On the other hand, when working with spreadsheets and drawings you will be able to use all of the fonts that can be either printed or shown on the screen.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="148">The $[officename] software tries to match the display on screen to the printout (WYSIWYG = what you see is what you get). Possible problems are shown in the bottom of the dialog <emph>Format - Character</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3156353" xml-lang="en-US" level="3" l10n="U" oldref="314">Adding Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="315">You can integrate additional fonts in the $[officename] software. Fonts which you integrate are available exclusively to the $[officename] software and can be used with various Xservers without your having to install them there. To make the fonts available to other programs as well, proceed as usual by adding the fonts to your Xserver. The $[officename] software can display and print out PostScript Type1 fonts as well as TrueType fonts (including TrueType Collections).</paragraph>
-<paragraph role="paragraph" id="par_id3156174" xml-lang="en-US" l10n="U" oldref="316">To integrate additional fonts in the $[officename] software, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="357">Go to the {install_path}/program directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151127" xml-lang="en-US" l10n="U" oldref="317">Enter: ./spadmin</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149072" xml-lang="en-US" l10n="U" oldref="318">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156341" xml-lang="en-US" l10n="U" oldref="319">The dialog lists all fonts added for the $[officename] software. You can select and remove fonts using the <emph>Remove</emph> button or add new fonts with the <emph>Add</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="320">Click <emph>Add</emph>. The <emph>Add Fonts</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="321">Enter the directory from which you want to add the fonts. Press the <emph>...</emph> button and select the directory from the path selection dialog or enter the directory directly.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="322">A list of the fonts from this directory appears. Select the fonts you want to add. To add all the fonts, click <emph>Select All</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="323">With the <emph>Create soft links only</emph> check box you can determine whether the fonts are to be copied into the $[officename] directory or only symbolic links are to be created there. If the fonts to be added are on a data medium that is not always available (such as a CD-ROM), you must copy the fonts.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="324">Click OK. The fonts will now be added.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="325">In the case of a server installation, the fonts are installed in that installation if possible. If the user has no write access rights, the fonts will be installed in the corresponding user installation so that only the user who installed them can access them.</paragraph>
-<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="3" l10n="U" oldref="326">Deleting Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="327">To delete fonts, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="328">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="329">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="330">All fonts added to the $[officename] software are listed in the dialog that now appears. Select the fonts you want to delete and click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153242" xml-lang="en-US" l10n="U" oldref="331">You can delete only the fonts that have been added for the $[officename] software.</paragraph>
-<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="332">Renaming Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="U" oldref="333">You can also rename fonts added for the $[officename] software. This is especially useful for fonts that contain several localized names.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="334">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="335">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="336">Select the fonts you want to rename and click <emph>Rename</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="337">Enter a new name in the dialog that appears. If the font contains several names, these names will serve as suggestions in the combo box where you enter the new name.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155521" xml-lang="en-US" l10n="U" oldref="338">Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="339">If you select several fonts to rename, one dialog appears for each selected font.</paragraph>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="340">If you have selected a TrueType Collection (TTC), one dialog appears for each of the fonts contained in it.</paragraph>
+
 </section>
 </section>
 </body>
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index fc267590f9..0111208f5a 100755
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: standard_template.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,7 +69,7 @@
 <paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set As Default Template</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
@@ -91,7 +88,7 @@
 <paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="13">Using Custom Templates</paragraph>
 <paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="14">There are several ways to make your work easier by using your own custom templates. </paragraph>
 <paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="15">Templates in the Template Folder</paragraph>
-<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
 <paragraph role="tip" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="33">You may need to update the view of the templates in the dialog before you can see a newly created template. In this case, choose <emph>File - Templates - Organize</emph> and in the submenu of the <emph>Commands</emph> button, choose <emph>Update</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - Templates - Edit</emph>.</paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/guide/start_parameters.xhp b/helpcontent2/source/text/shared/guide/start_parameters.xhp
index ec91bcb068..f419787800 100644
--- a/helpcontent2/source/text/shared/guide/start_parameters.xhp
+++ b/helpcontent2/source/text/shared/guide/start_parameters.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: start_parameters.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,10 +36,6 @@
 <title id="tit" xml-lang="en-US">Starting the $[officename] Software With Parameters</title>
 <filename>/text/shared/guide/start_parameters.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-25T12:22:48">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="start_parameters">
@@ -54,7 +47,6 @@
 <paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="1" l10n="U" oldref="52">Starting the $[officename] Software With Parameters</paragraph>
 <paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="1">By starting the $[officename] software from the command line you can assign various parameters, with which you can influence the performance. The use of command line parameters is only recommended for experienced users.</paragraph>
 <paragraph role="note" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="2">For normal handling, the use of command line parameters is not necessary. A few of the parameters require a deeper knowledge of the technical background of the $[officename] software technology.</paragraph>
-<paragraph role="note" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="3">More information on this topic can be found at <link href="http://www.openoffice.org" name="www.openoffice.org">www.openoffice.org</link>.</paragraph>
 <paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the $[officename] Software From the Command Line</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index cf4cc16071..ebecbb15c6 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: startcenter.xhp,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,52 +29,62 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedguidestartcenterxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Start Center</title>
-<filename/>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedguidestartcenterxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Start Center</title>
+         <filename>/text/shared/guide/startcenter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id0820200802500562"><bookmark_value>backing window</bookmark_value>
-<bookmark_value>start center</bookmark_value>
+      <bookmark_value>start center</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_BACKINGWINDOW" id="bm_id0820200802550234" localize="false"/>
-<paragraph role="heading" id="hd_id0820200802524447" xml-lang="en-US" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
+<paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id0820200803204063" xml-lang="en-US" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
-<paragraph role="paragraph" id="par_id0820200802524413" xml-lang="en-US" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id0820200803104810" xml-lang="en-US" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104978" xml-lang="en-US" l10n="NEW">
-<emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104998" xml-lang="en-US" l10n="NEW">
-<emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104927" xml-lang="en-US" l10n="NEW">
-<emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104948" xml-lang="en-US" l10n="NEW">
-<emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803105089" xml-lang="en-US" l10n="NEW">
-<emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803105015" xml-lang="en-US" l10n="NEW">
-<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id0820200803105045" xml-lang="en-US" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id082020080310500" xml-lang="en-US" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id0820200803105158" xml-lang="en-US" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document or a file dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:ImpressButton" id="bm_id102220091057270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DBButton" id="bm_id102220091057437" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:MathButton" id="bm_id1022200910575575" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW"><ahelp hid=".">The document icons each open a new document of the specified type.</ahelp></paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803104978" role="paragraph" l10n="NEW">
+               <emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803104998" role="paragraph" l10n="NEW">
+               <emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803104927" role="paragraph" l10n="NEW">
+               <emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803104948" role="paragraph" l10n="NEW">
+               <emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803105089" role="paragraph" l10n="NEW">
+               <emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0820200803105015" role="paragraph" l10n="NEW">
+               <emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:TemplateButton" id="bm_id1022200910584084" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011855" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Templates icon opens the Templates and Documents dialog.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
+
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 942c37de11..c1c0781ab5 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabs.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,7 +65,7 @@ FPE: Deleted screenshot.</lastedited>
 <paragraph role="paragraph" id="par_id1376079" xml-lang="en-US" l10n="NEW">On the horizontal ruler you can see the tab stops for the current paragraph. If you want to change the tab stops, you should first consider the scope to which you want to change tab stops as follows:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id274971" xml-lang="en-US" l10n="NEW">Change the tab stops for all paragraphs using the current Paragraph Style: Right-click the paragraph to open the context menu, choose <emph>Edit Paragraph Style</emph>, click <emph>Tabs</emph>.</paragraph>
@@ -154,11 +151,11 @@ FPE: Deleted screenshot.</lastedited>
 </default>
 </switch>
 <paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="3" l10n="U" oldref="26">Changing the Defaults</paragraph>
-<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Text Document - General">Tools - Options - %PRODUCTNAME Writer - General</link>
-</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - General">Tools - Options - %PRODUCTNAME Calc - General</link>
-</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Drawing - General">Tools - Options - %PRODUCTNAME Draw - General</link>
-</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General">Tools - Options - %PRODUCTNAME Impress - General</link>
-</caseinline><defaultinline>Tools - Options - (module name) - General</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Text Document - General">%PRODUCTNAME Writer - General</link>
+</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - General">%PRODUCTNAME Calc - General</link>
+</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Drawing - General">%PRODUCTNAME Draw - General</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link>
+</caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box.</paragraph>
 <switch select="appl">
 <case select="CALC">
 </case>
diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp
index f00227b2f4..4ed5b1354f 100644
--- a/helpcontent2/source/text/shared/guide/text_color.xhp
+++ b/helpcontent2/source/text/shared/guide/text_color.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: text_color.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,50 +31,53 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Color of Text</title>
-<filename>/text/shared/guide/text_color.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>colors; fill format</bookmark_value>
-<bookmark_value>text; coloring</bookmark_value>
-<bookmark_value>characters; coloring</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3156014" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
+      <topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing the Color of Text</title>
+         <filename>/text/shared/guide/text_color.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>text; coloring</bookmark_value>
+      <bookmark_value>characters; coloring</bookmark_value>
+      <bookmark_value>colors; fonts</bookmark_value>
+      <bookmark_value>fonts;colors</bookmark_value>
+</bookmark><comment>MW added two entries from text/shared/01/05020200.xhp and deleted "colors;fill format"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156014" role="heading" level="1" l10n="U"
+                 oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
-<table id="tbl_id3152801">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E">
-<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159233" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
+      <table id="tbl_id3152801">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E">
+<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="U" oldref="45">Font Color</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<table id="tbl_id3146797">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E">
-<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="U" oldref="45">Font Color</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <table id="tbl_id3146797">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+            </tablecell>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149795"><bookmark_value>paint can symbol</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+      <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/textmode_change.xhp b/helpcontent2/source/text/shared/guide/textmode_change.xhp
index b21d6c7067..a342635a7f 100755
--- a/helpcontent2/source/text/shared/guide/textmode_change.xhp
+++ b/helpcontent2/source/text/shared/guide/textmode_change.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textmode_change.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/undo_formatting.xhp b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
index 9ac124c600..fb9a2761e1 100644
--- a/helpcontent2/source/text/shared/guide/undo_formatting.xhp
+++ b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undo_formatting.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/version_number.xhp b/helpcontent2/source/text/shared/guide/version_number.xhp
index 1f1c7b3d29..1b7e0b5447 100755
--- a/helpcontent2/source/text/shared/guide/version_number.xhp
+++ b/helpcontent2/source/text/shared/guide/version_number.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: version_number.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
index 5018530876..731bb37e68 100755
--- a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
+++ b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewing_file_properties.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index f09f61d31e..a556b5bbc8 100755
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: workfolder.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,40 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing Your Working Directory </title>
-<filename>/text/shared/guide/workfolder.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+      <topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing Your Working Directory </title>
+         <filename>/text/shared/guide/workfolder.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="chapter_all">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>working directory change</bookmark_value>
-<bookmark_value>My Documents folder;changing work directory</bookmark_value>
-<bookmark_value>paths; changing work directory</bookmark_value>
-<bookmark_value>pictures; changing paths</bookmark_value>
-<bookmark_value>changing;work directory</bookmark_value>
-</bookmark><comment>work --&gt; working, i85615</comment><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="CHG" oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
+         <bookmark_value>My Documents folder;changing work directory</bookmark_value>
+         <bookmark_value>paths; changing work directory</bookmark_value>
+         <bookmark_value>pictures; changing paths</bookmark_value>
+         <bookmark_value>changing;work directory</bookmark_value>
+</bookmark><comment>work --&gt; working, i85615</comment>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="CHG"
+                    oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Tools - Options - $[officename] - Paths</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>OK</emph>. </paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph>Tools - Options - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
-</section>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3163802" role="listitem" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153880" role="listitem" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>Select</emph>.</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
+      </section>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/xforms.xhp b/helpcontent2/source/text/shared/guide/xforms.xhp
index 3c904a74f8..515cf7001d 100755
--- a/helpcontent2/source/text/shared/guide/xforms.xhp
+++ b/helpcontent2/source/text/shared/guide/xforms.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xforms.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter.xhp b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
index f2c4138410..7cf2fe6fb4 100755
--- a/helpcontent2/source/text/shared/guide/xsltfilter.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xsltfilter.xhp,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
index 879c21a835..de469f24b8 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xsltfilter_create.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
index 447f0d7956..7cc03fbd75 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xsltfilter_distribute.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 4a25d2414e..eed954370d 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0108.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedmain0108xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Help</title>
@@ -58,8 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN1064A" xml-lang="en-US" l10n="NEW">
-<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt>
-	</image></paragraph>
+<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Help</paragraph>
@@ -73,7 +68,7 @@
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
 <embed href="text/shared/01/08060100.xhp#registrierung"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
-<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in Tools - Options - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
diff --git a/helpcontent2/source/text/shared/main0201.xhp b/helpcontent2/source/text/shared/main0201.xhp
index cf17365e62..99ac7d7fad 100755
--- a/helpcontent2/source/text/shared/main0201.xhp
+++ b/helpcontent2/source/text/shared/main0201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0201.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0208.xhp b/helpcontent2/source/text/shared/main0208.xhp
index da582925b0..fbf19bfe64 100755
--- a/helpcontent2/source/text/shared/main0208.xhp
+++ b/helpcontent2/source/text/shared/main0208.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0209.xhp b/helpcontent2/source/text/shared/main0209.xhp
index 40f7906945..fd0983f2bf 100755
--- a/helpcontent2/source/text/shared/main0209.xhp
+++ b/helpcontent2/source/text/shared/main0209.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0209.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0212.xhp b/helpcontent2/source/text/shared/main0212.xhp
index 5e87e71c59..9449b97ce8 100644
--- a/helpcontent2/source/text/shared/main0212.xhp
+++ b/helpcontent2/source/text/shared/main0212.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0212.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,83 +27,82 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Data Bar</title>
-<filename>/text/shared/main0212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-11T14:46:11">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="datenbank">
-<paragraph role="heading" id="hd_id3147102" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
-<embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="E">
-<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153896" xml-lang="en-US">Icon</alt>
+      <topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Table Data Bar</title>
+         <filename>/text/shared/main0212.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="datenbank">
+         <paragraph xml-lang="en-US" id="hd_id3147102" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
+      <embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147303" role="paragraph" l10n="E">
+<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="CHG" oldref="13">Save Record</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
-<embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
-<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154123" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="CHG" oldref="13">Save Record</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
+      <embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
+      <embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="E">
+<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="14">Undo: Data Input</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/12100200.xhp#findrecord"/>
-<embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
-<embed href="text/shared/02/12050000.xhp#aktualisieren"/>
-<embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
-<embed href="text/shared/02/12100100.xhp#sortorder"/>
-<embed href="text/shared/00/00000450.xhp#sysortieren"/>
-<embed href="text/shared/02/12010000.xhp#aufsteigend"/>
-<embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
-<embed href="text/shared/02/12020000.xhp#absteigend"/>
-<embed href="text/shared/02/12020000.xhp#syabsteigend"/>
-<embed href="text/shared/02/12030000.xhp#autofilter"/>
-<embed href="text/shared/02/12030000.xhp#syautofilter"/>
-<embed href="text/shared/02/12120000.xhp#filteranwenden"/>
-<embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
-<embed href="text/shared/02/12090000.xhp#standardfilter1"/>
-<embed href="text/shared/02/12090000.xhp#systandardfilter"/>
-<embed href="text/shared/02/12040000.xhp#filterentfernen"/>
-<embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151382" role="paragraph" l10n="U" oldref="14">Undo: Data Input</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/02/12100200.xhp#findrecord"/>
+      <embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
+      <embed href="text/shared/02/12050000.xhp#aktualisieren"/>
+      <embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
+      <embed href="text/shared/02/12100100.xhp#sortorder"/>
+      <embed href="text/shared/00/00000450.xhp#sysortieren"/>
+      <embed href="text/shared/02/12010000.xhp#aufsteigend"/>
+      <embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
+      <embed href="text/shared/02/12020000.xhp#absteigend"/>
+      <embed href="text/shared/02/12020000.xhp#syabsteigend"/>
+      <embed href="text/shared/02/12030000.xhp#autofilter"/>
+      <embed href="text/shared/02/12030000.xhp#syautofilter"/>
+      <embed href="text/shared/02/12120000.xhp#filteranwenden"/>
+      <embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
+      <embed href="text/shared/02/12090000.xhp#standardfilter1"/>
+      <embed href="text/shared/02/12090000.xhp#systandardfilter"/>
+      <embed href="text/shared/02/12040000.xhp#filterentfernen"/>
+      <embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DSBInsertColumns" id="bm_id5734733" localize="false"/>
-<paragraph role="head2" id="par_idN10744" xml-lang="en-US" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
-<paragraph role="paragraph" id="par_idN10753" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/12070000.xhp#sydatenintext"/>
-<embed href="text/shared/02/12080000.xhp#dateninfelder"/>
-<embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
-<paragraph role="head2" id="par_idN10780" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US" l10n="NEW">Starts the Mail Merge Wizard to create form letters.</paragraph>
-<embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
-<embed href="text/shared/02/12140000.xhp#aktdokdat"/>
-<embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
-<embed href="text/shared/02/12000000.xhp#explorer"/>
-<embed href="text/shared/02/12000000.xhp#syexplorer"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10744" role="head2" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10753" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
+      <embed href="text/shared/02/12070000.xhp#sydatenintext"/>
+      <embed href="text/shared/02/12080000.xhp#dateninfelder"/>
+      <embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id0928200901513623" localize="false"/><comment>Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder</comment>
+<paragraph xml-lang="en-US" id="par_idN10780" role="head2" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1078F" role="paragraph" l10n="NEW"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters.</ahelp></paragraph>
+      <embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
+      <embed href="text/shared/02/12140000.xhp#aktdokdat"/>
+      <embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
+      <embed href="text/shared/02/12000000.xhp#explorer"/>
+      <embed href="text/shared/02/12000000.xhp#syexplorer"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp
index 8118be4b76..3f2eba4aca 100644
--- a/helpcontent2/source/text/shared/main0213.xhp
+++ b/helpcontent2/source/text/shared/main0213.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0213.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0214.xhp b/helpcontent2/source/text/shared/main0214.xhp
index 0648ea65c8..c807b9b04e 100755
--- a/helpcontent2/source/text/shared/main0214.xhp
+++ b/helpcontent2/source/text/shared/main0214.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0214.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0226.xhp b/helpcontent2/source/text/shared/main0226.xhp
index ed8e51a9df..cf3361dccf 100644
--- a/helpcontent2/source/text/shared/main0226.xhp
+++ b/helpcontent2/source/text/shared/main0226.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0226.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0227.xhp b/helpcontent2/source/text/shared/main0227.xhp
index c700965d17..7eba17dc0c 100644
--- a/helpcontent2/source/text/shared/main0227.xhp
+++ b/helpcontent2/source/text/shared/main0227.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0227.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -213,9 +210,7 @@
 </table>
 <bookmark xml-lang="en-US" branch="hid/SID_BEZIER_ELIMINATE_POINTS" id="bm_id3240924" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:BezierEliminatePoints" id="bm_id3154958" localize="false"/><paragraph role="heading" id="hd_id3156351" xml-lang="en-US" level="2" l10n="U" oldref="36">Eliminate Points</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link>
-</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link> in the Options dialog box</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link> in the Options dialog box</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
 <table id="tbl_id3150892">
 <tablerow>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0400.xhp b/helpcontent2/source/text/shared/main0400.xhp
index b186cf9743..bfdb24711c 100755
--- a/helpcontent2/source/text/shared/main0400.xhp
+++ b/helpcontent2/source/text/shared/main0400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0500.xhp b/helpcontent2/source/text/shared/main0500.xhp
index a9740c8180..09f4b86a92 100755..100644
--- a/helpcontent2/source/text/shared/main0500.xhp
+++ b/helpcontent2/source/text/shared/main0500.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0500.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,14 +32,10 @@
 <title xml-lang="en-US" id="tit">Glossaries</title>
 <filename>/text/shared/main0500.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>
-  
-  
+
+
   <section id="allghinweise">
   <paragraph id="hd_id3156183" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/main0500.xhp" name="Glossaries">Glossaries</link></paragraph>
   <paragraph role="paragraph" id="par_id3157898" l10n="U" xml-lang="en-US" oldref="2">This section provides a general glossary of technical terms used in $[officename], along with a list of Internet terms.</paragraph>
diff --git a/helpcontent2/source/text/shared/main0600.xhp b/helpcontent2/source/text/shared/main0600.xhp
index e584edb4af..eda40c2ba2 100644
--- a/helpcontent2/source/text/shared/main0600.xhp
+++ b/helpcontent2/source/text/shared/main0600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0600.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index b6c66f3997..fff1a69dbb 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0650.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,14 +44,14 @@
 <paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/main0650.xhp" name="Java Platform Support">Java Platform Support</link></paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] supports the Java platform for running applications and components based on the JavaBeans architecture.</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software from Sun Microsystems. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required. The executable setup file is located in the $[officename]/program folder and on the $[officename] CD.</paragraph>
+<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required.</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <link href="text/shared/optionen/java.xhp" name="Tools - Options - $[officename] - Java"><emph>Tools - Options - $[officename] - Java</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Java">$[officename] - Java</link></emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose Tools - Options - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph>Tools - Options - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph>Tools - Options - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/main0800.xhp b/helpcontent2/source/text/shared/main0800.xhp
index 341df85396..88ea220e5c 100755
--- a/helpcontent2/source/text/shared/main0800.xhp
+++ b/helpcontent2/source/text/shared/main0800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0800.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 8f5dba7586..9996559021 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,4 +65,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index bf1eb94c7f..4ccc1298ca 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,59 +29,66 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/optionen/01000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T16:27:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+      <topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Options</title>
+         <filename>/text/shared/optionen/01000000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="optionen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153665"><bookmark_value>options; tools</bookmark_value>
-<bookmark_value>defaults; program configuration</bookmark_value>
-<bookmark_value>settings; program configuration</bookmark_value>
+         <bookmark_value>defaults; program configuration</bookmark_value>
+         <bookmark_value>settings; program configuration</bookmark_value>
 </bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
 <bookmark xml-lang="en-US" branch="hid/SID_OPTIONS_TREEDIALOG" id="bm_id8304653" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id3147335" localize="false"/>
-<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10607" role="note" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#optionen"/>
-</section>
-<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
-<embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
-<embed href="text/shared/optionen/01020000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
-<embed href="text/shared/optionen/01150000.xhp#typotext"/>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
-<embed href="text/shared/optionen/01030000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
-<embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
-<paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
-<embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
-<paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
-<embed href="text/shared/optionen/01060000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
-<embed href="text/shared/optionen/01070000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="2" l10n="CHG" oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
-<embed href="text/shared/optionen/01080000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3154732" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
-<embed href="text/shared/optionen/01090000.xhp#druckentext"/>
-<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
-<embed href="text/shared/optionen/01110000.xhp#farbe"/>
-<paragraph role="heading" id="hd_id3149420" xml-lang="en-US" level="2" l10n="CHG" oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
-<embed href="text/shared/optionen/01160000.xhp#daten"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#optionen"/>
+         <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu. Both menu entries open the Options dialog box.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
+      <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
+      <paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
+      <embed href="text/shared/optionen/01020000.xhp#laden"/>
+      <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2" l10n="U"
+                 oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
+      <embed href="text/shared/optionen/01150000.xhp#typotext"/>
+      <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+                 oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
+      <embed href="text/shared/optionen/01030000.xhp#laden"/>
+      <paragraph xml-lang="en-US" id="hd_id3153188" role="heading" level="2" l10n="CHG"
+                 oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
+      <embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
+      <paragraph xml-lang="en-US" id="hd_id3150104" role="heading" level="2" l10n="CHG"
+                 oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
+      <embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
+      <paragraph xml-lang="en-US" id="hd_id3154918" role="heading" level="2" l10n="CHG"
+                 oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
+      <embed href="text/shared/optionen/01060000.xhp#allgemein"/>
+      <paragraph xml-lang="en-US" id="hd_id3153142" role="heading" level="2" l10n="CHG"
+                 oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
+      <embed href="text/shared/optionen/01070000.xhp#allgemein"/>
+      <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="2" l10n="CHG"
+                 oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
+      <embed href="text/shared/optionen/01080000.xhp#allgemein"/>
+      <paragraph xml-lang="en-US" id="hd_id3154732" role="heading" level="2" l10n="CHG"
+                 oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
+      <embed href="text/shared/optionen/01090000.xhp#druckentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3155418" role="heading" level="2" l10n="CHG"
+                 oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
+      <embed href="text/shared/optionen/01110000.xhp#farbe"/>
+      <paragraph xml-lang="en-US" id="hd_id3149420" role="heading" level="2" l10n="CHG"
+                 oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
+      <embed href="text/shared/optionen/01160000.xhp#daten"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp
index 3e30f0d373..0d56186843 100755
--- a/helpcontent2/source/text/shared/optionen/01010000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010000.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,39 +29,36 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">$[officename]</title>
-<filename>/text/shared/optionen/01010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-07T10:53:15">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SID_GENERAL_OPTIONS" id="bm_id3147577" localize="false"/>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="1" l10n="U" oldref="1">$[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
+      <topic id="textsharedoptionen01010000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">$[officename]</title>
+         <filename>/text/shared/optionen/01010000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<!-- removed HID SID_GENERAL_OPTIONS -->
+<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="1" l10n="U" oldref="1">$[officename]</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
 </variable> These settings are saved automatically.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
-</section>
-<embed href="text/shared/optionen/01010100.xhp#allgemeines"/>
-<embed href="text/shared/optionen/01010600.xhp#allg"/>
-<embed href="text/shared/optionen/01011000.xhp#arbeit"/>
-<embed href="text/shared/optionen/01010800.xhp#ansicht"/>
-<embed href="text/shared/optionen/01010900.xhp#drucken"/>
-<embed href="text/shared/optionen/01010300.xhp#pfade"/>
-<embed href="text/shared/optionen/01010500.xhp#farben"/>
-<embed href="text/shared/optionen/01010700.xhp#schrifters"/>
-<embed href="text/shared/optionen/01030300.xhp#security"/>
-<embed href="text/shared/optionen/01012000.xhp#appearance"/>
-<embed href="text/shared/optionen/01013000.xhp#accessibility"/>
-<embed href="text/shared/optionen/java.xhp#java"/>
-<embed href="text/shared/optionen/online_update.xhp#online_update"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
+      </section>
+      <embed href="text/shared/optionen/01010100.xhp#allgemeines"/>
+      <embed href="text/shared/optionen/01010600.xhp#allg"/>
+      <embed href="text/shared/optionen/01011000.xhp#arbeit"/>
+      <embed href="text/shared/optionen/01010800.xhp#ansicht"/>
+      <embed href="text/shared/optionen/01010900.xhp#drucken"/>
+      <embed href="text/shared/optionen/01010300.xhp#pfade"/>
+      <embed href="text/shared/optionen/01010500.xhp#farben"/>
+      <embed href="text/shared/optionen/01010700.xhp#schrifters"/>
+      <embed href="text/shared/optionen/01030300.xhp#security"/>
+      <embed href="text/shared/optionen/01012000.xhp#appearance"/>
+      <embed href="text/shared/optionen/01013000.xhp#accessibility"/>
+      <embed href="text/shared/optionen/java.xhp#java"/>
+      <embed href="text/shared/optionen/online_update.xhp#online_update"/>
+      <embed href="text/shared/optionen/improvement.xhp#improvement"/>
+      <embed href="text/shared/00/00000001.xhp#zurueck"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010100.xhp b/helpcontent2/source/text/shared/optionen/01010100.xhp
index a21a562073..0502e05ea8 100755
--- a/helpcontent2/source/text/shared/optionen/01010100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,79 +59,79 @@
 <paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="3">Address</paragraph>
 <paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Use the <emph>Address</emph> field to enter and edit your personal user data.</paragraph>
 <section id="datenf">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COMP" id="bm_id3149164" localize="false"/><comment>UFI removed a double ID</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COMPANY" id="bm_id3154306" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP" id="bm_id3149164" localize="false"/><comment>UFI removed a double ID</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY" id="bm_id3154306" localize="false"/>
 <paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="5">Company</paragraph>
 <paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COMPANY">Type the name of your company in this field.</ahelp></paragraph>
 </section>
 <section id="datena">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME" id="bm_id3153825" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FIRSTNAME" id="bm_id3149237" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME" id="bm_id3153825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME" id="bm_id3149237" localize="false"/>
 <paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="3" l10n="U" oldref="7">First name</paragraph>
 <paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FIRSTNAME">Type your first name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_NAME" id="bm_id3151245" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_NAME" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_NAME" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME" id="bm_id3156024" localize="false"/>
 <paragraph role="heading" id="hd_id3159158" xml-lang="en-US" level="3" l10n="U" oldref="32">Last name</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_NAME">Type your last name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT" id="bm_id3149295" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_SHORTNAME" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT" id="bm_id3149295" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME" id="bm_id3154347" localize="false"/>
 <paragraph role="heading" id="hd_id3156344" xml-lang="en-US" level="3" l10n="U" oldref="34">Initials</paragraph>
 <paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_SHORTNAME">Type your initials.</ahelp></paragraph>
 </section>
 <section id="strplzort">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_STREET" id="bm_id3153361" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_STREET" id="bm_id3154071" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_STREET" id="bm_id3154938" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_STREET" id="bm_id3153361" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_STREET" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET" id="bm_id3154938" localize="false"/>
 <paragraph role="heading" id="hd_id3153526" xml-lang="en-US" level="3" l10n="U" oldref="9">Street</paragraph>
 <paragraph role="paragraph" id="par_id3151212" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_STREET">Type the name of your street in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_ZIP" id="bm_id3153970" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_ZIP" id="bm_id3152935" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_PLZ" id="bm_id3151044" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SFXPAGE_GENERAL_ED_US_ZIPCODE" id="bm_id2420728" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_ZIP" id="bm_id3153970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_ZIP" id="bm_id3152935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE" id="bm_id2420728" localize="false"/>
 <paragraph role="heading" id="hd_id3154909" xml-lang="en-US" level="3" l10n="U" oldref="11">ZIP</paragraph>
 <paragraph role="paragraph" id="par_id3145607" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_PLZ">Type your ZIP in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_CITY" id="bm_id3148453" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_CITY" id="bm_id3151178" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_CITY" id="bm_id3148920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_CITY" id="bm_id3158409" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_CITY" id="bm_id3148453" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_CITY" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY" id="bm_id3148920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY" id="bm_id3158409" localize="false"/>
 <paragraph role="heading" id="hd_id3154685" xml-lang="en-US" level="3" l10n="U" oldref="35">City</paragraph>
 <paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_CITY">Type the city where you live.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_COUNTRY" id="bm_id3151383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COUNTRY" id="bm_id3149562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COUNTRY" id="bm_id3153768" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE" id="bm_id3155132" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY" id="bm_id3151383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY" id="bm_id3153768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE" id="bm_id3155132" localize="false"/>
 <paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="3" l10n="U" oldref="37">State</paragraph>
 <paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE">Type your state.</ahelp></paragraph>
 </section>
 <section id="datenb">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_TITLE" id="bm_id3146986" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TITLE" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_TITLE" id="bm_id3146986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE" id="bm_id3152596" localize="false"/>
 <paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="3" l10n="U" oldref="13">Title</paragraph>
 <paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TITLE">Type your title in this field.</ahelp></paragraph>
 </section>
 <section id="dateng">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_POSITION" id="bm_id3153188" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_POSITION" id="bm_id3163712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_POSITION" id="bm_id3153188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION" id="bm_id3163712" localize="false"/>
 <paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
 <paragraph role="paragraph" id="par_id3147428" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_POSITION">Type your position in the company in this field.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELPRIVAT" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT" id="bm_id3149481" localize="false"/>
 <paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="17">Tel. (Home)</paragraph>
 <paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELPRIVAT">Type your private telephone number in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELCOMPANY" id="bm_id3146974" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY" id="bm_id3146974" localize="false"/>
 <paragraph role="heading" id="hd_id3151118" xml-lang="en-US" level="3" l10n="U" oldref="42">Tel. (Work)</paragraph>
 <paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELCOMPANY">Type your work number in this field.</ahelp></paragraph>
 <section id="datend">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FAX" id="bm_id3154792" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_FAX" id="bm_id3154731" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FAX" id="bm_id3154098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FAX" id="bm_id3154792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_FAX" id="bm_id3154731" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX" id="bm_id3154098" localize="false"/>
 <paragraph role="heading" id="hd_id3146921" xml-lang="en-US" level="3" l10n="U" oldref="21">Fax</paragraph>
 <paragraph role="paragraph" id="par_id3153159" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FAX">Type your fax number in this field.</ahelp></paragraph>
 </section>
 <section id="datene">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_MAIL" id="bm_id3149379" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_MAIL" id="bm_id3145647" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_EMAIL" id="bm_id3149410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_MAIL" id="bm_id3149379" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_MAIL" id="bm_id3145647" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL" id="bm_id3149410" localize="false"/>
 <paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="44">E-mail</paragraph>
 <paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_EMAIL">Type your e-mail address.</ahelp> For example, my.name@my.provider.com</paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index da5ba92584..7c8ca591d0 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
-	
+
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010200.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.20.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,141 +29,150 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="speichern">
+      <topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">General</title>
+         <filename>/text/shared/optionen/01010200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="speichern">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>saving; options</bookmark_value>
-<bookmark_value>defaults;of saving</bookmark_value>
-<bookmark_value>URL; saving absolute/relative paths</bookmark_value>
-<bookmark_value>relative saving of URLs</bookmark_value>
-<bookmark_value>absolute saving of URLs</bookmark_value>
+         <bookmark_value>defaults;of saving</bookmark_value>
+         <bookmark_value>URL; saving absolute/relative paths</bookmark_value>
+         <bookmark_value>relative saving of URLs</bookmark_value>
+         <bookmark_value>absolute saving of URLs</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/>
-<paragraph role="head1" id="hd_id3143284" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#rsave"/>
-</section>
-<paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="2" l10n="U" oldref="65">Load</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS" id="bm_id3150444" localize="false"/>
-<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="66">Load user-specific settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="70">Name of Fax,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150276" xml-lang="en-US" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148686" xml-lang="en-US" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_CB_LOAD_DOCPRINTER" id="bm_id813156" localize="false"/>
-<paragraph role="heading" id="hd_id927152" xml-lang="en-US" level="3" l10n="NEW">Load printer settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id5684987" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="2" l10n="U" oldref="3">Save</paragraph>
-<embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO" id="bm_id3154939" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP" id="bm_id3151380" localize="false"/>
-<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
-<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
-<paragraph role="heading" id="hd_id3146147" xml-lang="en-US" level="3" l10n="U" oldref="11">Minutes</paragraph>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153575" xml-lang="en-US" level="3" l10n="CHG" oldref="17">Save URLs relative to file system</paragraph>
-<paragraph role="paragraph" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="53">Examples</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="54">File system</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="55">Internet</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="56">relative</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="57">../images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="58">../images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="59">absolute</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154361" xml-lang="en-US" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3143284" role="head1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#rsave"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154824" role="heading" level="2" l10n="U"
+                 oldref="65">Load</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS" id="bm_id3150444" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153311" role="heading" level="3" l10n="U"
+                 oldref="66">Load user-specific settings with the document</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155388" role="listitem" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153348" role="listitem" l10n="U" oldref="70">Name of Fax,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150276" role="listitem" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148686" role="listitem" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153254" role="listitem" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153666" role="paragraph" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148946" role="listitem" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER" id="bm_id813156" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id927152" role="heading" level="3" l10n="NEW">Load printer settings with the document</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5684987" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146794" role="heading" level="2" l10n="U" oldref="3">Save</paragraph>
+      <embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO" id="bm_id3154939" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145606" role="heading" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>, and then enter a new path for the backup file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
+                 oldref="9">Save AutoRecovery information every</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149560" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="U"
+                 oldref="11">Minutes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153575" role="heading" level="3" l10n="CHG"
+                 oldref="17">Save URLs relative to file system</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149484" role="paragraph" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145799" role="paragraph" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149413" role="tablehead" l10n="U" oldref="53">Examples</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148455" role="tablehead" l10n="U" oldref="54">File system</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150715" role="tablehead" l10n="U" oldref="55">Internet</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155602" role="tablecontent" l10n="U" oldref="56">relative</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147176" role="tablecontent" l10n="U" oldref="57">../images/img.jpg</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145652" role="tablecontent" l10n="U" oldref="58">../images/img.jpg</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155064" role="tablecontent" l10n="U" oldref="59">absolute</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154361" role="tablecontent" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="warning" id="par_id3145148" xml-lang="en-US" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS" id="bm_id3151187" localize="false"/>
-<paragraph role="paragraph" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET" id="bm_id3154664" localize="false"/>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Save URLs relative to internet</paragraph>
-<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2016968" xml-lang="en-US" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SFXPAGE_SAVE_LB_ODF_VERSION" id="bm_id810266" localize="false"/>
-<paragraph role="heading" id="hd_id2659077" xml-lang="en-US" level="3" l10n="NEW">ODF format version</paragraph>
-<paragraph role="paragraph" id="par_id6944181" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
-<paragraph role="paragraph" id="par_id886257" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
-<paragraph role="paragraph" id="par_id8892483" xml-lang="en-US" l10n="NEW">When you save a document in OpenOffice.org 3 or StarOffice 9, you can select whether to save the document in the new format ODF 1.2 or in the prior format ODF 1.0/1.1.</paragraph>
-<paragraph role="paragraph" id="par_id7198400" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 is recommended where possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
-<paragraph role="heading" id="hd_id3154920" xml-lang="en-US" level="3" l10n="CHG" oldref="77">Size optimization for ODF format</paragraph>
-<paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
-<paragraph role="heading" id="par_idN1091E" xml-lang="en-US" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
-<paragraph role="paragraph" id="par_idN10922" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP" id="bm_id3149207" localize="false"/>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="50">Document type</paragraph>
-<paragraph role="paragraph" id="par_id3150828" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER" id="bm_id3152775" localize="false"/>
-<paragraph role="heading" id="hd_id3149527" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Always save as<comment>UFI: changed in #i46895</comment><comment>again many changes in specs.openoffice.org/appwide/odf/odf_1-2_migration.odt</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149035" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145148" role="warning" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS" id="bm_id3151187" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155176" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET" id="bm_id3154664" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="CHG"
+                 oldref="21">Save URLs relative to internet</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155608" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2016968" role="heading" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION" id="bm_id810266" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2659077" role="heading" level="3" l10n="NEW">ODF format version</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id886257" role="paragraph" l10n="NEW">Current versions can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph" l10n="NEW">When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0915200911205367" role="note" l10n="NEW">Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph" l10n="CHG"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154920" role="heading" level="3" l10n="CHG"
+                 oldref="77">Size optimization for ODF format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150488" role="paragraph" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_APP" id="bm_id3149207" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+                 oldref="50">Document type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150828" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER" id="bm_id3152775" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149527" role="heading" level="3" l10n="CHG"
+                 oldref="51">Always save as</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010300.xhp b/helpcontent2/source/text/shared/optionen/01010300.xhp
index e502a6d45b..bb29952bc0 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010300.xhp
@@ -6,14 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 01010300.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,13 +54,13 @@
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTPATH_CTL_PATH" id="bm_id3146795" localize="false"/><paragraph role="heading" id="hd_id3149810" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Paths used by %PRODUCTNAME</paragraph>
 <paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="HID_OPTPATH_CTL_PATH">To modify an entry in this list, click the entry and click <emph>Edit</emph>. You can also double click the entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_STANDARD" id="bm_id3154216" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="2" l10n="U" oldref="160">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD" id="bm_id3154216" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="2" l10n="U" oldref="160">Default</paragraph>
 <paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="161"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_STANDARD">The<emph> Default </emph>button resets the predefined paths for all selected entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH" id="bm_id3150448" localize="false"/><paragraph role="heading" id="hd_id3147229" xml-lang="en-US" level="2" l10n="U" oldref="6">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH" id="bm_id3150448" localize="false"/><paragraph role="heading" id="hd_id3147229" xml-lang="en-US" level="2" l10n="U" oldref="6">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH">Click to display the <emph>Select Path</emph> or <emph>Edit Paths</emph> dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="162">You can change the sequence of entries by clicking the bar in the <emph>Type</emph> column. The column width can be changed by moving the separator between the columns with the mouse.</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home 
-</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><comment>removed "mehrpfad" section. See http://specs.openoffice.org/appwide/options_settings/OOoPaths.odt</comment><comment>removed two rows from table that crept in by a resync.</comment><table id="tbl_id3145364">
+<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home
+</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><table id="tbl_id3145364">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="14">Type</paragraph>
@@ -92,7 +88,7 @@
 <paragraph role="tablecontent" id="par_id8316599" xml-lang="en-US" l10n="NEW">AutoCorrect</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr 
+<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr
 </caseinline><defaultinline>{user}\user\autocorr</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -104,7 +100,7 @@
 <paragraph role="tablecontent" id="par_id4494766" xml-lang="en-US" l10n="NEW">AutoText</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext 
+<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext
 </caseinline><defaultinline>{user}\user\autotext</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -116,7 +112,7 @@
 <paragraph role="tablecontent" id="par_id3154493" xml-lang="en-US" l10n="U" oldref="68">Gallery</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery 
+<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
 </caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -128,7 +124,7 @@
 <paragraph role="tablecontent" id="par_id3151333" xml-lang="en-US" l10n="U" oldref="26">Graphics</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery 
+<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
 </caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -140,7 +136,7 @@
 <paragraph role="tablecontent" id="par_id3146891" xml-lang="en-US" l10n="U" oldref="41">Backups</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup 
+<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup
 </caseinline><defaultinline>{user}\user\backup</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -152,7 +148,7 @@
 <paragraph role="tablecontent" id="par_id4680928" xml-lang="en-US" l10n="NEW">Templates</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template 
+<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template
 </caseinline><defaultinline>{user}\user\template</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -164,7 +160,7 @@
 <paragraph role="tablecontent" id="par_id3154606" xml-lang="en-US" l10n="U" oldref="195">Temporary files</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp 
+<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp
 </caseinline><defaultinline>{user}\user\temp</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/optionen/01010301.xhp b/helpcontent2/source/text/shared/optionen/01010301.xhp
index fbd4b27e3f..8a1cb510e0 100755
--- a/helpcontent2/source/text/shared/optionen/01010301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010301.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,10 +43,10 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#pfade"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATH" id="bm_id3154938" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH" id="bm_id3154938" localize="false"/>
 <paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Paths</paragraph>
 <paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATH">Contains a list of the paths that have already been added. Mark the default path for new files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH" id="bm_id3150768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH" id="bm_id3150768" localize="false"/>
 <paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="5">Add</paragraph>
 <paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH">Opens the <emph>Select Path</emph> dialog to select another folder or the <emph>Open</emph> dialog to select another file.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index e7070bb50d..fb3da1d4fd 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010400.xhp,v $
- * $Revision: 1.17.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_CLB_LINGU_MODULES">Contains the installed language modules.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="35">A language module can contain one, two or three submodules: Spellcheck, hyphenation and thesaurus. Each sub-module can be available in one or more languages. If you click in front of the name of the module, you activate all the available sub-modules simultaneously. If you remove a set mark, you deactivate all the available sub-modules simultaneously. If you wish to activate or deactivate individual sub-modules, click the<emph> Edit button </emph>to open the <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog.</paragraph>
 <paragraph role="note" id="par_id3294778" xml-lang="en-US" l10n="NEW">The configuration allows for two different directories: one folder where the user has write permissions, and one without write permissions. The user can only edit and delete the user dictionaries that are located in the writable path. Other dictionaries can be read only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/>
 <paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="36">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit </emph>
 <emph>Modules</emph></link> dialog appears.</paragraph>
@@ -74,54 +71,54 @@
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
 <paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_CLB_EDIT_MODULES_DICS">Lists the available user dictionaries.</ahelp> Mark the user dictionaries that you want to use for spellcheck and hyphenation.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_NEW" id="bm_id3149670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
 <paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC">Opens the <emph>New Dictionary</emph> dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="65">New Dictionary</paragraph>
 <paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="66">In the <emph>Dictionary</emph> section you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="67">Name</paragraph>
 <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME">Specifies the name of the new custom dictionary.</ahelp> The file extension "*.DIC" is automatically appended.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/>
 <paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="69">Language</paragraph>
 <paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG">By selecting a certain language you can limit the use of the custom dictionary.</ahelp> By selecting <emph>All</emph> the custom dictionary is used independently of the current language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/>
 <paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
 <paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT">Specifies whether you wish to avoid certain words in your documents.</ahelp> In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_EDIT" id="bm_id3147213" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/>
 <paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC">Opens the <emph>Edit custom dictionary</emph> dialog, in which you can add to your custom dictionary or edit existing entries.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="75">In the <emph>Edit custom dictionary </emph>dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion.</paragraph>
 <paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="76">When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons <emph>New</emph> and <emph>Delete</emph> are then deactivated. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/>
 <paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="77">Book</paragraph>
 <paragraph role="paragraph" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS">Specifies the book to be edited.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="79"><variable id="ignore">The <emph>IgnoreAllList (All) </emph>includes all words that have been marked with <emph>Ignore</emph> during spellcheck. This list is valid only for the current spellcheck. 
 </variable></paragraph>
 <paragraph role="note" id="par_id3154757" xml-lang="en-US" l10n="U" oldref="80">The <emph>IgnoreAllList</emph> entry cannot be selected and cannot be deleted. Only the words included as content can be deleted. This happens automatically each time that $[officename] is closed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/>
 <paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="81">Language</paragraph>
 <paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG">Assigns a new language to the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/>
 <paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="3" l10n="U" oldref="83">Word</paragraph>
 <paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD">You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary.</ahelp> If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=", the word is never automatically hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in the word being hyphenated, or a hyphenation suggested, where you insert the = sign.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/>
 <paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="3" l10n="U" oldref="85">Suggestion</paragraph>
 <paragraph role="paragraph" id="par_id3147323" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE">This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the "Word" text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/>
 <paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
 <paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE">Adds the word in the <emph>Word </emph>text field to your current custom dictionary. The word in the <emph>Suggestion </emph>field is also added when working with exception dictionaries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/>
 <paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/>
 <paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
 </section>
 <section id="optionen">
 <bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
 <paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
 <paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_CLB_LINGU_OPTIONS">Defines the options for the spellcheck and hyphenation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/>
 <paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="3" l10n="U" oldref="41">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT">If you want to change a value, select the entry and then click <emph>Edit</emph>.</ahelp> You will see a dialog for entering a new value.</paragraph>
 <paragraph role="heading" id="hd_id3150983" xml-lang="en-US" level="3" l10n="U" oldref="43">Check uppercase words</paragraph>
@@ -141,7 +138,7 @@
 <paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment>
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_LNG_ED_NUM_PREBREAK_ED_PREBREAK" id="bm_id3148607" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK" id="bm_id3148607" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/>
 <paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
 <paragraph role="paragraph" id="par_id3150316" xml-lang="en-US" l10n="U" oldref="54">Specifies the minimum number of characters required for automatic hyphenation to be applied. <ahelp hid="HID_LNGDLG_NUM_PREBREAK" visibility="hidden"> Type the minimum number of characters that must come before or after the hyphen.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010401.xhp b/helpcontent2/source/text/shared/optionen/01010401.xhp
index 9d20af7b0d..2172cf19dc 100755
--- a/helpcontent2/source/text/shared/optionen/01010401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010401.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -74,19 +71,19 @@
 <paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="8">Only one sub-module can be activated under Hyphenation.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE" id="bm_id3148798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE" id="bm_id3148798" localize="false"/>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="9">Language</paragraph>
 <paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE">Specifies the language of the module.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="19">For all language selection fields in <item type="productname">%PRODUCTNAME</item>, the following applies:</paragraph>
 <paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="20"><variable id="sprachenfeld">A language entry has a check mark in front of it if the spellcheck is activated for this language.
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP" id="bm_id3154686" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP" id="bm_id3154686" localize="false"/>
 <paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="11">Move up</paragraph>
 <paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP">Increases the priority of the module selected in the list box by one level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN" id="bm_id3159255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN" id="bm_id3159255" localize="false"/>
 <paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="13">Move down</paragraph>
 <paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN">Decreases the priority of the module selected in the list box by one level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK" id="bm_id3153574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK" id="bm_id3153574" localize="false"/>
 <paragraph role="heading" id="hd_id3161832" xml-lang="en-US" level="3" l10n="U" oldref="15">Back</paragraph>
 <paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK">Click here to undo the current changes in the list box.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01010500.xhp b/helpcontent2/source/text/shared/optionen/01010500.xhp
index 2370140d9a..5006d4cb30 100644
--- a/helpcontent2/source/text/shared/optionen/01010500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010500.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,14 +49,14 @@
 <embed href="text/shared/00/00000406.xhp#color"/>
 </section>
 <paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="3">Color table</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_COLOR:EDT_NAME" id="bm_id3156215" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME" id="bm_id3156215" localize="false"/>
 <paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="2" l10n="U" oldref="5">Name</paragraph>
 <paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXPAGE_COLOR:EDT_NAME">Specifies the name of a selected color. You can also type a name in this field when defining a new color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLOR" id="bm_id3149202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR" id="bm_id3149202" localize="false"/>
 <paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="2" l10n="U" oldref="7">Color</paragraph>
 <paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLOR">Contains a list of available colors. To select a color, choose one from the list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="9">Color table</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLORMODEL" id="bm_id3153091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL" id="bm_id3153091" localize="false"/>
 <paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLORMODEL">To modify, select the color model: Red-Green-Blue (RGB) or Cyan-Magenta-Yellow-BlacK (CMYK).</ahelp></paragraph>
 <paragraph role="note" id="par_id1527756" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
 <paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="40">If you select RGB, the initials of the three colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
@@ -73,7 +70,7 @@
 <paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3" l10n="U" oldref="17">B</paragraph>
 <paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_TPCOLOR_RGB_3">Blue</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="41">If you select CMYK, the initials of the four colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dummyid" id="bm_id2285836" localize="false"/>
+<!-- removed HID dummyid -->
 <paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="3" l10n="U" oldref="42">C</paragraph>
 <paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_TPCOLOR_RGB_3">Cyan</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155417" xml-lang="en-US" level="3" l10n="U" oldref="44">M</paragraph>
@@ -83,21 +80,21 @@
 <paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="3" l10n="U" oldref="48">K</paragraph>
 <paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_TPCOLOR_RGB_3">Black</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD" id="bm_id3156278" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD" id="bm_id3156278" localize="false"/>
 <paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="2" l10n="U" oldref="27">Add</paragraph>
 <paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD">Adds a new color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
 <paragraph role="heading" id="hd_id3153708" xml-lang="en-US" level="2" l10n="U" oldref="29">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color.</ahelp> Note that the color is overwritten without a confirmation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
 <paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2" l10n="U" oldref="31"><link href="text/shared/optionen/01010501.xhp" name="Edit">Edit</link></paragraph>
 <embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
 <paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="33">Load Color List</paragraph>
 <paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD">Accesses the <emph>Open</emph> dialog, which allows you to select a color palette</ahelp>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#syladen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_SAVE" id="bm_id3166448" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE" id="bm_id3166448" localize="false"/>
 <paragraph role="heading" id="hd_id3147344" xml-lang="en-US" level="2" l10n="U" oldref="36">Save Color List</paragraph>
 <paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_SAVE">Opens the <emph>Save As</emph> dialog, which enables you to save the current color table under a specified name.</ahelp> If you do not choose this command, the current color table will be automatically saved as default and re-loaded the next time you start $[officename].</paragraph>
 <embed href="text/shared/00/00000004.xhp#sysichern"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010501.xhp b/helpcontent2/source/text/shared/optionen/01010501.xhp
index 365360a283..52d43bf041 100755
--- a/helpcontent2/source/text/shared/optionen/01010501.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010501.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010501.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,44 +69,44 @@
 </list>
 <paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="U" oldref="10">The gradient in the left color window is immediately adjusted with respect to hue, saturation, and brightness.</paragraph>
 <paragraph role="note" id="par_id9701528" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_1" id="bm_id3154126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_1" id="bm_id3154126" localize="false"/>
 <paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="2" l10n="U" oldref="11">&lt;--</paragraph>
 <paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_1">Click the <emph>&lt;--</emph> button to replace the selected color in the color palette with the color selected at the right. The button is enabled when you select a color in one of the four corners.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
 <paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="13">--&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2">Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_1" id="bm_id3159152" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN" id="bm_id3153367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_CYAN" id="bm_id3153367" localize="false"/>
 <paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="2" l10n="U" oldref="15">Cyan</paragraph>
 <paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN">Sets the Cyan color value in the CMYK color model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_2" id="bm_id3159155" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA" id="bm_id3150486" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_MAGENTA" id="bm_id3150486" localize="false"/>
 <paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="17">Magenta</paragraph>
 <paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA">Sets the Magenta color value in the CMYK color model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_3" id="bm_id3147443" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW" id="bm_id3152576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_YELLOW" id="bm_id3152576" localize="false"/>
 <paragraph role="heading" id="hd_id3154147" xml-lang="en-US" level="2" l10n="U" oldref="19">Yellow</paragraph>
 <paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW">Sets the Yellow color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_COLOR_MTR_FLD_4" id="bm_id3155854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_KEY" id="bm_id3154012" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4" id="bm_id3155854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_KEY" id="bm_id3154012" localize="false"/>
 <paragraph role="heading" id="hd_id3150105" xml-lang="en-US" level="2" l10n="U" oldref="21">Key</paragraph>
 <paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_KEY">Sets the Black color value or key (black) in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_RED" id="bm_id3153573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_RED" id="bm_id3153573" localize="false"/>
 <paragraph role="heading" id="hd_id3151114" xml-lang="en-US" level="2" l10n="U" oldref="23">Red</paragraph>
 <paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_RED">Sets the Red color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_GREEN" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_GREEN" id="bm_id3149481" localize="false"/>
 <paragraph role="heading" id="hd_id3148618" xml-lang="en-US" level="2" l10n="U" oldref="25">Green</paragraph>
 <paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_GREEN">Sets the Green color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_BLUE" id="bm_id3145799" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_BLUE" id="bm_id3145799" localize="false"/>
 <paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="2" l10n="U" oldref="27">Blue</paragraph>
 <paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_BLUE">Sets the Blue color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_HUE" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_HUE" id="bm_id3149581" localize="false"/>
 <paragraph role="heading" id="hd_id3145647" xml-lang="en-US" level="2" l10n="U" oldref="29">Color</paragraph>
 <paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_HUE">Sets the Hue in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_SATURATION" id="bm_id3153415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_SATURATION" id="bm_id3153415" localize="false"/>
 <paragraph role="heading" id="hd_id3144766" xml-lang="en-US" level="2" l10n="U" oldref="31">Saturation</paragraph>
 <paragraph role="paragraph" id="par_id3153512" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_SATURATION">Sets the Saturation in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_LUMINANCE" id="bm_id3146990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_LUMINANCE" id="bm_id3146990" localize="false"/>
 <paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="2" l10n="U" oldref="33">Luminance</paragraph>
 <paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_LUMINANCE">Sets the Brightness in the HSB color model.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index c6c194c0bc..c3c4d0f364 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,78 +29,83 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+ 
+
 <meta>
-<topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:49:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">General</title>
+         <filename>/text/shared/optionen/01010600.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155450"><bookmark_value>opening; dialog settings</bookmark_value>
-<bookmark_value>saving; dialog settings</bookmark_value>
-<bookmark_value>Open/Save dialogs</bookmark_value>
-<bookmark_value>years; 2-digit options</bookmark_value>
-<bookmark_value>Help Agent;options</bookmark_value>
-<bookmark_value>Help;style sheets</bookmark_value>
-</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E" oldref="42" localize="false"/>
-<section id="allg">
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#allg"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE" id="bm_id3151385" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MISC_NF_YEARVALUE" id="bm_id6075624" localize="false"/>
-<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
-<section id="jahreszahlen">
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="CHG" oldref="25">Help</paragraph>
-<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP" id="bm_id3539841" localize="false"/>
-<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">Tips</paragraph>
-<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, notes and chapter names, when you scroll through a document with chapters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_EXTHELP" id="bm_id1425519" localize="false"/>
-<paragraph role="heading" id="par_idN106F6" xml-lang="en-US" level="3" l10n="NEW">Extended tips</paragraph>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT" id="bm_id1998657" localize="false"/>
-<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="CHG" oldref="26">Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="30">Reset Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="2" l10n="U" oldref="43">$[officename] Help formatting</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET" id="bm_id3150488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
-<paragraph role="heading" id="hd_id3150011" xml-lang="en-US" level="3" l10n="U" oldref="44">Style sheet</paragraph>
-<paragraph role="paragraph" id="par_id3153366" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152577" xml-lang="en-US" level="2" l10n="CHG" oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG" id="bm_id3147348" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_FILEDLG" id="bm_id7715994" localize="false"/>
-<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Use $[officename] dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
+      <bookmark_value>saving; dialog settings</bookmark_value>
+      <bookmark_value>years; 2-digit options</bookmark_value>
+      <bookmark_value>Help Agent;options</bookmark_value>
+      <bookmark_value>Help;style sheets</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
+                 localize="false"/>
+      <section id="allg">
+         <paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#allg"/>
+      </section>
+<!-- removed HID OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MISC:NF_YEARVALUE" id="bm_id6075624" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153561" role="heading" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
+      <section id="jahreszahlen">
+         <paragraph xml-lang="en-US" id="par_id3156343" role="paragraph" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="2" l10n="CHG"
+                 oldref="25">Help</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153525" role="paragraph" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" id="bm_id3539841" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106DB" role="heading" level="3" l10n="NEW">Tips</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106DF" role="paragraph" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" id="bm_id1425519" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" id="bm_id1998657" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
+                 oldref="26">Help Agent</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
+<!-- removed HID OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
+                 oldref="30">Reset Help Agent</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3159252" role="heading" level="2" l10n="U"
+                 oldref="43">$[officename] Help formatting</paragraph>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150011" role="heading" level="3" l10n="U"
+                 oldref="44">Style sheet</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153366" role="paragraph" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
+                 oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_FILEDLG" id="bm_id7715994" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3" l10n="CHG"
+                 oldref="35">Use $[officename] dialogs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
 <switch select="sys">
 <case select="WIN">
-<paragraph role="warning" id="par_idN10856" xml-lang="en-US" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10856" role="warning" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
 </case>
 </switch>
-<paragraph role="paragraph" id="par_id3153138" xml-lang="en-US" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
-<paragraph role="heading" id="hd_id3148617" xml-lang="en-US" level="2" l10n="U" oldref="39">Document status</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3147126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
-<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="40">Printing sets "document modified" status</paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2" l10n="U"
+                 oldref="39">Document status</paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
+                 oldref="40">Printing sets "document modified" status</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010700.xhp b/helpcontent2/source/text/shared/optionen/01010700.xhp
index 21d1716ef6..e972a9aa23 100644
--- a/helpcontent2/source/text/shared/optionen/01010700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010700.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010700.xhp,v $
- *
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,8 +53,8 @@
 <embed href="text/shared/00/00000406.xhp#schriers"/>
 </section>
 <paragraph role="note" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="25">Font replacement also affects the display of fonts on the $[officename] user interface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id3154346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_USETABLE" id="bm_id1615039" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id1615039" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="2" l10n="U" oldref="3">Apply replacement table</paragraph>
 <paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE">Enables the font replacement settings that you define.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OFA_FONT_SUBST_CLB" id="bm_id3150360" localize="false"/>
@@ -122,12 +118,12 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT1" id="bm_id8428907" localize="false"/>
+<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 -->
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" id="bm_id8428907" localize="false"/>
 <paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="9">Font</paragraph>
 <paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1">Enter or select the name of the font that you want to replace.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id3155133" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT2" id="bm_id1337321" localize="false"/>
+<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 -->
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id1337321" localize="false"/>
 <paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="10">Replace with</paragraph>
 <paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2">Enter or select the name of the replacement font.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OFA_SUBST_APPLY" id="bm_id3150010" localize="false"/>
@@ -164,16 +160,16 @@
 
 <paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="52">Font settings for HTML and Basic sources</paragraph>
 <paragraph role="paragraph" id="par_id3153950" xml-lang="en-US" l10n="U" oldref="53">Select the font and font size for the display of HTML and Basic source code.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME" id="bm_id3154270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME" id="bm_id4237800" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME" id="bm_id4237800" localize="false"/>
 <paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="3" l10n="U" oldref="54">Fonts</paragraph>
 <paragraph role="paragraph" id="par_id3146990" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME">Select the font for the display of HTML and Basic source code.</ahelp> Select <emph>Automatic</emph> to detect a suitable font automatically.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP" id="bm_id1382183" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP" id="bm_id1382183" localize="false"/>
 <paragraph role="heading" id="hd_id3146791" xml-lang="en-US" level="3" l10n="U" oldref="56">Non-proportional fonts only</paragraph>
 <paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP">Check to display only non-proportional fonts in the <emph>Fonts</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT" id="bm_id3149018" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT" id="bm_id6423841" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT" id="bm_id6423841" localize="false"/>
 <paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="3" l10n="U" oldref="58">Size</paragraph>
 <paragraph role="paragraph" id="par_id3150323" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT">Select a font size for the display of HTML and Basic source code.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index 7b18072d5d..6728fcb870 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -1,44 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
- ***********************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+***********************************************************************
  *
- *  $Revision: 1.5 $
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    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.
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01010800xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">View</title>
@@ -67,67 +59,78 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#ansicht"/>
       </section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING" id="bm_id3154908" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE" id="bm_id7275002" localize="false"/>
+<!-- removed HID OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING -->
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE" id="bm_id7275002" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145171" role="heading" level="3" l10n="CHG"
                  oldref="45">Scaling</paragraph>
       <paragraph xml-lang="en-US" id="par_id3158407" role="paragraph" l10n="U" oldref="46"><ahelp hid="OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING">Uses percentile scaling for font size in user interface elements, such as dialogs and icon labels.</ahelp></paragraph><comment>UFI: see OOo only feature "Icon theme switching"</comment>
 <paragraph xml-lang="en-US" id="par_id3159154" role="note" l10n="CHG" oldref="67">The <emph>Scaling</emph> setting does not affect the font size of text in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG" id="bm_id3154272" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE" id="bm_id6505935" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE" id="bm_id6505935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_OFA_TP_VIEW_LB_ICONSIZE" id="bm_id0525200903212046" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149123" role="heading" level="3" l10n="CHG"
                  oldref="112">Icon size and style</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus. 
+      <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus.
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE" id="bm_id5482039" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE" id="bm_id5482039" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_OFA_TP_VIEW_LB_ICONSTYLE" id="bm_id0525200903230259" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id4664754" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the icon style for icons in toolbars and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT" id="bm_id8840601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT" id="bm_id8840601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_OFA_TP_VIEW_CB_SYSTEM_FONT" id="bm_id0525200903233636" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10738" role="heading" level="3" l10n="NEW">Use system font for user interface</paragraph>
       <paragraph xml-lang="en-US" id="par_idN1073C" role="paragraph" l10n="CHG"><ahelp hid="svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT">Specifies to use the system font to display all menus and dialogs. Else another installed font is used.</ahelp></paragraph>
 <switch select="sys">
 <case select="UNIX">
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING" id="bm_id1062654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING" id="bm_id1062654" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3400982" role="heading" level="3" l10n="NEW">Screen font antialiasing</paragraph>
       <paragraph xml-lang="en-US" id="par_id6649372" role="paragraph" l10n="NEW"><ahelp hid=".">Select to smooth the screen appearance of text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT" id="bm_id9525742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT" id="bm_id9525742" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id4743797" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the smallest font size to apply antialiasing.</ahelp></paragraph>
 </case>
 </switch>
 <paragraph xml-lang="en-US" id="par_idN107A3" role="heading" level="2" l10n="NEW">Menu</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS" id="bm_id3150324" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_MENU_ICONS" id="bm_id3152562" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156056" role="heading" level="3" l10n="U"
-                 oldref="91">Show icons in menus</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="U" oldref="92"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS">Displays icons next to the corresponding menu items.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW" id="bm_id3154942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW" id="bm_id7441328" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS -->
+<!-- removed HID svx_CheckBox_OFA_TP_VIEW_CB_MENU_ICONS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS" id="bm_id052520090333263" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156056" role="heading" level="3" l10n="CHG"
+                 oldref="91">Icons in menus</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="CHG" oldref="92"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS">Displays icons next to the corresponding menu items. Select from "Automatic", "Hide" and "Show". "Automatic" displays icons according to system settings and themes.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW" id="bm_id7441328" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149262" role="heading" level="3" l10n="CHG"
                  oldref="63">Show preview of fonts</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155415" role="paragraph" l10n="CHG" oldref="64"><ahelp hid="OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW">Displays the names of selectable fonts in the corresponding font, for example, fonts in the Font box on the <emph>Formatting</emph> bar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY" id="bm_id3154511" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY" id="bm_id9274880" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY" id="bm_id9274880" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151319" role="heading" level="3" l10n="CHG"
                  oldref="68">Show font history</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153513" role="paragraph" l10n="CHG" oldref="69"><ahelp hid="OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY">Lists the last five fonts that you used in the current document at the top of the list in the <emph>Font Name</emph> box on the <emph>Formatting</emph> bar.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:RestoreEditingView" id="bm_id555742" localize="false"/><comment>UFI: i53104. This is still in Customize dialog</comment>
-<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph><comment>removed "Open windows" control, see http://specs.openoffice.org/appwide/options_settings/HardwareAcceleration.odt</comment>
+<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph>
 <paragraph xml-lang="en-US" id="par_idN10AC8" role="heading" level="2" l10n="NEW">Graphics output</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_REFRESH_VIEW" id="bm_id6835216" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id9305703" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10A1D" role="tip" l10n="NEW"><ahelp hid="20201">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10AD4" role="heading" level="3" l10n="NEW">Use hardware acceleration</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10AD8" role="paragraph" l10n="NEW"><ahelp hid=".">Directly accesses hardware features of the graphical display adapter to improve the screen display.</ahelp> The support for hardware acceleration is not available for all operating systems and platform distributions of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/810517573" id="bm_id1208200812001940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" id="bm_id1019200910503048" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id1208200812004470" role="heading" level="3" l10n="NEW">Use Anti-Aliasing</paragraph>
       <paragraph xml-lang="en-US" id="par_id1208200812004444" role="paragraph" l10n="NEW"><ahelp hid=".">When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id3147167" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id101920091058114" role="heading" level="2" l10n="NEW">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_SELECTION" id="bm_id1019200910494637" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581166" role="heading" level="3" l10n="NEW">Transparency</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1019200910581186" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the text selection in Writer and the cell selection in Calc will be shown using a transparent color. If not enabled, the selection will be shown by inverted colors.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:OFA_TP_VIEW:MF_SELECTION" id="bm_id101920091057065" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581266" role="heading" level="3" l10n="NEW">Transparency level</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1019200910581220" role="paragraph" l10n="NEW"><ahelp hid=".">Select the transparency level for transparent selections. The default value is 75%. You can select values from 10% to 90%.</ahelp></paragraph>
+<!-- removed HID OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3166432" role="heading" level="2" l10n="U"
                  oldref="47">Mouse positioning</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155530" role="paragraph" l10n="U" oldref="48"><ahelp hid="OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS">Specifies if and how the mouse pointer will be positioned in newly opened dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE" id="bm_id3146111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE" id="bm_id5366069" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE" id="bm_id5366069" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3146982" role="heading" level="2" l10n="U"
                  oldref="93">Middle mouse button</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150521" role="paragraph" l10n="U" oldref="94"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE">Defines the function of the middle mouse button.</ahelp></paragraph>
@@ -186,8 +189,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3159206" role="tablecontent" l10n="U" oldref="108">
-                  <emph>Pasting into another </emph>
-                  <emph>document</emph>
+                  <emph>Pasting into another document</emph>
                </paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/optionen/01010900.xhp b/helpcontent2/source/text/shared/optionen/01010900.xhp
index d1ce83d279..7c6458c877 100644
--- a/helpcontent2/source/text/shared/optionen/01010900.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010900.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01010900.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,44 +56,44 @@
 <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
 <paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="56">Reduce print data</paragraph>
 <paragraph role="paragraph" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="68">You can reduce the amount of data to be sent to the printer. Reducing the print data increases the print speed because the print files are smaller. This makes it easier for printers with a smaller memory to print. Reducing print data can result in slightly lower print quality.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTEROUTPUT" id="bm_id3149807" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT" id="bm_id3150868" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="57">Settings for</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT" id="bm_id3149807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT" id="bm_id3150868" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="57">Settings for</paragraph>
 <paragraph role="paragraph" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT">Specifies whether the print settings apply to direct printing or to printing to a file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY" id="bm_id3150441" localize="false"/><paragraph role="heading" id="hd_id3145786" xml-lang="en-US" level="3" l10n="U" oldref="58">Reduce transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY" id="bm_id3150441" localize="false"/><paragraph role="heading" id="hd_id3145786" xml-lang="en-US" level="3" l10n="U" oldref="58">Reduce transparency</paragraph>
 <paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY">If you mark this field the transparent objects will be printed like normal, non-transparent objects, depending on your selection in the following two option buttons.</ahelp></paragraph>
 <section id="transhint">
 <paragraph role="note" id="par_id3156444" xml-lang="en-US" l10n="U" oldref="71">Transparency cannot be output directly to a printer. The areas of the document in which transparency is to be visible must therefore always be calculated as bitmaps and sent to the printer. Depending on the size of the bitmaps and the print resolution a large amount of data may result.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO" id="bm_id3148577" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="4" l10n="U" oldref="59">Automatically</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO" id="bm_id3148577" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="4" l10n="U" oldref="59">Automatically</paragraph>
 <paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO">Specifies that the transparency is only printed if the transparent area covers less than a quarter of the entire page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE" id="bm_id3145251" localize="false"/><paragraph role="heading" id="hd_id3149417" xml-lang="en-US" level="4" l10n="U" oldref="73">No transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE" id="bm_id3145251" localize="false"/><paragraph role="heading" id="hd_id3149417" xml-lang="en-US" level="4" l10n="U" oldref="73">No transparency</paragraph>
 <paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE">With this option transparency is never printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS" id="bm_id3150113" localize="false"/><paragraph role="heading" id="hd_id3149960" xml-lang="en-US" level="3" l10n="U" oldref="60">Reduce bitmaps</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS" id="bm_id3150113" localize="false"/><paragraph role="heading" id="hd_id3149960" xml-lang="en-US" level="3" l10n="U" oldref="60">Reduce bitmaps</paragraph>
 <paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS">Specifies that bitmaps are printed with reduced quality. The resolution can only be reduced and not increased.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_OPTIMAL" id="bm_id3156181" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL" id="bm_id3155600" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="61">High/normal print quality</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL" id="bm_id3156181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL" id="bm_id3155600" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="61">High/normal print quality</paragraph>
 <paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL">High print quality corresponds to a resolution of 300dpi. Normal print quality corresponds to a resolution of 200dpi. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_RESOLUTION" id="bm_id3146900" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION" id="bm_id3156332" localize="false"/><paragraph role="heading" id="hd_id3146969" xml-lang="en-US" level="4" l10n="U" oldref="62">Resolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION" id="bm_id3146900" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION" id="bm_id3156332" localize="false"/><paragraph role="heading" id="hd_id3146969" xml-lang="en-US" level="4" l10n="U" oldref="62">Resolution</paragraph>
 <paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="SFX2_LISTBOX_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION">Specifies the maximum print quality in dpi. The resolution can only be reduced and not increased.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY" id="bm_id3146913" localize="false"/><paragraph role="heading" id="hd_id3146789" xml-lang="en-US" level="4" l10n="U" oldref="63">Include transparent objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY" id="bm_id3146913" localize="false"/><paragraph role="heading" id="hd_id3146789" xml-lang="en-US" level="4" l10n="U" oldref="63">Include transparent objects</paragraph>
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY">If this field is marked, the reduction in print quality for bitmaps also applies to the transparent areas of objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS" id="bm_id3155444" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="3" l10n="U" oldref="64">Reduce gradients</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS" id="bm_id3155444" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="3" l10n="U" oldref="64">Reduce gradients</paragraph>
 <paragraph role="paragraph" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS">If this field is marked, gradients are printed with reduced quality.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_STRIPES" id="bm_id3147338" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_NUMERICFIELD_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT" id="bm_id3150387" localize="false"/><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="4" l10n="U" oldref="65">Gradient stripes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES" id="bm_id3147338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT" id="bm_id3150387" localize="false"/><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="4" l10n="U" oldref="65">Gradient stripes</paragraph>
 <paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="SFX2_NUMERICFIELD_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT">Specifies the maximum number of gradient stripes for printing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR" id="bm_id3149259" localize="false"/><paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="4" l10n="U" oldref="66">Intermediate color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR" id="bm_id3149259" localize="false"/><paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="4" l10n="U" oldref="66">Intermediate color</paragraph>
 <paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR">Specifies that gradients are only printed in a single intermediate color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES" id="bm_id3149565" localize="false"/><paragraph role="heading" id="hd_id3147323" xml-lang="en-US" level="3" l10n="U" oldref="67">Convert colors to grayscale</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES" id="bm_id3149565" localize="false"/><paragraph role="heading" id="hd_id3147323" xml-lang="en-US" level="3" l10n="U" oldref="67">Convert colors to grayscale</paragraph>
 <paragraph role="paragraph" id="par_id3145150" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES">Specifies that all colors are printed only as grayscale.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150646" xml-lang="en-US" level="2" l10n="U" oldref="50">Printer warnings</paragraph>
 <paragraph role="paragraph" id="par_id3154022" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES">Defines which warnings appear before printing begins.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="52">Paper size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="52">Paper size</paragraph>
 <paragraph role="paragraph" id="par_id3150206" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE">Mark this check box if a certain paper size is needed for printing the current document.</ahelp> If the paper size used in the document is not provided by the current printer, you will receive an error message.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION" id="bm_id3158213" localize="false"/><paragraph role="heading" id="hd_id3155581" xml-lang="en-US" level="3" l10n="U" oldref="54">Paper orientation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION" id="bm_id3158213" localize="false"/><paragraph role="heading" id="hd_id3155581" xml-lang="en-US" level="3" l10n="U" oldref="54">Paper orientation</paragraph>
 <paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION">Mark this check box if you need a certain paper orientation for printing the current document.</ahelp> If the format used by the current document is not available from the printer, an error message will appear.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY" id="bm_id3153784" localize="false"/><paragraph role="heading" id="hd_id3149531" xml-lang="en-US" level="3" l10n="U" oldref="83">Transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY" id="bm_id3153784" localize="false"/><paragraph role="heading" id="hd_id3149531" xml-lang="en-US" level="3" l10n="U" oldref="83">Transparency</paragraph>
 <paragraph role="paragraph" id="par_id3152778" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY">Mark this check box if you always want to be warned if transparent objects are contained in the document.</ahelp> If you print such a document, a dialog appears in which you can select if the transparency is to be printed in this print instruction.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01011000.xhp b/helpcontent2/source/text/shared/optionen/01011000.xhp
index a0d18d6e4e..f9d0665c4c 100755
--- a/helpcontent2/source/text/shared/optionen/01011000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01011000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01011000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,27 +53,27 @@
 </section>
 <paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="2" l10n="U" oldref="1">Undo</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="2">Defines the maximum number of reverse steps allowed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO" id="bm_id3149234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_ED_UNDO" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:ED_UNDO" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO">You can specify the number of steps which can be undone by selecting a number from the list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="10">Graphics cache</paragraph>
 <paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="11">The graphics cache saves the graphics contained in a document in your computer's main memory. This means that the attributes of a graphic stored in the cache do not have to be re-calculated if you return to the page containing the graphic after scrolling through a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE" id="bm_id3148663" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICCACHE" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3152813" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE">Specifies the total cache size for all graphics.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE" id="bm_id3151211" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE">Specifies that objects which are larger than the selected megabytes will not be placed in the cache.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_TimeField_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
+<!-- removed HID OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME -->
+<bookmark xml-lang="en-US" branch="hid/cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
 <paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME">Specifies the time that each graphic remains in the cache in hours and minutes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156212" xml-lang="en-US" level="2" l10n="U" oldref="18">Cache for inserted objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE" id="bm_id3158407" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
 <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="CHG" oldref="21">$[officename] Quickstarter</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id3153370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up 
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up 
 </caseinline><defaultinline>Enable systray Quickstarter</defaultinline></switchinline><comment>UFI: new text seen in m187, see CWS gtkquickstart</comment></paragraph>
 <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH">Mark this check box if you want $[officename] to enable quickstart. This option is available if the Quickstart module has been installed.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01012000.xhp b/helpcontent2/source/text/shared/optionen/01012000.xhp
index 428c3069d9..96df387895 100644
--- a/helpcontent2/source/text/shared/optionen/01012000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01012000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01012000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
 <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
 <paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="3">Color scheme</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="4">Save and delete color schemes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME" id="bm_id3154898" localize="false"/>
 <paragraph role="heading" id="hd_id3153252" xml-lang="en-US" level="3" l10n="U" oldref="5">Scheme</paragraph>
 <paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME">Selects the color scheme you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME" id="bm_id3153088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME" id="bm_id3153088" localize="false"/>
 <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="7">Save</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME">Saves the current settings as a color scheme that you can reload later.</ahelp> The name is added to the <emph>Scheme</emph> box.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_NAME_SCHEME" id="bm_id3148552" localize="false"/>
 <paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="9">Name of color scheme</paragraph>
 <paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_OPTIONS_COLORCONFIG_NAME_SCHEME">Enter a name for the color scheme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME" id="bm_id3154071" localize="false"/>
 <paragraph role="heading" id="hd_id3152811" xml-lang="en-US" level="3" l10n="U" oldref="11">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME">Deletes the color scheme shown in the <emph>Scheme</emph> box. You cannot delete the Default scheme.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" id="bm_id3151380" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01013000.xhp b/helpcontent2/source/text/shared/optionen/01013000.xhp
index 6fc08e90e9..56a2539d91 100755
--- a/helpcontent2/source/text/shared/optionen/01013000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01013000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01013000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,30 +58,30 @@
 <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
 <paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="2" l10n="U" oldref="9">Miscellaneous options</paragraph>
 <paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="10">Sets accessibility options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL" id="bm_id3153881" localize="false"/><paragraph role="heading" id="hd_id3154750" xml-lang="en-US" level="3" l10n="U" oldref="23"><switchinline select="sys"><caseinline select="UNIX">
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL" id="bm_id3153881" localize="false"/><paragraph role="heading" id="hd_id3154750" xml-lang="en-US" level="3" l10n="U" oldref="23"><switchinline select="sys"><caseinline select="UNIX">
 </caseinline><defaultinline>Support assistive technology tools (program restart required)</defaultinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="UNIX">
 </caseinline><defaultinline><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL">Allows you to use assistive tools, such as external screen readers, Braille devices or speech recognition input devices. The Java Runtime Environment must be installed on your computer before you can enable assistive support.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TEXTSELECTION" id="bm_id3155342" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="27">Use text selection cursor in read-only text document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION" id="bm_id3155342" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="27">Use text selection cursor in read-only text document</paragraph>
 <paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TEXTSELECTION">Displays cursor in read-only documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="21">Use system font for user interface</paragraph>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT --><paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="21">Use system font for user interface</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT">Displays fonts in menus, dialogs, and other user interface elements using the system font settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS" id="bm_id3153627" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="15">Allow animated graphics</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS" id="bm_id3153627" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="15">Allow animated graphics</paragraph>
 <paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS">Previews animated graphics, such as GIF images, in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="17">Allow animated text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="17">Allow animated text</paragraph>
 <paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS">Previews animated text, such as blinking and scrolling, in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TIPHELP" id="bm_id3151211" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="11">Help tips disappear after</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP" id="bm_id3151211" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="11">Help tips disappear after</paragraph>
 <paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TIPHELP">Hides the <link href="text/shared/main0108.xhp" name="Help tips">Help tips</link> after the number of seconds that you enter.</ahelp> Otherwise, Help tips are displayed until you press Escape or move the cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_ACCESSIBILITYCONFIG_NF_TIPHELP" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3151043" xml-lang="en-US" level="3" l10n="U" oldref="13">Seconds</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3151043" xml-lang="en-US" level="3" l10n="U" oldref="13">Seconds</paragraph>
 <paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ACCESSIBILITYCONFIG_NF_TIPHELP">Enter the number of seconds to display the Help tips.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="2" l10n="U" oldref="3">Options for high contrast appearance</paragraph>
 <paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="U" oldref="4">High contrast is an operating system setting that changes the system color scheme to improve readability. You can decide how <item type="productname">%PRODUCTNAME</item> uses the high contrast settings of the operating system.</paragraph>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="31">Cell borders and shadows are always shown in text color when high contrast mode is active. The cell background color is ignored then.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTO_DETECT_HC" id="bm_id3159254" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="29">Automatically detect high contrast mode of operating system</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC" id="bm_id3159254" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="29">Automatically detect high contrast mode of operating system</paragraph>
 <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTO_DETECT_HC">Switches <item type="productname">%PRODUCTNAME</item> into high contrast mode when the system background color is very dark.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTOMATIC_FONT_COLOR" id="bm_id3153365" localize="false"/><paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Use automatic font color for screen display</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR" id="bm_id3153365" localize="false"/><paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Use automatic font color for screen display</paragraph>
 <paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTOMATIC_FONT_COLOR">Displays fonts in <item type="productname">%PRODUCTNAME</item> using the system color settings. This option only affects the screen display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_PAGE_PREVIEWS" id="bm_id3152941" localize="false"/><paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="3" l10n="U" oldref="7">Use system colors for page previews</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS" id="bm_id3152941" localize="false"/><paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="3" l10n="U" oldref="7">Use system colors for page previews</paragraph>
 <paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_PAGE_PREVIEWS">Applies the high contrast settings of the operating system to page previews.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01014000.xhp b/helpcontent2/source/text/shared/optionen/01014000.xhp
index 9813c22cf3..2a13f84b48 100755
--- a/helpcontent2/source/text/shared/optionen/01014000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01014000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01014000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
 <paragraph role="paragraph" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Sets the options for a remote configuration access to your personal $[officename] settings stored on an LDAP server.</ahelp> To see this tab page and to use this feature, remote configuration must be active: You need an account on an LDAP server that is running and configured to store $[officename] user settings.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="U" oldref="7">Using remote configuration, you can start a copy of $[officename] on any computer in the network with your own user data and personal configuration.</paragraph><comment>link to how-to ldap config, single signon how-to, etc</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM" id="bm_id3154515" localize="false"/>
+<!-- removed HID SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM -->
 <paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="3">Authentication Method</paragraph>
 <paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM">Choose your security mechanism for access to the LDAP server.</ahelp> Choices are Simple or Kerberos.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME" id="bm_id3155629" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME -->
 <paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="4">User name</paragraph>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME">Using "simple" authentication method, you enter your user name on the LDAP server here.</ahelp> Using "Kerberos", you just see your user name, but cannot edit it.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD" id="bm_id3149294" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD -->
 <paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="5">Password</paragraph>
 <paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD">Using "simple" authentication method, enter your password for access to the LDAP server here.</ahelp> Using "Kerberos", this box is not active.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD" id="bm_id3148664" localize="false"/>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD -->
 <paragraph role="heading" id="hd_id3146795" xml-lang="en-US" level="2" l10n="U" oldref="6">Save password</paragraph>
 <paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD">Using "simple" authentication method, check this box to make your password persistent.</ahelp> If the password is persistent and the same user starts $[officename] later on, the user name and password will not be requested again. Using "Kerberos", this box is not active.</paragraph>
 <paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="12">The password will be stored encrypted in a file called .ssop in your <switchinline select="sys"><caseinline select="UNIX">home directory 
diff --git a/helpcontent2/source/text/shared/optionen/01020000.xhp b/helpcontent2/source/text/shared/optionen/01020000.xhp
index 5e96f60869..5bb4e7a25e 100755
--- a/helpcontent2/source/text/shared/optionen/01020000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01020100.xhp b/helpcontent2/source/text/shared/optionen/01020100.xhp
index 1e07a71462..331d2aa45c 100644
--- a/helpcontent2/source/text/shared/optionen/01020100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,28 +52,28 @@
 </section>
 <paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for the <link href="text/shared/00/00000002.xhp#proxy" name="proxy server">proxy server</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE">Specifies the type of proxy definition.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="4" l10n="U" oldref="10">None</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="11">Accesses the Internet without a proxy server. Allows you to set up a connection directly on your computer to an Internet provider that does not use a proxy.</paragraph>
 <paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="4" l10n="U" oldref="14">Manual</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="15">Lets you enter the proxy server manually. Specify the proxy servers in accordance with your Internet service. Ask your system administrator for the proxies and ports to enter.</paragraph>
-<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.sun.com, not http://www.sun.com.</paragraph>
+<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.example.com, not http://www.example.com.</paragraph>
 <paragraph role="heading" id="par_idN10684" xml-lang="en-US" level="4" l10n="NEW">System</paragraph>
 <paragraph role="paragraph" id="par_idN10688" xml-lang="en-US" l10n="NEW">On Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to use the system settings. You must restart %PRODUCTNAME to initiate this setting.<comment>UFI: see spec "System-Settings"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
 <paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#http" name="HTTP">HTTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
 <paragraph role="paragraph" id="par_id5319071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Type the name of the proxy server for HTTPS. Type the port in the right-hand field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#ftp" name="FTP">FTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
 <paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR">Specifies the names of the servers that do not require any proxy servers, separated by semicolons.</ahelp> These are servers addressed in your local network, and servers used for video and audio streaming, for example.</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="26">You can also use placeholders for the names of hosts and domains. For example, type *.sun.com to address all the hosts in the sun.com domain without proxy.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT">Type the port for the corresponding proxy server.</ahelp> The maximum value of a port number is fixed at 65535.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
index 5e42cea524..7629fa533d 100755
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,25 +53,25 @@
 <embed href="text/shared/guide/hyperlink_search.xhp#hyperlink_search"/>
 <paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="7">Search in</paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="8">Specifies the search engine and its corresponding configuration.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
 <paragraph role="heading" id="hd_id3154515" xml-lang="en-US" level="3" l10n="U" oldref="9">Search engines</paragraph>
 <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:LB_SEARCH">Displays the available search engines.</ahelp> Select a search engine to display its configuration in the adjacent text and option boxes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME" id="bm_id3153562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME" id="bm_id3153562" localize="false"/>
 <paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="11">Name</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME">Displays the name of the selected search engine.</ahelp> This is the name that will be shown in the sub-menu of the <emph>Search</emph> icon on the Hyperlink bar. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_AND" id="bm_id3148943" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_OR" id="bm_id3148946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_EXACT" id="bm_id3147264" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR" id="bm_id3148946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT" id="bm_id3147264" localize="false"/>
 <paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
 <paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_EXACT">Sets the advanced search preferences (and, or, exact) as well as the way the results are defined and displayed.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="15">The links <emph>And, Or</emph> and <emph>Exactly</emph> are available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_URL" id="bm_id3154365" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL" id="bm_id3154365" localize="false"/>
 <paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="17">Prefix</paragraph>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_URL">This text box displays the URL and the first part of the query command for a search machine. A URL can also be typed directly.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX" id="bm_id3151041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX" id="bm_id3151041" localize="false"/>
 <paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="22">Suffix</paragraph>
 <paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="23">The search terms are passed between the prefix and the suffix.<ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX">The suffix provides the command sequence, sent at the end of a search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR" id="bm_id3145171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR" id="bm_id3145171" localize="false"/>
 <paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="24">Separator</paragraph>
 <paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR">If you type more than one word while running a search, these words will be separated by the character specified here.</ahelp> Most search engines require the "+" character.</paragraph>
 <paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="27">To determine which prefixes, separators and suffixes to use when defining a new search engine:</paragraph>
@@ -95,20 +92,20 @@
 <paragraph role="listitem" id="par_id3147213" xml-lang="en-US" l10n="U" oldref="32">Compare the URLs with the sample URLs in the fields of this dialog and make a note of the prefixes, suffixes and separators used.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:ED_CASE" id="bm_id3153363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE" id="bm_id3153363" localize="false"/>
 <paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="33">Case match</paragraph>
 <paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:ED_CASE">Determines the case match for running a search.</ahelp> The list contains the following entries: <emph>None</emph>, <emph>Upper</emph> and <emph>Lower</emph>. The search terms entered are converted according to your selection.</paragraph>
 <paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="35">Search engines handle queries differently according to the way they are constructed. For example, some are case sensitive and some are not. Because of this, it is best to select <emph>None</emph> as the case match option.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_NEW" id="bm_id3148455" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW" id="bm_id3148455" localize="false"/>
 <paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="44">New</paragraph>
 <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_NEW">Use this button to include a new search engine.</ahelp><emph>New</emph> deletes all important entries of the entry mask such as "Name" and "Suffix". Enter the new search engine together with all of the necessary details. As soon as you accept your entries with <emph>Add</emph>, the new search engine will appear in the search engine list under <emph>Search in</emph>. Close the dialog with the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_ADD" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD" id="bm_id3149581" localize="false"/>
 <paragraph role="heading" id="hd_id3145254" xml-lang="en-US" level="3" l10n="U" oldref="36">Add</paragraph>
 <paragraph role="paragraph" id="par_id3144767" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_ADD">Click this button to add a new configuration to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_CHANGE" id="bm_id3154018" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE" id="bm_id3154018" localize="false"/>
 <paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="38">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_CHANGE">Click this button to apply the modifications made to an existing configuration.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_DELETE" id="bm_id3154164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE" id="bm_id3154164" localize="false"/>
 <paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="3" l10n="U" oldref="40">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_DELETE">Click this button to delete the selected search engine from the list. There will be no security response.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01020300.xhp b/helpcontent2/source/text/shared/optionen/01020300.xhp
index 693fba4192..d64a62724b 100644
--- a/helpcontent2/source/text/shared/optionen/01020300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,9 +46,9 @@
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">On UNIX systems, specifies the e-mail program to use when you send the current document as e-mail.</paragraph>
 <switch select="sys">
 <case select="UNIX">
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_MAIL_ED_MAILERURL" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">E-mail program</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">E-mail program</paragraph>
 <paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid="703252484">Enter the e-mail program path and name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_MAIL_PB_MAILERURL" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
 <paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid="703255045">Opens a file dialog to select the e-mail program.</ahelp></paragraph>
 </case>
 </switch></body>
diff --git a/helpcontent2/source/text/shared/optionen/01020400.xhp b/helpcontent2/source/text/shared/optionen/01020400.xhp
index 23d72c8c4d..30fc99d0dc 100644
--- a/helpcontent2/source/text/shared/optionen/01020400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020400.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,39 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedoptionen01020400xhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mozilla Plug-in</title>
-<filename>/text/shared/optionen/01020400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="mozilla">
-<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/optionen/01020400.xhp">Mozilla/Netscape Plug-in</link></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
-<paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="CHG">The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Mozilla plug-in.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW">The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Mozilla plug-in and chose to open the document with %PRODUCTNAME when you were first asked.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US" l10n="NEW">The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Mozilla plug-in. When you click the <emph>Edit File</emph> icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_MOZPLUGIN_CB_MOZPLUGIN_CODE" id="bm_id337229" localize="false"/><paragraph role="heading" id="par_idN105F5" xml-lang="en-US" level="2" l10n="NEW">Viewing of %PRODUCTNAME and MS Office documents in Mozilla/Netscape enabled</paragraph>
-<paragraph role="paragraph" id="par_idN105F9" xml-lang="en-US" l10n="CHG"><ahelp hid="736117762">Enables the Mozilla plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">The plug-in needs a version of Mozilla 1.x, Netscape 6.x, or Netscape 7.x installed on your system.</paragraph>
+      <topic id="textsharedoptionen01020400xhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Browser Plug-in</title>
+         <filename>/text/shared/optionen/01020400.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><variable id="mozilla"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105D5" role="paragraph" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105D8" role="paragraph" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN105DE" role="paragraph" l10n="CHG">The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Browser Plug-in.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN105E2" role="paragraph" l10n="NEW">The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Browser Plug-in and chose to open the document with %PRODUCTNAME when you were first asked.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN105E6" role="paragraph" l10n="NEW">The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Browser Plug-in. When you click the <emph>Edit File</emph> icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE" id="bm_id337229" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN105F5" role="heading" level="2" l10n="CHG">Display documents in browser</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105F9" role="paragraph" l10n="CHG"><ahelp hid="736117762">Enables the Browser Plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">The plug-in needs a version of Mozilla, Netscape, or Firefox installed on your system.</paragraph>
 <switch select="sys">
-<case select="WIN"><section id="relatedtopics">
-<embed href="text/shared/guide/activex.xhp#activex"/>
-</section>
+<case select="WIN">
+<section id="relatedtopics">
+         <embed href="text/shared/guide/activex.xhp#activex"/>
+      </section>
 </case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index 672fe43cfe..f57b9f4824 100755
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,33 +27,37 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Internet options</title>
-<filename>/text/shared/optionen/01030000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-01T11:02:49">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="1" l10n="U" oldref="1">Internet options</paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="2"><variable id="laden"><ahelp hid=".">Specifies Internet settings.</ahelp>
+      <topic id="textsharedoptionen01030000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Internet options</title>
+         <filename>/text/shared/optionen/01030000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="1" l10n="U" oldref="1">Internet options</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="U" oldref="2"><variable id="laden"><ahelp hid=".">Specifies Internet settings.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#internet"/>
-</section>
-<embed href="text/shared/optionen/01020100.xhp#proxyserver"/>
-<embed href="text/shared/optionen/01020200.xhp#suche"/>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#internet"/>
+      </section>
+      <embed href="text/shared/optionen/01020100.xhp#proxyserver"/>
+      <embed href="text/shared/optionen/01020200.xhp#suche"/>
 <switch select="sys">
 <case select="UNIX"><embed href="text/shared/optionen/01020300.xhp#email"/>
 </case>
+<case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
+</case>
 </switch>
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+<switch select="sys">
+<case select="MAC">
+</case>
+<default><embed href="text/shared/optionen/01020300.xhp#email"/>
+</default>
+</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+      <embed href="text/shared/00/00000001.xhp#zurueck"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
index 105bfe0fb8..a742a2ca7e 100755
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01030300.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,73 +43,60 @@
 <section id="security">
 <bookmark xml-lang="en-US" branch="index" id="bm_id2322153"><bookmark_value>macros;selecting security warnings</bookmark_value>
 <bookmark_value>security;options for documents with macros</bookmark_value>
-<bookmark_value>saving;with password by default</bookmark_value>
-<bookmark_value>user data;removing when saving</bookmark_value>
-<bookmark_value>file sharing options for current document</bookmark_value>
+
+
 <bookmark_value>macros;security</bookmark_value>
-<bookmark_value>read-only documents;opening documents as</bookmark_value>
-</bookmark><comment>mw corrected a typo in "file ..." and changed "read-only documents;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX_TABPAGE_RID_SVXPAGE_INET_SCRIPTING" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030300.xhp" name="Security">Security</link></paragraph>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX_TABPAGE_RID_SVXPAGE_INET_SCRIPTING">Defines the security options for saving documents and for opening documents that contain macros.</ahelp></paragraph>
+
+</bookmark><comment>ufi moved 4 entries to new file shared/01/01100600.xhp - cws tl79</comment><comment>mw corrected a typo in "file ..." and changed "read-only documents;..."</comment>
+<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030300.xhp" name="Security">Security</link></paragraph>
+<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Defines the security options for saving documents, for web connections, and for opening documents that contain macros.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#scripting"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/703992332" id="bm_id9049653" localize="false"/><comment>UFI: this converts to "MACROSECURITY" help id using the m237 hid.lst - bug?</comment><paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS" id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
 <paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the "Security options and warning" dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SAVEORSENDDOCS" id="bm_id5852534" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498061" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_PRINTDOCS" id="bm_id2789696" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498065" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
-<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SIGNDOCS" id="bm_id1294289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498063" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
-<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_CREATEPDF" id="bm_id1584215" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498067" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_REMOVEPERSINFO" id="bm_id7565233" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498070" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Delete</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMPASSWD" id="bm_id6656086" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498072" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
+<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
+<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
+<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
+<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
+<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
 <paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="CHG"><ahelp hid="703988744">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1242498074" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
 <paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="2" l10n="NEW">Passwords for web connections</paragraph>
 <paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW">You can enter a master password to enable easy access to sites that require a user name and password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/703988750" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
 <paragraph role="paragraph" id="par_id1909848" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, %PRODUCTNAME will securely store all passwords that you use to access files from web servers. You can retrieve the passwords from the list after you enter the master password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/703992335" id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" xml-lang="en-US" level="3" l10n="NEW">Master Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD" id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" xml-lang="en-US" level="3" l10n="NEW">Master Password</paragraph>
 <paragraph role="paragraph" id="par_id4571977" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Enter Master Password dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_CRT" id="bm_id8224738" localize="false"/><paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_REPEAT" id="bm_id8702047" localize="false"/><paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password again.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_ED_MASTERPASSWORD" id="bm_id2005981" localize="false"/><paragraph role="paragraph" id="par_id7499313" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password to continue.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/703992337" id="bm_id4279915" localize="false"/><paragraph role="heading" id="hd_id3283486" xml-lang="en-US" level="3" l10n="NEW">Show Passwords</paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT" id="bm_id8224738" localize="false"/><paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT" id="bm_id8702047" localize="false"/><paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password again.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD" id="bm_id2005981" localize="false"/><paragraph role="paragraph" id="par_id7499313" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password to continue.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS" id="bm_id2005777" localize="false"/><paragraph role="heading" id="hd_id3283486" xml-lang="en-US" level="3" l10n="CHG">Connections</paragraph>
 <paragraph role="paragraph" id="par_id3472090" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Asks for the master password. If master password is correct, shows the Stored Web Connection Information dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3289590" xml-lang="en-US" l10n="NEW">The Stored Web Connection Information dialog shows a list of web sites and user names that you entered previously. You can select any entry and remove it from the list. You can view the password for the selected entry.</paragraph><comment>Remove</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518028" id="bm_id6843775" localize="false"/><paragraph role="paragraph" id="par_id7499008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph><comment>Remove All</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518029" id="bm_id7979369" localize="false"/><paragraph role="paragraph" id="par_id7021088" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes all entries from the list.</ahelp></paragraph><comment>Change Password</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518030" id="bm_id48524" localize="false"/><paragraph role="paragraph" id="par_id1981261" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can view and change the password for the selected entry.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE" id="bm_id6843775" localize="false"/><paragraph role="paragraph" id="par_id7499008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph><comment>Remove All</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL" id="bm_id7979369" localize="false"/><paragraph role="paragraph" id="par_id7021088" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes all entries from the list.</ahelp></paragraph><comment>Change Password</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE" id="bm_id48524" localize="false"/><paragraph role="paragraph" id="par_id1981261" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can view and change the password for the selected entry.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10687" xml-lang="en-US" level="2" l10n="NEW">Macro security</paragraph>
 <paragraph role="paragraph" id="par_idN1068B" xml-lang="en-US" l10n="NEW">Adjust the security level for executing macros and specify trusted macro authors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MACROSEC" id="bm_id3726920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703992340" id="bm_id4459669" localize="false"/><paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3" l10n="NEW">Macro Security</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC" id="bm_id3726920" localize="false"/>
+<paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3" l10n="NEW">Macro Security</paragraph>
 <paragraph role="paragraph" id="par_idN10692" xml-lang="en-US" l10n="NEW"><ahelp hid="703992332">Opens the <emph>Macro Security</emph> dialog.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options for this document</paragraph>
-<paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">The following options are valid only for the current document:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMREADONLY" id="bm_id8295846" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703988758" id="bm_id1275368" localize="false"/><paragraph role="heading" id="par_idN106AA" xml-lang="en-US" level="3" l10n="NEW">Open this document in read-only mode</paragraph>
-<paragraph role="paragraph" id="par_idN106AE" xml-lang="en-US" l10n="NEW"><ahelp hid="703988750">Select to allow this document to be opened in read-only mode only.</ahelp></paragraph>
-<paragraph role="note" id="par_idN106B1" xml-lang="en-US" l10n="NEW">This file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECORDCHANGES" id="bm_id868861" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703988759" id="bm_id2421033" localize="false"/><paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
-<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid="703988751">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
-<paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without the password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_PROTRECORDS" id="bm_id2517166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703992344" id="bm_id2506485" localize="false"/><paragraph role="heading" id="par_idN106D0" xml-lang="en-US" level="3" l10n="NEW">Protect / Unprotect</paragraph>
-<paragraph role="paragraph" id="par_idN106D4" xml-lang="en-US" l10n="NEW"><ahelp hid="703992336">Protects the change recording state with a password. If change recording is protected for the current document, the button is named <emph>Unprotect</emph>. Click <emph>Unprotect</emph> and type the correct password to disable the protection.</ahelp></paragraph>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index ba421fb4e6..e734f5ed4b 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01030500.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedoptionen01030500xml" indexer="include" status="PUBLISH">
@@ -47,70 +44,70 @@
 <body>
 <section id="html">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>$[officename] Basic scripts in HTML documents</bookmark_value>
+<bookmark_value>HTML;compatibility settings</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT" id="bm_id3148491" localize="false"/>
+<!-- removed HID OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT -->
 <paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030500.xhp" name="HTML compatibility">HTML compatibility</link></paragraph>
 <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT">Defines settings for HTML pages.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#html"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE1" id="bm_id3154286" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE2" id="bm_id3154143" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE3" id="bm_id3156153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE4" id="bm_id3153666" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE5" id="bm_id3156330" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE6" id="bm_id3150504" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7" id="bm_id3153562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE1" id="bm_id6074098" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE2" id="bm_id8064821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE3" id="bm_id7630542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE4" id="bm_id5698416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE5" id="bm_id9110080" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE6" id="bm_id494399" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE7" id="bm_id534684" localize="false"/>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE1 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE2 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE3 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE4 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE5 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE6 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7 -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1" id="bm_id6074098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2" id="bm_id8064821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3" id="bm_id7630542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4" id="bm_id5698416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5" id="bm_id9110080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6" id="bm_id494399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7" id="bm_id534684" localize="false"/>
 <paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Font sizes</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7">Use the spin buttons <emph>Size 1</emph> to <emph>Size 7</emph> to define the respective font sizes for the HTML &lt;font size=1&gt; to &lt;font size=7&gt; tags.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="2" l10n="U" oldref="5">Import</paragraph>
 <paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="6">Defines the settings for importing HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
 <paragraph role="heading" id="hd_id6065248" xml-lang="en-US" level="3" l10n="NEW">Use 'English (USA)' locale for numbers</paragraph>
 <paragraph role="paragraph" id="par_id8023926" xml-lang="en-US" l10n="CHG">When importing numbers from an HTML page, the decimal separator and the thousands separator characters differ according to the locale of the HTML page. The clipboard however contains no information about the locale. For example, the characters "1.000" copied from a German Web page most possibly mean "one thousand" because the period is the thousands separator in a German locale. If copied from an English Web page, the same characters stand for the number 1 as in "one dot zero zero zero".</paragraph>
-<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Tools - Options - Language Settings - Language of - Locale setting</emph>. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id3147559" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
+<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Language Settings - Language of - Locale setting</emph> in the Options dialog box. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
 <paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="7">Import unknown HTML tags as fields</paragraph>
 <paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS">Mark this check box if you want <link href="text/shared/00/00000002.xhp#tags" name="tags">tags</link> that are not recognized by $[officename] to be imported as fields.</ahelp> For an opening tag, an HTML_ON field will be created with the value of the tag name. For a closing tag, an HTML_OFF will be created. These fields will be converted to tags in the HTML export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES" id="bm_id3154217" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_IGNORE_FONTNAMES" id="bm_id5614185" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES" id="bm_id5614185" localize="false"/>
 <paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="3" l10n="U" oldref="43">Ignore font settings</paragraph>
 <paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES">Mark this check box to ignore all font settings when importing. The fonts that were defined in the HTML Page Style will be the fonts that will be used. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT" id="bm_id3154123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_EXPORT" id="bm_id1028473" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT" id="bm_id1028473" localize="false"/>
 <paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="2" l10n="U" oldref="9">Export</paragraph>
 <paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT">Defines the settings for exporting HTML documents.</ahelp> To export in HTML format select the <emph>HTML Document</emph> file type in the <link href="text/shared/01/01070000.xhp" name="Save As"><emph>Save As</emph></link> dialog. You can find further instructions in the <link href="text/shared/00/00000020.xhp" name="Import and export filters">Import and export filters</link> description.</paragraph>
 <paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="42">To optimize the HTML export, select a browser or HTML standard from the Export box. If "$[officename] Writer" is selected, specific $[officename] Writer instructions are exported.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC" id="bm_id3150441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC" id="bm_id4532609" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC" id="bm_id4532609" localize="false"/>
 <paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="16">$[officename] Basic</paragraph>
 <paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC">Mark this check box to include the $[officename] Basic instructions when exporting to HTML format.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="29">You must activate this option before you create the $[officename] Basic Script, since otherwise it will not be inserted. $[officename] Basic Scripts must be located in the header of the HTML document. Once you have created the macro in the $[officename] Basic IDE, it appears in the source text of the HTML document in the header.</paragraph>
-<paragraph role="tip" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="40">If you want the macro to run automatically when the HTML document is opened, choose <emph>Tools - Customize - Events</emph>. Select the "Document" check box and "Open Document" in the Events list. In <emph>Macros</emph> select your document, its standard library, module1 and the macro and click <emph>Assign</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING" id="bm_id3149420" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC_WARNING" id="bm_id1735892" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING" id="bm_id1735892" localize="false"/>
 <paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="45">Display warning</paragraph>
 <paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="CHG" oldref="46"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING">If this field is marked, when exporting to HTML a warning is shown that %PRODUCTNAME Basic macros will be lost.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id3150113" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
 <paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="28">Print layout</paragraph>
 <paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename] as well as Netscape Navigator from 4.0 and above and by MS Internet Explorer from 4.0 and above.</paragraph>
 <paragraph role="note" id="par_id3156276" xml-lang="en-US" l10n="U" oldref="41">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id3145799" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
 <paragraph role="heading" id="hd_id3144764" xml-lang="en-US" level="3" l10n="U" oldref="24">Copy local graphics to Internet</paragraph>
 <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using FTP. Use the <emph>Save As</emph> dialog to save the document and enter a complete FTP URL as the file name in the Internet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET" id="bm_id3145644" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_CHARSET" id="bm_id9777520" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET" id="bm_id9777520" localize="false"/>
 <paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="48">Character set</paragraph>
 <paragraph role="paragraph" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET">Select the appropriate character set for the export</ahelp>.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01040000.xhp b/helpcontent2/source/text/shared/optionen/01040000.xhp
index ed4aee9c79..8d889c72a5 100644
--- a/helpcontent2/source/text/shared/optionen/01040000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,10 +55,10 @@
 <paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Western)">Basic Fonts (Western)</link></paragraph>
 <paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="3">Specifies the settings for the basic fonts.</paragraph>
 <paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Asian)">Basic Fonts (Asian)</link></paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph>Tools - Options - Language Settings - Languages.</emph>
+<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</emph>
 </paragraph>
 <paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (CTL)">Basic Fonts (CTL)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
 <embed href="text/shared/optionen/01040400.xhp#drucken"/>
 <embed href="text/shared/optionen/01040500.xhp#tabelle"/>
 <embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 862109002b..6401124aee 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040200.xhp,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
 <bookmark_value>drawings; showing (Writer)</bookmark_value>
 <bookmark_value>controls; showing (Writer)</bookmark_value>
 <bookmark_value>fields;displaying field codes (Writer)</bookmark_value>
-<bookmark_value>displaying; notes in text documents</bookmark_value>
+<bookmark_value>displaying; comments in text documents</bookmark_value>
 </bookmark><comment>mw made "field..." a two level entry</comment><paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040200.xhp" name="View">View</link></paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Defines the default settings for displaying objects in your text documents and also the default settings for the window elements.</ahelp></paragraph>
 </section>
@@ -73,50 +70,50 @@
 </section>
 <paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3">Guides</paragraph>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="4">Specifies settings that refer to the representation of boundaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
 <paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays guides around the frames when frames are moved. You can select the<emph> Guides while moving </emph>option to show the exact position of the object using lineal values.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE">Displays the handles (the eight points on a delimiting rectangle) as simple squares without 3D effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_BIGHANDLE">Displays larger sized handles (the eight points on a delimiting rectangle).</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="11">View</paragraph>
 <paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="12">Specifies whether scrollbars and rulers are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HSCROLL" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal scrollbar</paragraph>
 <paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HSCROLL">Displays the horizontal scrollbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VSCROLL" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical scrollbar</paragraph>
 <paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_VSCROLL">Displays the vertical scrollbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_ANY_RULER" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="3" l10n="U" oldref="65">Ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="3" l10n="U" oldref="65">Ruler</paragraph>
 <paragraph role="paragraph" id="par_id3154126" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_ANY_RULER">Enables the rulers. Use the following two check boxes to select the ruler(s) to be shown.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HRULER" id="bm_id3156422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_HMETRIC" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HRULER" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal ruler</paragraph>
 <paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_HMETRIC">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_VMETRIC" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VRULER" id="bm_id3125863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical ruler</paragraph>
 <paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_VMETRIC">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER_RIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="62">Right-aligned</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="62">Right-aligned</paragraph>
 <embed href="text/shared/00/00000007.xhp#asiahinweis"/>
 <paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER_RIGHT">Aligns the vertical ruler with the right border.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_SMOOTH_SCROLL" id="bm_id3152938" localize="false"/><paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="27">Smooth scroll</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL" id="bm_id3152938" localize="false"/><paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="27">Smooth scroll</paragraph>
 <paragraph role="paragraph" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_SMOOTH_SCROLL">Activates the smooth page scrolling function. </ahelp> The scrolling speed depends of the area and of the color depth display.</paragraph>
 <paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="2" l10n="U" oldref="34">Display</paragraph>
 <paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="35">Defines which document elements are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF" id="bm_id3153728" localize="false"/><paragraph role="heading" id="hd_id3153143" xml-lang="en-US" level="3" l10n="U" oldref="36">Graphics and objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_GRF" id="bm_id3153728" localize="false"/><paragraph role="heading" id="hd_id3153143" xml-lang="en-US" level="3" l10n="U" oldref="36">Graphics and objects</paragraph>
 <paragraph role="paragraph" id="par_id3149261" xml-lang="en-US" l10n="U" oldref="37"><variable id="grafikenaus"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF">Specifies whether to display graphics and objects on the screen.</ahelp>
 </variable> If these elements are hidden, you will see empty frames as placeholders.</paragraph>
 <paragraph role="paragraph" id="par_id3154944" xml-lang="en-US" l10n="CHG" oldref="38">You can also control the display of graphics through the <link href="text/swriter/02/18120000.xhp" name="Graphics"><emph>Graphics On/Off</emph></link> icon. If a text document is open, this icon is displayed on the <emph>Tools</emph> bar.</paragraph>
 <paragraph role="note" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="39">If the <emph>Graphics and objects </emph>option is not selected, no graphics will be loaded from the Internet. Graphics within a table and without an indication of their size can cause display problems when using an older HTML standard on the browsed page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph>
 <paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL">Displays the tables contained in your document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_VIEW_TABLEGRID" id="bm_id3119506" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3155443" localize="false"/><paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid=".uno:TableBoundaries">To display the table boundaries, right-click any table and choose <emph>Table Boundaries</emph>, or choose <emph>Table - Table Boundaries</emph> in a Writer document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph>
 <paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST">Displays the drawings and controls contained in your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD" id="bm_id3145230" localize="false"/><paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="3" l10n="U" oldref="44">Field codes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_FIELD" id="bm_id3145230" localize="false"/><paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="3" l10n="U" oldref="44">Field codes</paragraph>
 <paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="45"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD">Displays the field names in the document instead of the contents of the fields.</ahelp> You can also choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Fields</emph></link> in a text document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays notes. Click a note to edit the text. Use the context menu in Navigator to locate or delete a note. Use the note's context menu to delete this note or all notes or all notes of this author.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays comments. Click a comment to edit the text. Use the context menu in Navigator to locate or delete a comment. Use the comments's context menu to delete this comment or all comments or all comments of this author.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147001" xml-lang="en-US" level="2" l10n="U" oldref="63">Settings (for HTML document only)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3149926" xml-lang="en-US" level="3" l10n="U" oldref="58">Measurement unit (for HTML document only)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_METRIC" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3149926" xml-lang="en-US" level="3" l10n="U" oldref="58">Measurement unit (for HTML document only)</paragraph>
 <paragraph role="paragraph" id="par_id3154716" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC">Specifies the <link href="text/shared/00/00000003.xhp#metrik" name="Unit">Unit</link> for HTML documents.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01040300.xhp b/helpcontent2/source/text/shared/optionen/01040300.xhp
index 9706d7330c..1a123d5f00 100755
--- a/helpcontent2/source/text/shared/optionen/01040300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,38 +55,38 @@
 <paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
 <paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_STD_FONT">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18">These settings define the basic fonts for the predefined templates. You can also modify or customize the <link href="text/shared/optionen/01040301.xhp" name="default text templates">default text templates</link>.</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#grundschriften"/>
 </section>
 <paragraph role="heading" id="hd_id3152811" xml-lang="en-US" level="2" l10n="U" oldref="3">Basic fonts</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_STANDARD" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_STANDARD" id="bm_id3151211" localize="false"/>
 <paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="4">Default</paragraph>
 <paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_STANDARD">Specifies the font to be used for the <emph>Default</emph> Paragraph Style.</ahelp> The <emph>Default</emph> Paragraph Style font is used for nearly all Paragraph Styles, unless the Paragraph Style explicitly defines another font.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_STANDARD_SIZE" id="bm_id7955870" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_TITLE_SIZE" id="bm_id5661793" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_LIST_SIZE" id="bm_id2680745" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_LABEL_SIZE" id="bm_id9615466.00000001" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_INDEX_SIZE" id="bm_id426648" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE" id="bm_id7955870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE" id="bm_id5661793" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE" id="bm_id2680745" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE" id="bm_id9615466.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE" id="bm_id426648" localize="false"/>
 <paragraph role="heading" id="hd_id573137" xml-lang="en-US" level="3" l10n="NEW">Size</paragraph>
 <paragraph role="paragraph" id="par_id7700735" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the size of the font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_TITLE" id="bm_id3154909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_TITLE" id="bm_id3154909" localize="false"/>
 <paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="3" l10n="U" oldref="6">Heading</paragraph>
 <paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_TITLE">Specifies the font to be used for headings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_LIST" id="bm_id3152922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_LIST" id="bm_id3152922" localize="false"/>
 <paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="8">List</paragraph>
 <paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_LIST">Specifies the fonts for lists and numbering and all derived styles.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="10">When you choose <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets"><emph>Format - Numbering/Bullets</emph></link>
 </caseinline><defaultinline>
 <emph>Format - Numbering/Bullets</emph></defaultinline></switchinline> to format a paragraph with numbers or bullets in a text document, the program assigns these Paragraph Styles automatically.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_LABEL" id="bm_id3155307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_LABEL" id="bm_id3155307" localize="false"/>
 <paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="U" oldref="11">Caption</paragraph>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_LABEL">Specifies the font used for the captions of images and tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_IDX" id="bm_id3149667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_IDX" id="bm_id3149667" localize="false"/>
 <paragraph role="heading" id="hd_id3152463" xml-lang="en-US" level="3" l10n="U" oldref="13">Index</paragraph>
 <paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_IDX">Specifies the font used for indexes, alphabetical indexes, and tables of contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_STD_FONT_CB_DOCONLY" id="bm_id3148577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_STD_FONT:CB_DOCONLY" id="bm_id3148577" localize="false"/>
 <paragraph role="heading" id="hd_id3150103" xml-lang="en-US" level="3" l10n="U" oldref="15">Current document only</paragraph>
 <paragraph role="paragraph" id="par_id3083444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW_CHECKBOX_TP_STD_FONT_CB_DOCONLY">Specifies that the settings apply to the current document only.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#standard"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040301.xhp b/helpcontent2/source/text/shared/optionen/01040301.xhp
index a841edc9ef..8e320903c7 100755
--- a/helpcontent2/source/text/shared/optionen/01040301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040301.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040301.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 0be229b14a..bfc17e6196 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01040400.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,15 +31,14 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Print</title>
-<filename>/text/shared/optionen/01040400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="drucken">
+      <topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Print</title>
+         <filename>/text/shared/optionen/01040400.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="drucken">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>pictures; printing</bookmark_value>
 <bookmark_value>tables in text; printing</bookmark_value>
 <bookmark_value>drawings; printing in text documents </bookmark_value>
@@ -59,70 +54,88 @@
 <bookmark_value>reversing printing order</bookmark_value>
 <bookmark_value>brochures; printing several</bookmark_value>
 <bookmark_value>printing; brochures</bookmark_value>
-<bookmark_value>notes; printing in text</bookmark_value>
+<bookmark_value>comments; printing in text</bookmark_value>
 <bookmark_value>printing; creating individual jobs</bookmark_value>
 <bookmark_value>faxes;selecting a fax machine</bookmark_value>
 </bookmark><comment>mw made "fax machine selection" a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#drucken1"/>
-</section>
-<paragraph role="note" id="par_id3153542" xml-lang="en-US" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent documents. If you only want to change the settings for the current document, use the <emph>Options</emph> button in the<emph> File - Print</emph> dialog.</paragraph>
-<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="2" l10n="U" oldref="3">Contents</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="5">Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="7">Tables</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="3" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="11">Controls</paragraph>
-<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="13">Background</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="3" l10n="U" oldref="40">Print black</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/><paragraph role="heading" id="hd_id8004394" xml-lang="en-US" level="3" l10n="NEW">Hidden text</paragraph>
-<paragraph role="paragraph" id="par_id2021546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/><paragraph role="heading" id="hd_id2623981" xml-lang="en-US" level="3" l10n="NEW">Text placeholder</paragraph>
-<paragraph role="paragraph" id="par_id7242042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
-<paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="2" l10n="U" oldref="15">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/><paragraph role="heading" id="hd_id3150874" xml-lang="en-US" level="3" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3152885" xml-lang="en-US" level="3" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3148577" xml-lang="en-US" level="3" l10n="U" oldref="21">Reversed</paragraph>
-<paragraph role="paragraph" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order.</ahelp> The last page of the document will then be the first one printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/><paragraph role="heading" id="hd_id3147318" xml-lang="en-US" level="3" l10n="U" oldref="23">Brochure</paragraph>
-<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
-<section id="brochure">
-<paragraph role="paragraph" id="par_id3149410" xml-lang="en-US" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the <emph>Right pages</emph> option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the <emph>Left pages</emph> option marked.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/><paragraph role="heading" id="hd_id9475386" xml-lang="en-US" level="3" l10n="NEW">Right to left</paragraph>
-<paragraph role="paragraph" id="par_id7894222" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149300" xml-lang="en-US" level="2" l10n="U" oldref="26">Notes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/><paragraph role="heading" id="hd_id3150095" xml-lang="en-US" level="3" l10n="U" oldref="28">None</paragraph>
-<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that notes in your document are not printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/><paragraph role="heading" id="hd_id3155601" xml-lang="en-US" level="3" l10n="U" oldref="30">Notes only</paragraph>
-<paragraph role="paragraph" id="par_id3146988" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that notes in your document are printed, but not the actual text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/><paragraph role="heading" id="hd_id3153839" xml-lang="en-US" level="3" l10n="U" oldref="32">End of document</paragraph>
-<paragraph role="paragraph" id="par_id3146789" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that notes are printed at the end of the document, after the actual text. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="3" l10n="U" oldref="34">End of page</paragraph>
-<paragraph role="paragraph" id="par_id3154360" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that notes are printed on an extra page that follows each page containing notes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148916" xml-lang="en-US" level="2" l10n="U" oldref="45">Other</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/><paragraph role="heading" id="hd_id4188055" xml-lang="en-US" level="3" l10n="NEW">Print automatically inserted blank pages</paragraph>
-<paragraph role="paragraph" id="par_id8295541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/><paragraph role="heading" id="hd_id3145642" xml-lang="en-US" level="3" l10n="CHG" oldref="47">Create single print jobs</paragraph>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/><paragraph role="heading" id="hd_id3156384" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the <emph>Paper tray from printer settings </emph>option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/><paragraph role="heading" id="hd_id3147362" xml-lang="en-US" level="3" l10n="U" oldref="38">Fax</paragraph>
-<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
 </section>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#drucken1"/>
+      </section>
+<paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="U" oldref="5">Graphics</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="U" oldref="11">Controls</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="U" oldref="13">Background</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="2" l10n="NEW">Text placeholder</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
+      <section id="brochure">
+         <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="2" l10n="NEW">Right to left</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U" oldref="26">Comments</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid=".">Specifies whether comments in your document are printed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U" oldref="45">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01040500.xhp b/helpcontent2/source/text/shared/optionen/01040500.xhp
index ef40ee7d0f..3e8ba15e04 100644
--- a/helpcontent2/source/text/shared/optionen/01040500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040500.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,20 +62,20 @@
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="28">Defines the defaults for all newly created text tables in text documents.</paragraph>
 </section>
 <section id="opttabb">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_HEADER" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER" id="bm_id3154123" localize="false"/>
 <paragraph role="heading" id="hd_id3152922" xml-lang="en-US" level="3" l10n="U" oldref="29">Heading</paragraph>
 <paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_HEADER">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</ahelp></paragraph>
 </section>
 <section id="opttabc">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_REPEAT_HEADER" id="bm_id3154216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER" id="bm_id3154216" localize="false"/>
 <paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="31">Repeat on each page</paragraph>
 <paragraph role="paragraph" id="par_id3149204" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_REPEAT_HEADER">Specifies whether the table heading is carried over onto the new page after a page break.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_DONT_SPLIT" id="bm_id3159149" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT" id="bm_id3159149" localize="false"/>
 <paragraph role="heading" id="hd_id3125864" xml-lang="en-US" level="3" l10n="U" oldref="33">Do not split (not in HTML)</paragraph>
 <paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_DONT_SPLIT">Specifies that tables are not split by any type of text flow break.</ahelp> You can also find this option in menu <emph>Table - Table Properties - Text Flow</emph>.</paragraph>
 <section id="opttabd">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_BORDER" id="bm_id3153091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER" id="bm_id3153091" localize="false"/>
 <paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="U" oldref="35">Border</paragraph>
 <paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_BORDER">Specifies that table cells have a border by default.</ahelp></paragraph>
 </section>
@@ -88,18 +85,18 @@
 <section id="opttabf">
 <bookmark xml-lang="en-US" branch="hid/FN_SET_MODOPT_TBLNUMFMT" id="bm_id3219862" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableNumberRecognition" id="bm_id3147434" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFORMATTING" id="bm_id3152577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING" id="bm_id3152577" localize="false"/>
 <paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="3" l10n="U" oldref="39">Number recognition</paragraph>
 <paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFORMATTING">Specifies that numbers in a text table are recognized and formatted as numbers.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="41">If <emph>Number recognition</emph> is not marked, numbers are saved in text format and are automatically left-aligned.</paragraph>
 </section>
 <section id="opttabf1">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFMT_FORMATTING" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING" id="bm_id3154729" localize="false"/>
 <paragraph role="heading" id="hd_id3155856" xml-lang="en-US" level="3" l10n="U" oldref="42">Number format recognition</paragraph>
 <paragraph role="paragraph" id="par_id3159346" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFMT_FORMATTING">If<emph> Number format recognition </emph>is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to <emph>Text</emph>.</ahelp></paragraph>
 </section>
 <section id="opttabg">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMALIGNMENT" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT" id="bm_id3149581" localize="false"/>
 <paragraph role="heading" id="hd_id3153876" xml-lang="en-US" level="3" l10n="U" oldref="44">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMALIGNMENT">Specifies that numbers are always bottom right aligned in the cell.</ahelp> If this field is not marked numbers are always top left aligned in the cell.</paragraph>
 <paragraph role="note" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="46">Direct formatting is not influenced by the <emph>Alignment</emph> field. If you center align the cell contents directly, they remain centered irrespective of whether text or numbers are involved.</paragraph>
@@ -107,29 +104,29 @@
 <paragraph role="heading" id="hd_id3154360" xml-lang="en-US" level="2" l10n="U" oldref="48">Keyboard handling</paragraph>
 <paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="3">Move cells</paragraph>
 <paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for moving rows and columns with the keyboard. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE" id="bm_id3150042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE" id="bm_id3150042" localize="false"/>
 <paragraph role="heading" id="hd_id3155445" xml-lang="en-US" level="4" l10n="U" oldref="5">Row</paragraph>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE">Specifies the value to be used for moving a row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE" id="bm_id3163806" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE" id="bm_id3163806" localize="false"/>
 <paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="4" l10n="U" oldref="7">Column</paragraph>
 <paragraph role="paragraph" id="par_id3155905" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE">Specifies the value to be used for moving a column.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155938" xml-lang="en-US" level="3" l10n="U" oldref="9">Insert</paragraph>
 <paragraph role="paragraph" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="10">Specifies the default settings for inserting rows and columns with the keyboard. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT" id="bm_id3154703" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT" id="bm_id3154703" localize="false"/>
 <paragraph role="heading" id="hd_id3155333" xml-lang="en-US" level="4" l10n="U" oldref="11">Row</paragraph>
 <paragraph role="paragraph" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT">Specifies the default value for inserting rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT" id="bm_id3145767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT" id="bm_id3145767" localize="false"/>
 <paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="4" l10n="U" oldref="13">Column</paragraph>
 <paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT">Specifies the default value for inserting columns.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150645" xml-lang="en-US" level="3" l10n="U" oldref="15">Behavior of rows/columns</paragraph>
 <paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="CHG" oldref="16">Determines the relative effect of rows and columns on adjacent rows or columns, as well as on the entire table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX" id="bm_id3159238" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX" id="bm_id3159238" localize="false"/>
 <paragraph role="heading" id="hd_id3149335" xml-lang="en-US" level="4" l10n="U" oldref="17">Fixed</paragraph>
 <paragraph role="paragraph" id="par_id3151213" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX">Specifies that changes to a row or column only affect the corresponding adjacent area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP" id="bm_id3153269" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP" id="bm_id3153269" localize="false"/>
 <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="4" l10n="U" oldref="19">Fixed, proportional</paragraph>
 <paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP">Specifies that changes to a row or column have an effect on the entire table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR" id="bm_id3153234" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR" id="bm_id3153234" localize="false"/>
 <paragraph role="heading" id="hd_id3150783" xml-lang="en-US" level="4" l10n="U" oldref="21">Variable</paragraph>
 <paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR">Specifies that changes to a row or column affect the table size.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01040600.xhp b/helpcontent2/source/text/shared/optionen/01040600.xhp
index b868a8ac6d..bb8d6bffdb 100644
--- a/helpcontent2/source/text/shared/optionen/01040600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040600.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040600.xhp,v $
- * $Revision: 1.15.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,60 +70,60 @@
 </section>
 <paragraph role="heading" id="hd_id3144510" xml-lang="en-US" level="2" l10n="U" oldref="27">Display of</paragraph>
 <paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="CHG" oldref="28">Defines which non-printing characters are visible on screen. Activate the <link href="text/swriter/01/03100000.xhp" name="Non-printing Characters On/Off"><emph>Non-printing Characters</emph></link> icon on the <emph>Standard</emph> bar. All characters that you have selected on the <emph>Formatting Aids</emph> tab page will be displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_PARA" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA" id="bm_id3150871" localize="false"/>
 <paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="3" l10n="U" oldref="29">Paragraph end</paragraph>
 <paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_PARA">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SHYPH" id="bm_id3148453" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH" id="bm_id3148453" localize="false"/>
 <paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="31">Custom hyphens</paragraph>
 <paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SHYPH">Specifies whether user-defined delimiters are displayed. These are hidden delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-) 
 </caseinline><defaultinline>Ctrl+Hyphen(-).</defaultinline></switchinline> Words with user-defined delimiters are only separated at the end of a line at the point where a user-defined delimiter has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SPACE" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE" id="bm_id3149562" localize="false"/>
 <paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="33">Spaces</paragraph>
 <paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SPACE">Specifies whether to represent every space in the text with a dot.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE" id="bm_id3148616" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_HSPACE" id="bm_id3148616" localize="false"/>
 <paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="35">Non-breaking spaces</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Shift+Spacebar 
 </caseinline><defaultinline>Ctrl+Shift+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB" id="bm_id3152578" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_TAB" id="bm_id3152578" localize="false"/>
 <paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="37">Tabs</paragraph>
 <paragraph role="paragraph" id="par_id3153574" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB">Specifies that tab stops are displayed as small arrows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_BREAK" id="bm_id3150104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK" id="bm_id3150104" localize="false"/>
 <paragraph role="heading" id="hd_id3159154" xml-lang="en-US" level="3" l10n="U" oldref="39">Breaks</paragraph>
 <paragraph role="paragraph" id="par_id3150874" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_BREAK">Displays all line breaks inserted with the Shift+Enter shortcut. These breaks create a new line, but do not start a new paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN" id="bm_id3112582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN" id="bm_id3112582" localize="false"/>
 <paragraph role="heading" id="par_idN108E5" xml-lang="en-US" level="3" l10n="NEW">Hidden text<comment>UFI: new, although name of control is re-used, see spec "Hidden Text in Writer"</comment></paragraph>
 <paragraph role="paragraph" id="par_idN108FB" xml-lang="en-US" l10n="CHG"><ahelp hid="sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN">Displays text that uses the character format "hidden", when <emph>View - Non-printing Characters</emph> is enabled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_FLD_HIDDEN" id="bm_id5794244" localize="false"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN" id="bm_id5794244" localize="false"/>
 <paragraph role="heading" id="hd_id3149481" xml-lang="en-US" level="3" l10n="CHG" oldref="41">Fields: Hidden text (not for HTML documents)<comment>UFI: this is the old "Hidden text" control renamed</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="CHG" oldref="42"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN">Displays text that is hidden by <emph>Conditional Text</emph> or <emph>Hidden Text</emph> fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA" id="bm_id3149377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_FLD_HIDDEN_PARA" id="bm_id468764" localize="false"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA" id="bm_id468764" localize="false"/>
 <paragraph role="heading" id="hd_id3149300" xml-lang="en-US" level="3" l10n="CHG" oldref="43">Fields: Hidden paragraphs (not for HTML documents)</paragraph>
 <paragraph role="paragraph" id="par_id3149418" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA">If you have inserted text using the <emph>Hidden Paragraph</emph> field, specifies whether to display the hidden paragraph.</ahelp> This option has the same function as the menu commands <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/03140000.xhp" name="View - Hidden Paragraphs">View - Hidden Paragraphs</link>
 </caseinline><defaultinline>View - Hidden Paragraphs</defaultinline></switchinline> available in open text documents.</paragraph>
 <paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="2" l10n="U" oldref="3">Direct cursor (not for HTML documents)</paragraph>
 <paragraph role="paragraph" id="par_id3146900" xml-lang="en-US" l10n="CHG" oldref="4">Defines all the properties of the direct cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF" id="bm_id3150327" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF" id="bm_id3150327" localize="false"/>
 <paragraph role="heading" id="hd_id3154273" xml-lang="en-US" level="3" l10n="U" oldref="5">Direct cursor</paragraph>
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF">Activates the direct cursor.</ahelp> You can also activate this function by clicking the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/02/18130000.xhp" name="Direct Cursor On/Off">Direct Cursor On/Off</link>
 </caseinline><defaultinline>Direct Cursor On/Off</defaultinline></switchinline> icon in a text document.</paragraph>
 <paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="2" l10n="U" oldref="7">Insert (not for HTML document)</paragraph>
 <paragraph role="paragraph" id="par_id3149020" xml-lang="en-US" l10n="U" oldref="8">Defines the insert options for the direct cursor. If you click at any position in your document, a new paragraph can be written or inserted exactly at this position. The properties of this paragraph depend on the selected option. You can select from the following options:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN" id="bm_id3154755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN" id="bm_id3154755" localize="false"/>
 <paragraph role="heading" id="hd_id3148995" xml-lang="en-US" level="3" l10n="U" oldref="9">Paragraph alignment</paragraph>
 <paragraph role="paragraph" id="par_id3156384" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN">Sets the paragraph alignment when the direct cursor is used. Depending on where the mouse is clicked, the paragraph is formatted left aligned, centered or right aligned. The cursor before the mouse-click shows, by means of a triangle, which alignment is set. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT" id="bm_id3151249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT" id="bm_id3151249" localize="false"/>
 <paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="11">Left paragraph margin</paragraph>
 <paragraph role="paragraph" id="par_id3151188" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT">When the direct cursor is used, the left paragraph indent is set at the horizontal position where you click the direct cursor. The paragraph is left aligned. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB" id="bm_id3153966" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB" id="bm_id3153966" localize="false"/>
 <paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="3" l10n="U" oldref="13">Tabs</paragraph>
 <paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB">When the direct cursor is used, as many tabs as necessary are added in the new paragraph until the clicked position is reached.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE" id="bm_id3146917" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE" id="bm_id3146917" localize="false"/>
 <paragraph role="heading" id="hd_id3166449" xml-lang="en-US" level="3" l10n="U" oldref="15">Tabs and Spaces</paragraph>
 <paragraph role="paragraph" id="par_id3155904" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE">When the Direct Cursor is used, a corresponding number of tabs and spaces are inserted in the new paragraph as necessary until the clicked position is reached.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149964" xml-lang="en-US" l10n="U" oldref="17">All insert options refer only to the current paragraph generated with the Direct Cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT" id="bm_id3151275" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT" id="bm_id3151275" localize="false"/>
 <paragraph role="heading" id="hd_id3146134" xml-lang="en-US" level="3" l10n="U" oldref="24">Cursor in protected areas - Enabled</paragraph>
 <paragraph role="paragraph" id="par_id3147508" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT">Specifies that you can set the cursor in a protected area, but cannot make any changes.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01040700.xhp b/helpcontent2/source/text/shared/optionen/01040700.xhp
index 3d06e10947..83a265ca6d 100755
--- a/helpcontent2/source/text/shared/optionen/01040700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040700.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,52 +29,55 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01040700xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changes</title>
-<filename>/text/shared/optionen/01040700.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T16:30:58">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="aenderungen">
+      <topic id="textsharedoptionen01040700xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changes</title>
+         <filename>/text/shared/optionen/01040700.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="aenderungen">
 <bookmark xml-lang="en-US" branch="hid/HID_REDLINE_OPT" id="bm_id3149795" localize="false"/>
-<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_REDLINE_OPT">Defines the appearance of changes in the document.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U" oldref="27">To record or show changes, with the text or spreadsheet document open, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link>.</paragraph>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#registeraenderungen"/>
-</section>
-<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="3">Text display</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for displaying recorded changes. Select the type of change with the radio buttons, and the corresponding display attribute and color. The preview field shows the effect of the selected display options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR" id="bm_id3153896" localize="false"/>
-<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="3" l10n="U" oldref="21">Insertions / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR">Specifies how changes in the document are displayed when text is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR" id="bm_id3150358" localize="false"/>
-<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="3" l10n="U" oldref="23">Deletions / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR" id="bm_id3149203" localize="false"/>
-<paragraph role="heading" id="hd_id3148674" xml-lang="en-US" level="3" l10n="U" oldref="25">Changed attributes / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_INS_COL" id="bm_id3147084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_COL" id="bm_id3154217" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL" id="bm_id3149810" localize="false"/>
-<paragraph role="heading" id="hd_id3153105" xml-lang="en-US" level="3" l10n="U" oldref="28">Color</paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="2" l10n="U" oldref="15">Lines changed</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="16">To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS" id="bm_id3161831" localize="false"/>
-<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="17">Mark</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS">Defines if and where changed lines in the document are marked.</ahelp> You can set the markings so that they always appear on the left or right page margin, or on even or uneven pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL" id="bm_id3148618" localize="false"/>
-<paragraph role="heading" id="hd_id3163713" xml-lang="en-US" level="3" l10n="U" oldref="19">Color</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL">Specifies the color for highlighting the changed lines in the text.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153823" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149416" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_REDLINE_OPT">Defines the appearance of changes in the document.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="27">To record or show changes in your text or spreadsheet document, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes - Record</emph></link> or <emph>Edit - Changes - Show</emph>.</paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#registeraenderungen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3155419" role="heading" level="2" l10n="U" oldref="3">Text display</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3144510" role="paragraph" l10n="U" oldref="4">Defines the settings for displaying recorded changes. Select the type of change and the corresponding display attribute and color. The preview field shows the effect of the selected display options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR" id="bm_id3153896" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148550" role="heading" level="3" l10n="U"
+                 oldref="21">Insertions / Attributes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR">Specifies how changes in the document are displayed when text is inserted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR" id="bm_id3150358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152812" role="heading" level="3" l10n="U"
+                 oldref="23">Deletions / Attributes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR" id="bm_id3149203" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148674" role="heading" level="3" l10n="U"
+                 oldref="25">Changed attributes / Attributes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151042" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_INS_COL" id="bm_id3147084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL" id="bm_id3154217" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL" id="bm_id3149810" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153105" role="heading" level="3" l10n="U"
+                 oldref="28">Color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145607" role="heading" level="2" l10n="U"
+                 oldref="15">Lines changed</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="16">To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS" id="bm_id3161831" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145785" role="heading" level="3" l10n="U"
+                 oldref="17">Mark</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS">Defines if and where changed lines in the document are marked.</ahelp> You can set the markings so that they always appear on the left or right page margin, or on the outer or inner margin.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_LC_COL" id="bm_id3148618" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163713" role="heading" level="3" l10n="U"
+                 oldref="19">Color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL">Specifies the color for highlighting the changed lines in the text.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01040900.xhp b/helpcontent2/source/text/shared/optionen/01040900.xhp
index 9725b80aac..e0b3ad9d32 100755
--- a/helpcontent2/source/text/shared/optionen/01040900.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040900.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01040900.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,14 +63,14 @@
 <section id="aktu">
 <paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="2" l10n="U" oldref="45">Update</paragraph>
 <paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="3">Update links when loading</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_ALWAYS" id="bm_id3150985" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_ALWAYS" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="4" l10n="U" oldref="4">Always</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS" id="bm_id3150985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="4" l10n="U" oldref="4">Always</paragraph>
 <paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_ALWAYS">Always updates links while loading a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_REQUEST" id="bm_id3153542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_REQUEST" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="4" l10n="U" oldref="5">On request</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST" id="bm_id3153542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="4" l10n="U" oldref="5">On request</paragraph>
 <paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_REQUEST">Updates links only on request while loading a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_NEVER" id="bm_id3147530" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_NEVER" id="bm_id3149669" localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="4" l10n="U" oldref="6">Never</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER" id="bm_id3147530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER" id="bm_id3149669" localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="4" l10n="U" oldref="6">Never</paragraph>
 <paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_NEVER">Links are never updated while loading a document.</ahelp></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="25">Automatically</paragraph>
@@ -81,7 +78,7 @@
 <case select="WRITER"><paragraph role="paragraph" id="par_id8801538" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/06990000.xhp">To update fields manually</link></paragraph><comment>i81240</comment>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="4" l10n="U" oldref="21">Fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="4" l10n="U" oldref="21">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3154071" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS">The contents of all fields are updated automatically whenever the screen contents are displayed as new. Even with this box unchecked, some fields are updated each time a special condition takes place.</ahelp> The following table lists the fields that are updated without regard to this checkbox.</paragraph>
 <table id="tbl_id4289681">
 <tablerow>
@@ -149,12 +146,12 @@
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="4" l10n="U" oldref="22">Charts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="4" l10n="U" oldref="22">Charts</paragraph>
 <paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS">Specifies whether to automatically update charts. Whenever a Writer table cell value changes and the cursor leaves that cell, the chart that displays the cell value is updated automatically.</ahelp><comment>see message "[sw-features] changed/CWS chart2mst3 : Automatic update for charts in Writer" by Thomas Lange</comment></paragraph>
 <paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2" l10n="U" oldref="46">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTLOAD_PAGE_LB_METRIC" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="31">Measurement unit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="31">Measurement unit</paragraph>
 <paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="SW_LISTBOX_TP_OPTLOAD_PAGE_LB_METRIC">Specifies the <link href="text/shared/00/00000003.xhp#metrik" name="unit of measurement">unit of measurement</link> for text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_OPTLOAD_PAGE_MF_TAB" id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB" id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
 <paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_METRICFIELD_TP_OPTLOAD_PAGE_MF_TAB">Specifies the spacing between the individual tab stops.</ahelp> The horizontal ruler displays the selected spacing.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index e4bd7d8df6..0e93dac57e 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01041000.xhp,v $
- * $Revision: 1.16.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,28 +29,28 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedoptionen01041000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Compatibility</title>
-<filename>/text/shared/optionen/01041000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedoptionen01041000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Compatibility</title>
+         <filename>/text/shared/optionen/01041000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3577990"><bookmark_value>Word documents;compatibility</bookmark_value>
-<bookmark_value>importing;compatibility settings for text import</bookmark_value>
-<bookmark_value>options;compatibility (Writer)</bookmark_value>
-<bookmark_value>compatibility settings for MS Word import</bookmark_value>
-<bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
-<bookmark_value>layout;importing Word documents</bookmark_value>
-<bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
-<bookmark_value>metrics;document formatting (Writer)</bookmark_value>
-<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
+      <bookmark_value>importing;compatibility settings for text import</bookmark_value>
+      <bookmark_value>options;compatibility (Writer)</bookmark_value>
+      <bookmark_value>compatibility settings for MS Word import</bookmark_value>
+      <bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
+      <bookmark_value>layout;importing Word documents</bookmark_value>
+      <bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
+      <bookmark_value>metrics;document formatting (Writer)</bookmark_value>
+      <bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
 </bookmark>
 <section id="compatibility">
 <bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
-<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
+<paragraph xml-lang="en-US" id="par_idN10607" role="heading" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
 </section>
@@ -62,21 +59,21 @@
 </section>
 <paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
 <section id="printermetrics">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment>
+<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS -->
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment>
 <paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
 <paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
 <paragraph role="note" id="par_id3155768" xml-lang="en-US" l10n="U" oldref="49">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/>
+<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST -->
 <paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
 <paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="U" oldref="18">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph>
 <paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/>
+<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART -->
 <paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
 <paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document.</ahelp> The same applies for a page break.</paragraph>
 <paragraph role="note" id="par_id3145789" xml-lang="en-US" l10n="U" oldref="20">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT -->
 <paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
 <paragraph role="paragraph" id="par_id3152777" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break.</ahelp> If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph>
 <paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph>
@@ -104,7 +101,7 @@
 <paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
 <paragraph role="paragraph" id="par_id8599810" xml-lang="en-US" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>
 <paragraph role="paragraph" id="par_id8012634" xml-lang="en-US" l10n="NEW">This setting is on by default for .odt text documents. It will be saved and loaded with the document in the .odt text document format. This setting cannot be saved in old .sxw text documents, so this setting is off for .sxw text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT" id="bm_id4321726" localize="false"/>
 <paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
 <paragraph role="paragraph" id="par_idN10848" xml-lang="en-US" l10n="NEW"><ahelp hid="879350288">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10977" xml-lang="en-US" l10n="NEW">The factory defaults are set as follows. Enabled are the following options, while all other options are disabled:</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01041100.xhp b/helpcontent2/source/text/shared/optionen/01041100.xhp
index c1bf1decf4..86f739a77c 100755
--- a/helpcontent2/source/text/shared/optionen/01041100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01041100.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,38 +66,38 @@
   <paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Caption</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10593" role="paragraph" l10n="NEW">Defines the options to be applied to the selected object type. These options are identical to those in the <emph>Insert - Caption</emph> menu, which is available when an object is selected. Below the settings is a preview of the object category, together with numbering type.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_OPTCAPTION_PAGE_BOX_CATEGORY" id="bm_id3156330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY" id="bm_id3156330" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="3" l10n="U" oldref="5">Category</paragraph>
   <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="13"><ahelp hid="SW_COMBOBOX_TP_OPTCAPTION_PAGE_BOX_CATEGORY">Specifies the category of the selected object.</ahelp><comment>UFI: copied text from optionen/01040801</comment></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_FORMAT" id="bm_id3149236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT" id="bm_id3149236" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155628" role="heading" level="3" l10n="U" oldref="6">Numbering</paragraph>
   <paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_FORMAT">Specifies the type of numbering required.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR" id="bm_id3154071" localize="false"/>
   
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT" id="bm_id4456617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT" id="bm_id4456617" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3149457" role="heading" level="3" l10n="U" oldref="10">Separator</paragraph>
   <paragraph xml-lang="en-US" id="par_idN106E2" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_POS" id="bm_id3153627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS" id="bm_id3153627" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="3" l10n="U" oldref="8">Position</paragraph>
   <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="15"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_POS">Determines the position of the caption with respect to the object.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1064E" role="heading" level="2" l10n="NEW">Numbering captions by chapter</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_LB_LEVEL" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL" id="bm_id3145068" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3145609" role="heading" level="3" l10n="U" oldref="9">Level</paragraph>
   <paragraph xml-lang="en-US" id="par_id3153898" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_LB_LEVEL">Specifies the headings or chapter levels where you want the numbering to start.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id3153524" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_idN106A8" role="heading" level="2" l10n="NEW">Category and frame format</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE" id="bm_id2708517" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE" id="bm_id2708517" localize="false"/>
   <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="3" l10n="NEW">Character style</paragraph>
   <paragraph xml-lang="en-US" id="par_idN106B4" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR" id="bm_id3149820" localize="false"/>
+<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
   
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER" id="bm_id346995" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER" id="bm_id346995" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3143280" role="heading" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
   <paragraph xml-lang="en-US" id="par_id3149826" role="paragraph" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
   <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/01050000.xhp b/helpcontent2/source/text/shared/optionen/01050000.xhp
index 8e820974a4..cb0cc70bfa 100755
--- a/helpcontent2/source/text/shared/optionen/01050000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SID_SW_ONLINEOPTIONS" id="bm_id3148491" localize="false"/>
+<!-- removed HID SID_SW_ONLINEOPTIONS -->
 <paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Writer/Web Options</paragraph>
 <paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="2">
 <variable id="webbrowser"><ahelp hid="SID_SW_ONLINEOPTIONS">Defines the basic settings for $[officename] documents in HTML format.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index 06f8cf0662..5c592e8461 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050100.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,80 +29,97 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedoptionen01050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Grid</title>
-<filename>/text/shared/optionen/01050100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="raster">
+      <topic id="textsharedoptionen01050100xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Grid</title>
+         <filename>/text/shared/optionen/01050100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="raster">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147226"><bookmark_value>grids; defaults (Writer/Calc)</bookmark_value>
-<bookmark_value>defaults; grids (Writer/Calc)</bookmark_value>
-<bookmark_value>snap grid defaults (Writer/Calc)</bookmark_value>
+         <bookmark_value>defaults; grids (Writer/Calc)</bookmark_value>
+         <bookmark_value>snap grid defaults (Writer/Calc)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01050100.xhp" name="Grid">Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GRID">Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#raster"/>
-</section>
-<paragraph role="heading" id="hd_id3153749" xml-lang="en-US" level="2" l10n="U" oldref="11">Grid</paragraph>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="12">Specifies the subdivision of the grid. You have the option of using different <link href="text/shared/00/00000003.xhp#metrik" name="units of measure">units of measure</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP" id="bm_id3150669" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="5">Snap to grid</paragraph>
-<section id="rasterfang">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key 
+<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01050100.xhp" name="Grid">Grid</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GRID">Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#raster"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3153749" role="heading" level="2" l10n="U"
+                 oldref="11">Grid</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP" id="bm_id3150669" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145382" role="heading" level="3" l10n="U" oldref="5">Snap to grid</paragraph>
+      <section id="rasterfang">
+         <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key 
 </caseinline><defaultinline>Ctrl key</defaultinline></switchinline>.</paragraph>
-</section>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/SID_GRID_VISIBLE" id="bm_id8442192" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" id="bm_id3148473" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE" id="bm_id3149795" localize="false"/><paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Visible grid</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE" id="bm_id3149795" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. 
+      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. 
 </variable>
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. 
+      <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. 
 </variable>
 </caseinline></switchinline></paragraph>
-<section id="aufun">
-<paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="36">Resolution</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X" id="bm_id3151041" localize="false"/><paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X">Defines the unit of measure for the spacing between grid points on the X-axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="3" l10n="U" oldref="17">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y">Defines the grid points spacing in the desired unit of measurement on the Y-axis.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="37">Subdivision</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3153368" xml-lang="en-US" level="3" l10n="U" oldref="15">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X">Specify the number of intermediate points between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y" id="bm_id3147428" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y">Specify the number of intermediate points between grid points on the Y-axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE" id="bm_id3153138" localize="false"/><paragraph role="heading" id="hd_id3149667" xml-lang="en-US" level="3" l10n="U" oldref="9">Synchronize axes</paragraph>
-<paragraph role="paragraph" id="par_id3147350" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE">Specifies whether to change the current grid settings symmetrically.</ahelp> The resolution and subdivision for the X and Y axes remain the same.</paragraph>
-<paragraph role="paragraph" id="par_id3146121" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page: 
+      <section id="aufun">
+         <paragraph xml-lang="en-US" id="hd_id3154684" role="heading" level="2" l10n="U"
+                    oldref="36">Resolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X" id="bm_id3151041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149203" role="heading" level="3" l10n="U"
+                    oldref="13">Horizontal</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X">Defines the unit of measure for the spacing between grid points on the X-axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y" id="bm_id3156280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150447" role="heading" level="3" l10n="U"
+                    oldref="17">Vertical</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148923" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y">Defines the grid points spacing in the desired unit of measurement on the Y-axis.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3147228" role="heading" level="2" l10n="U"
+                    oldref="37">Subdivision</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X" id="bm_id3145785" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153368" role="heading" level="3" l10n="U"
+                    oldref="15">Horizontal</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X">Specify the number of intermediate points between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y" id="bm_id3147428" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147441" role="heading" level="3" l10n="U"
+                    oldref="19">Vertical</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y">Specify the number of intermediate points between grid points on the Y-axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE" id="bm_id3153138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149667" role="heading" level="3" l10n="U" oldref="9">Synchronize axes</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147350" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE">Specifies whether to change the current grid settings symmetrically.</ahelp> The resolution and subdivision for the X and Y axes remain the same.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146121" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page: 
 </caseinline><caseinline select="IMPRESS">There are additional commands on the context menu of a page: 
 </caseinline></switchinline></paragraph>
-</section>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/SID_GRID_FRONT" id="bm_id8062547" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/><paragraph role="heading" id="hd_id3146984" xml-lang="en-US" level="2" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front 
+<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U"
+                 oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front 
 </caseinline><caseinline select="IMPRESS">Grid to Front 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects. 
+      <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects. 
 </caseinline><caseinline select="IMPRESS">Sets the visible grid in front of all objects. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id4122135" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id4122135" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_FRONT" id="bm_id6135046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/><paragraph role="heading" id="hd_id3149419" xml-lang="en-US" level="2" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front 
+<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U"
+                 oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front 
 </caseinline><caseinline select="IMPRESS">Snap Lines to Front 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects. 
+      <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects. 
 </caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects. 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id1251869" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id984221" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id1251869" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01050300.xhp b/helpcontent2/source/text/shared/optionen/01050300.xhp
index 91bd7cd2b5..8c5c7faaa9 100755
--- a/helpcontent2/source/text/shared/optionen/01050300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01050300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01060000.xhp b/helpcontent2/source/text/shared/optionen/01060000.xhp
index a9ce0e6cf2..4a14e09704 100644
--- a/helpcontent2/source/text/shared/optionen/01060000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 66fec37911..761436676d 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01060100.xhp,v $
- * $Revision: 1.15.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,135 +29,151 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textsharedoptionen01060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">View</title>
-<filename>/text/shared/optionen/01060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="inhalte">
+      <topic id="textsharedoptionen01060100xml" indexer="include">
+         <title xml-lang="en-US" id="tit">View</title>
+         <filename>/text/shared/optionen/01060100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="inhalte">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147242"><bookmark_value>cells; showing grid lines (Calc)</bookmark_value>
-<bookmark_value>borders; cells on screen (Calc)</bookmark_value>
-<bookmark_value>grids; displaying lines (Calc)</bookmark_value>
-<bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
-<bookmark_value>page breaks; displaying (Calc)</bookmark_value>
-<bookmark_value>guides; showing (Calc)</bookmark_value>
-<bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
-<bookmark_value>displaying; zero values (Calc)</bookmark_value>
-<bookmark_value>zero values; displaying (Calc)</bookmark_value>
-<bookmark_value>displaying; notes (Calc)</bookmark_value>
-<bookmark_value>notes; displaying (Calc)</bookmark_value>
-<bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
-<bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
-<bookmark_value>cells; coloring (Calc)</bookmark_value>
-<bookmark_value>anchors; displaying (Calc)</bookmark_value>
-<bookmark_value>colors;restriction (Calc)</bookmark_value>
-<bookmark_value>text overflow in spreadsheet cells</bookmark_value>
-<bookmark_value>references; displaying in color (Calc)</bookmark_value>
-<bookmark_value>objects; displaying in spreadsheets</bookmark_value>
-<bookmark_value>pictures; displaying in Calc</bookmark_value>
-<bookmark_value>charts; displaying (Calc)</bookmark_value>
-<bookmark_value>draw objects; displaying (Calc)</bookmark_value>
-<bookmark_value>row headers; displaying (Calc)</bookmark_value>
-<bookmark_value>column headers; displaying (Calc)</bookmark_value>
-<bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
-<bookmark_value>sheet tabs; displaying</bookmark_value>
-<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
-<bookmark_value>outlines;outline symbols</bookmark_value>
-</bookmark><comment>mw deleted "formulas;..." and copied "displaying; formulas..." to Calc guide formula_value.xhp and changed "sheets;.." into "sheet tabs;..."</comment><comment>MW made "outline..." a two level entry</comment>
+         <bookmark_value>borders; cells on screen (Calc)</bookmark_value>
+         <bookmark_value>grids; displaying lines (Calc)</bookmark_value>
+         <bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
+         <bookmark_value>page breaks; displaying (Calc)</bookmark_value>
+         <bookmark_value>guides; showing (Calc)</bookmark_value>
+         <bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
+         <bookmark_value>displaying; zero values (Calc)</bookmark_value>
+         <bookmark_value>zero values; displaying (Calc)</bookmark_value>
+         <bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
+         <bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
+         <bookmark_value>cells; coloring (Calc)</bookmark_value>
+         <bookmark_value>anchors; displaying (Calc)</bookmark_value>
+         <bookmark_value>colors;restriction (Calc)</bookmark_value>
+         <bookmark_value>text overflow in spreadsheet cells</bookmark_value>
+         <bookmark_value>references; displaying in color (Calc)</bookmark_value>
+         <bookmark_value>objects; displaying in spreadsheets</bookmark_value>
+         <bookmark_value>pictures; displaying in Calc</bookmark_value>
+         <bookmark_value>charts; displaying (Calc)</bookmark_value>
+         <bookmark_value>draw objects; displaying (Calc)</bookmark_value>
+         <bookmark_value>row headers; displaying (Calc)</bookmark_value>
+         <bookmark_value>column headers; displaying (Calc)</bookmark_value>
+         <bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
+         <bookmark_value>sheet tabs; displaying</bookmark_value>
+         <bookmark_value>tabs; displaying sheet tabs</bookmark_value>
+         <bookmark_value>outlines;outline symbols</bookmark_value>
+</bookmark><comment>MW copied "displaying;comments" over to  Calc guide note_insert.xhp and deleted "comments;displaying"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
-<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
-<paragraph role="paragraph" id="par_id3153988" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
-</section>
-<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="2" l10n="U" oldref="28">Visual aids</paragraph>
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/>
-<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box. 
+<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153988" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3153682" role="heading" level="2" l10n="U"
+                 oldref="28">Visual aids</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_GRID" id="bm_id3148538" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147242" role="heading" level="3" l10n="U"
+                 oldref="30">Grid lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR" id="bm_id3150504" localize="false"/>
 <paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
-<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
-<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/>
-<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="2" l10n="U" oldref="3">Display</paragraph>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/>
-<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
-<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/>
-<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a note exists. The note will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152349" role="heading" level="3" l10n="U"
+                 oldref="34">Page breaks</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151245" role="paragraph" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE" id="bm_id3148946" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
+                 oldref="36">Guides while moving</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" id="bm_id3153380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
+                 oldref="38">Simple handles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154140" role="paragraph" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="3" l10n="U"
+                 oldref="40">Large handles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152920" role="heading" level="2" l10n="U" oldref="3">Display</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3125864" role="paragraph" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_FORMULA" id="bm_id3150767" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154218" role="heading" level="3" l10n="U" oldref="5">Formulas</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150440" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_NIL" id="bm_id3146146" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="3" l10n="U" oldref="7">Zero values</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANNOT" id="bm_id3163711" localize="false"/>
+<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Comment indicator</paragraph>
+<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>%PRODUCTNAME - General</emph> in the Options dialog box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
-<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit notes with the <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link> command. Notes that are permanently displayed can be edited by clicking the note box. Click the Navigator and under the <emph>Notes</emph> entry you can view all notes in the current document. By double clicking a note in Navigator, the cursor will jump to the corresponding cell containing the note.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150487" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_VALUE" id="bm_id3155306" localize="false"/>
 <paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
-<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the<emph> Value highlighting </emph>box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
-<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
-<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/>
-<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155444" xml-lang="en-US" level="2" l10n="U" oldref="16">Objects</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/>
-<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3163549" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/>
-<paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
-<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/>
-<paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
-<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id0909200810585828" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM" id="bm_id0909200810584462" localize="false"/>
-<paragraph role="heading" id="hd_id0909200810585881" xml-lang="en-US" level="3" l10n="NEW">Synchronize sheets</paragraph>
-<paragraph role="paragraph" id="par_id0909200810585870" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="42">Window</paragraph>
-<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/>
-<paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
-<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/>
-<paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3155578" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/>
-<paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/>
-<paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANCHOR" id="bm_id3146972" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157846" role="heading" level="3" l10n="U"
+                 oldref="14">Anchor</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147494" role="paragraph" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_CLIP" id="bm_id3146789" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146898" role="heading" level="3" l10n="U"
+                 oldref="26">Text overflow</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_RFIND" id="bm_id3153927" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150327" role="heading" level="3" l10n="U"
+                 oldref="54">Show references in color</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153766" role="paragraph" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155444" role="heading" level="2" l10n="U"
+                 oldref="16">Objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148405" role="paragraph" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF" id="bm_id3154256" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150043" role="heading" level="3" l10n="U"
+                 oldref="18">Objects/Graphics</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3163549" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM" id="bm_id3147344" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151249" role="heading" level="3" l10n="U"
+                 oldref="20">Charts</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW" id="bm_id3155334" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154703" role="heading" level="3" l10n="U"
+                 oldref="22">Drawing objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155959" role="paragraph" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0909200810585828" role="heading" level="2" l10n="NEW">Zoom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_SYNCZOOM" id="bm_id0909200810584462" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0909200810585881" role="heading" level="3" l10n="NEW">Synchronize sheets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0909200810585870" role="paragraph" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153920" role="heading" level="2" l10n="U"
+                 oldref="42">Window</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154661" role="paragraph" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149923" role="heading" level="3" l10n="U"
+                 oldref="44">Column/Row headers</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149816" role="paragraph" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_HSCROLL" id="bm_id3154120" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154205" role="heading" level="3" l10n="U"
+                 oldref="46">Horizontal scrollbar</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155578" role="paragraph" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_VSCROLL" id="bm_id3158413" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148422" role="heading" level="3" l10n="U"
+                 oldref="48">Vertical scrollbar</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147128" role="paragraph" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_TBLREG" id="bm_id3158214" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150826" role="heading" level="3" l10n="U"
+                 oldref="50">Sheet tabs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154658" role="paragraph" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
 </caseinline><defaultinline>Navigator</defaultinline></switchinline>. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/>
-<paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
-<paragraph role="paragraph" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_OUTLINE" id="bm_id3154199" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152584" role="heading" level="3" l10n="U"
+                 oldref="52">Outline symbols</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145135" role="paragraph" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
 </caseinline><defaultinline>outline</defaultinline></switchinline>, the <emph>Outline symbols</emph> option specifies whether to view the outline symbols at the border of the sheet.</ahelp></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060300.xhp b/helpcontent2/source/text/shared/optionen/01060300.xhp
index cc9820e737..6c623fdec1 100755
--- a/helpcontent2/source/text/shared/optionen/01060300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060300.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,31 +58,31 @@
   <embed href="text/shared/00/00000406.xhp#tabelleeingabe"/>
 </section>
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="2" l10n="U" oldref="24">Metrics</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="20">Measurement unit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_LAYOUT:LB_UNIT" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="20">Measurement unit</paragraph>
 <paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT">Defines the unit of measure in spreadsheets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="22">Tab stops</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCPAGE_LAYOUT:MF_TAB" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="22">Tab stops</paragraph>
 <paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB">Defines the tab stops distance.</ahelp></paragraph>
 <embed href="text/shared/optionen/01040900.xhp#aktu"/>
 <paragraph role="heading" id="hd_id3155135" xml-lang="en-US" level="2" l10n="U" oldref="3">Input settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_ALIGN" id="bm_id3155389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_LAYOUT_LB_ALIGN" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3148491" xml-lang="en-US" level="3" l10n="U" oldref="5">Press Enter to move selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_ALIGN" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_LAYOUT:LB_ALIGN" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3148491" xml-lang="en-US" level="3" l10n="U" oldref="5">Press Enter to move selection</paragraph>
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_LISTBOX_RID_SCPAGE_LAYOUT_LB_ALIGN">Determines the direction that the cursor in the spreadsheet will move after you press the Enter key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EDITMODE" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EDITMODE" id="bm_id3151245" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SetInputMode" id="bm_id3079317" localize="false"/><comment>see i53756</comment><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="8">Press Enter to switch to edit mode</paragraph>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EDITMODE">Allows you to immediately edit the selected cell after pressing the Enter key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_FORMAT" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="10">Expand formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_FORMAT" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="10">Expand formatting</paragraph>
 <paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_FORMAT">Specifies whether to automatically apply the formatting attributes of the selected cell to the empty adjacent cells.</ahelp> If, for example, the contents of the selected cell have the bold attribute, this bold attribute will also apply to adjacent cells. Cells that already have a special format will not be modified by this function. You can see the range in question by pressing the <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> + * (multiplication sign on the number pad) shortcut. This format also applies to all new values inserted within this range. The normal default settings apply to cells outside this range.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EXPREF" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="14">Expand references when new columns/rows are inserted</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="14">Expand references when new columns/rows are inserted</paragraph>
 <paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EXPREF">Specifies whether to expand references when inserting columns or rows adjacent to the reference range. This is only possible if the reference range, where the column or row is inserted, originally spanned at least two cells in the desired direction.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="16">
 <emph>Example:</emph> If the range A1:B1 is referenced in a formula and you insert a new column after column B, the reference is expanded to A1:C1. If the range A1:B1 is referenced and a new row is inserted under row 1, the reference is not expanded, since there is only a single cell in the vertical direction.</paragraph>
 <paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="17">If you insert rows or columns in the middle of a reference area, the reference is always expanded.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_MARKHDR" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="3" l10n="U" oldref="18">Highlight selection in column/row headings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="3" l10n="U" oldref="18">Highlight selection in column/row headings</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_MARKHDR">Specifies whether to highlight column and row headers in the selected columns or rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_TEXTFMT" id="bm_id3153770" localize="false"/><paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="25">Use printer metrics for text formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT" id="bm_id3153770" localize="false"/><paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="25">Use printer metrics for text formatting</paragraph>
 <paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_TEXTFMT">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_REPLWARN" id="bm_id3153363" localize="false"/><paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3" l10n="U" oldref="27">Show overwrite warning when pasting data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN" id="bm_id3153363" localize="false"/><paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3" l10n="U" oldref="27">Show overwrite warning when pasting data</paragraph>
 <paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_REPLWARN">Specifies that, when you paste cells from the clipboard to a cell range that is not empty, a warning appears.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01060400.xhp b/helpcontent2/source/text/shared/optionen/01060400.xhp
index e0f5cd87f6..570b0d8fe3 100755
--- a/helpcontent2/source/text/shared/optionen/01060400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060400.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,22 +54,22 @@
 <case select="CALC"><embed href="text/scalc/guide/sorted_list.xhp#sorted_list"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_USERLISTS:LB_LISTS" id="bm_id3147336" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS" id="bm_id3147336" localize="false"/>
 <paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="3">Lists</paragraph>
 <paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCPAGE_USERLISTS:LB_LISTS">Displays all the available lists. These lists can be selected for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILINEEDIT:RID_SCPAGE_USERLISTS:ED_ENTRIES" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES" id="bm_id3154758" localize="false"/>
 <paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="2" l10n="U" oldref="5">Entries</paragraph>
 <paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:MULTILINEEDIT:RID_SCPAGE_USERLISTS:ED_ENTRIES">Displays the content of the currently selected list. This content can be edited.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_USERLISTS:ED_COPYFROM" id="bm_id3152811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM" id="bm_id3152811" localize="false"/>
 <paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="2" l10n="U" oldref="7">Copy list from</paragraph>
 <paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:EDIT:RID_SCPAGE_USERLISTS:ED_COPYFROM">Defines the spreadsheet and the cells to copy, in order to include them in the <emph>Lists</emph> box. The currently selected range in the spreadsheet is the default.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_COPY" id="bm_id3145606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY" id="bm_id3145606" localize="false"/>
 <paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="2" l10n="U" oldref="13">Copy</paragraph>
 <paragraph role="paragraph" id="par_id3158409" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_COPY">Copies the contents of the cells in the <emph>Copy list from</emph> box. If you select a reference to related rows and columns, the <link href="text/shared/optionen/01060401.xhp" name="Copy List"><emph>Copy List</emph></link> dialog appears after clicking the button. You can use this dialog to define if the reference is converted to sort lists by row or by column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_NEW" id="bm_id3147084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW" id="bm_id3147084" localize="false"/>
 <paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="9">New/Discard</paragraph>
 <paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_NEW">Enters the contents of a new list into the <emph>Entries</emph> box.</ahelp> This button will change from <emph>New</emph> to <emph>Discard</emph>, which enables you to delete the new list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD" id="bm_id3149562" localize="false"/>
 <paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="2" l10n="U" oldref="11">Add/Modify</paragraph>
 <paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD">Adds a new list into the <emph>Lists</emph> box.</ahelp> If you would like to edit this list in the <emph>Entries</emph> box, this button will change from <emph>Add</emph> to <emph>Modify</emph>, which enables you to include the newly modified list.</paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01060401.xhp b/helpcontent2/source/text/shared/optionen/01060401.xhp
index dc57b206c9..b9bc8a6fbe 100755
--- a/helpcontent2/source/text/shared/optionen/01060401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060401.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153341"><bookmark_value>sort lists; copying to in Calc</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC_MODALDIALOG_RID_SCDLG_COLORROW" id="bm_id3156329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_COLORROW" id="bm_id3156329" localize="false"/>
 <paragraph role="heading" id="hd_id3153341" xml-lang="en-US" level="1" l10n="U" oldref="1">Copy List</paragraph>
 <paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_MODALDIALOG_RID_SCDLG_COLORROW">Allows you to copy marked cells to a sort list.</ahelp></paragraph>
 <section id="howtoget">
@@ -55,10 +52,10 @@
 </section>
 <paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="2" l10n="U" oldref="3">List from</paragraph>
 <paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="4">Choose between the options<emph> Rows</emph> and <emph>Columns</emph>. Cells without text will be ignored when copying.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_ROWS" id="bm_id3147303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_ROWS" id="bm_id3147303" localize="false"/>
 <paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="3" l10n="U" oldref="5">Rows</paragraph>
 <paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_ROWS">Select the<emph> Rows </emph>option to summarize the contents of the selected rows in a list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_COLS" id="bm_id3154366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_COLS" id="bm_id3154366" localize="false"/>
 <paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="7">Columns</paragraph>
 <paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_COLS">Select the<emph> Columns </emph>option to summarize the contents of the selected columns in a list.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 8e12eb1056..4f6356b778 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060500.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,194 +29,201 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculate</title>
-<filename>/text/shared/optionen/01060500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T13:17:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="berechnen">
+      <topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculate</title>
+         <filename>/text/shared/optionen/01060500.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="berechnen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149399"><bookmark_value>references; iterative (Calc)</bookmark_value>
-<bookmark_value>calculating;iterative references (Calc)</bookmark_value>
-<bookmark_value>iterative references in spreadsheets</bookmark_value>
-<bookmark_value>recursions in spreadsheets</bookmark_value>
-<bookmark_value>dates; default (Calc)</bookmark_value>
-<bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
-<bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
-<bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
-<bookmark_value>numbers; decimal places (Calc)</bookmark_value>
-<bookmark_value>decimal places displayed (Calc)</bookmark_value>
-<bookmark_value>precision as shown (Calc)</bookmark_value>
-<bookmark_value>values; rounded as shown (Calc)</bookmark_value>
-<bookmark_value>rounding precision (Calc)</bookmark_value>
-<bookmark_value>search criteria for database functions in cells</bookmark_value>
-<bookmark_value>Excel; search criteria</bookmark_value>
-</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment>
+         <bookmark_value>calculating;iterative references (Calc)</bookmark_value>
+         <bookmark_value>iterative references in spreadsheets</bookmark_value>
+         <bookmark_value>recursions in spreadsheets</bookmark_value>
+         <bookmark_value>dates; default (Calc)</bookmark_value>
+         <bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
+         <bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
+         <bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
+         <bookmark_value>decimal places displayed (Calc)</bookmark_value>
+         <bookmark_value>precision as shown (Calc)</bookmark_value>
+         <bookmark_value>values; rounded as shown (Calc)</bookmark_value>
+         <bookmark_value>rounding precision (Calc)</bookmark_value>
+         <bookmark_value>search criteria for database functions in cells</bookmark_value>
+         <bookmark_value>Excel; search criteria</bookmark_value>
+</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
-<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#exopbe"/>
-</section>
-<paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Iterative references</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
-<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="5">Iterations</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
-<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="CHG" oldref="7">
-<emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153061" xml-lang="en-US" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149669">
-<tablerow>
-<tablecell colspan="" rowspan="">
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="9">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="10">B</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11">5</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="12">Selling Price</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="13">100</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="14">6</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="15">Net</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="16">=B5-B7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="17">7</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="18">Tax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="19">=B6*0,15</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#exopbe"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2" l10n="U" oldref="3">Iterative references</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154142" role="heading" level="3" l10n="U" oldref="5">Iterations</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148686" role="paragraph" l10n="CHG" oldref="7">
+         <emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156155" role="listitem" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147530" role="listitem" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153061" role="listitem" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154760" role="listitem" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
+         </listitem>
+      </list>
+      <table id="tbl_id3149669">
+         <tablerow>
+            <tablecell>
+</tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="9">A</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145606" role="paragraph" l10n="U" oldref="10">B</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="11">5</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="12">Selling Price</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="13">100</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="14">6</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147317" role="paragraph" l10n="U" oldref="15">Net</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147348" role="paragraph" l10n="U" oldref="16">=B5-B7</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="U" oldref="17">7</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="18">Tax</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="19">=B6*0,15</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
-<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="22">Steps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="24">Minimum Change</paragraph>
-<paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147125" xml-lang="en-US" level="2" l10n="U" oldref="45">Date</paragraph>
-<paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
-<paragraph role="heading" id="hd_id3147396" xml-lang="en-US" level="3" l10n="U" oldref="47">12/30/1899 (default)</paragraph>
-<paragraph role="paragraph" id="par_id3145646" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
-<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
-<paragraph role="heading" id="hd_id3156181" xml-lang="en-US" level="3" l10n="U" oldref="51">01/01/1904</paragraph>
-<paragraph role="paragraph" id="par_id3153948" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
-<paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="2" l10n="U" oldref="26">Case sensitive</paragraph>
-<paragraph role="paragraph" id="par_id3146793" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="28">
-<emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
-<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
-<paragraph role="heading" id="hd_id3145231" xml-lang="en-US" level="2" l10n="U" oldref="53">Decimal places</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
-<paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="2" l10n="U" oldref="30">Precision as shown</paragraph>
-<paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="2" l10n="U" oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
-<table id="tbl_id3149814">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="34">.* in following position:</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="35">Search result:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="36">win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153782" xml-lang="en-US" l10n="U" oldref="38">win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151278" xml-lang="en-US" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155506" xml-lang="en-US" l10n="U" oldref="40">.*win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150886" xml-lang="en-US" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="42">.*win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145750" role="heading" level="3" l10n="U"
+                 oldref="22">Steps</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153728" role="heading" level="3" l10n="U"
+                 oldref="24">Minimum Change</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147125" role="heading" level="2" l10n="U"
+                 oldref="45">Date</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155416" role="paragraph" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147396" role="heading" level="3" l10n="U"
+                 oldref="47">12/30/1899 (default)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156283" role="heading" level="3" l10n="U"
+                 oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156181" role="heading" level="3" l10n="U"
+                 oldref="51">01/01/1904</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153838" role="heading" level="2" l10n="U"
+                 oldref="26">Case sensitive</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="28">
+         <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145231" role="heading" level="2" l10n="U"
+                 oldref="53">Decimal places</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+                 oldref="30">Precision as shown</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
+                 oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+      <table id="tbl_id3149814">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">.* in following position:</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156139" role="tablehead" l10n="U" oldref="35">Search result:</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="36">win</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159239" role="tablecontent" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win.*</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151278" role="tablecontent" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">.*win</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150886" role="tablecontent" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">.*win.*</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152985" role="tablecontent" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX" id="bm_id3154419" localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2" l10n="U" oldref="58">Enable regular expressions in formulas</paragraph>
-<paragraph role="paragraph" id="par_id3155092" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH. 
+      <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX" id="bm_id3154419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
+                 oldref="58">Enable regular expressions in formulas</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH. 
 </caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
-<paragraph role="heading" id="hd_id3156199" xml-lang="en-US" level="2" l10n="U" oldref="55">Automatically find column and row labels</paragraph>
-<paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="57">
-<emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
+                 oldref="55">Automatically find column and row labels</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
+         <emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060600.xhp b/helpcontent2/source/text/shared/optionen/01060600.xhp
index 576ce2dd1e..0229554125 100755
--- a/helpcontent2/source/text/shared/optionen/01060600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01060600.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@
 </section>
 <paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="3">Color Definition for Changes</paragraph>
 <paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="CHG" oldref="4">Defines colors for recorded changes. If you select the "By author" entry, $[officename] will automatically set the color depending on the author who undertook the changes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT" id="bm_id3153192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_CONTENT" id="bm_id3153192" localize="false"/>
 <paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="5">Changes</paragraph>
 <paragraph role="paragraph" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT">Specifies the color for changes of cell contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_REMOVE" id="bm_id3152920" localize="false"/>
 <paragraph role="heading" id="hd_id3158410" xml-lang="en-US" level="3" l10n="U" oldref="7">Deletions</paragraph>
 <paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE">Specifies the color to highlight deletions in a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_INSERT" id="bm_id3154123" localize="false"/>
 <paragraph role="heading" id="hd_id3154685" xml-lang="en-US" level="3" l10n="U" oldref="9">Insertions</paragraph>
 <paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT">Specifies the color to highlight insertions in a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_MOVE" id="bm_id3156422" localize="false"/>
 <paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="11">Moved entries</paragraph>
 <paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE">Specifies the color to highlight moved cell contents.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01060700.xhp b/helpcontent2/source/text/shared/optionen/01060700.xhp
index 6014d46add..ccaa74c92b 100755
--- a/helpcontent2/source/text/shared/optionen/01060700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060700.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01060700.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,8 +31,8 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
+
 <topic id="textsharedoptionen01060700xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Print</title>
 <filename>/text/shared/optionen/01060700.xhp</filename>
@@ -47,16 +43,15 @@
 <paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060700.xhp" name="Print">Print</link></paragraph>
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Determines the printer settings for spreadsheets.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3">
-<emph>Tools - Options - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3"><emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#drucken2"/>
 </section>
 <paragraph role="heading" id="hd_id3153542" xml-lang="en-US" level="2" l10n="U" oldref="4">Pages</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SKIPEMPTYPAGES" id="bm_id3149579" localize="false"/><paragraph role="heading" id="hd_id3156155" xml-lang="en-US" level="3" l10n="U" oldref="5">Suppress output of empty pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES" id="bm_id3149579" localize="false"/><paragraph role="heading" id="hd_id3156155" xml-lang="en-US" level="3" l10n="U" oldref="5">Suppress output of empty pages</paragraph>
 <paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SKIPEMPTYPAGES">Specifies that empty pages that have no cell contents or draw objects are not printed.</ahelp> Cell attributes such as borders or background colors are not considered cell contents. Empty pages are not counted for page numbering.</paragraph>
 <paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="7">Sheets</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="8">Print only selected sheets</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="8">Print only selected sheets</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the <emph>File - Print</emph> dialog or in the <emph>Format - Print Ranges</emph> dialog. Contents from sheets that are not selected will not be printed.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="10">To select multiple sheets, click on the sheet names on the bottom margin of the workspace while keeping the Ctrl key pressed.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01070000.xhp b/helpcontent2/source/text/shared/optionen/01070000.xhp
index ae2e8c2208..f14806ff45 100644
--- a/helpcontent2/source/text/shared/optionen/01070000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp b/helpcontent2/source/text/shared/optionen/01070100.xhp
index f3543ad40d..611fe0cbf2 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070100.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,11 +51,11 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_CONTENTS" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070100.xhp" name="View">View</link></paragraph>
 <paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SD_OPTIONS_CONTENTS">Specifies the available display modes.</ahelp> By selecting an alternative display, you can speed up the screen display while editing your presentation.</paragraph>
 </section><comment>removed 4 options, see i81634</comment><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="23">Display</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER" id="bm_id3159252" localize="false"/><paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER" id="bm_id3159252" localize="false"/><paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
 <paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top and to the left of the work area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_MOVE" id="bm_id2451068" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
 <paragraph role="paragraph" id="par_id3154147" xml-lang="en-US" l10n="U" oldref="28"><variable id="verschieb"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES">Specifies whether to display guides when moving an object.</ahelp>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="29"><variable id="vertext"><item type="productname">%PRODUCTNAME</item> creates dotted guides that extend beyond the box containing the selected object and which cover the entire work area, helping you position the object. 
@@ -66,9 +63,9 @@
 <paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="30">You also can use this function through the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/shared/02/01171400.xhp" name="Icon">icon</link>
 </caseinline><caseinline select="DRAW"><link href="text/shared/02/01171400.xhp" name="Icon">icon</link>
 </caseinline><defaultinline>icon</defaultinline></switchinline> with the same name in the <emph>Options</emph> bar if a presentation or a drawing document is opened.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HANDLES_BEZIER" id="bm_id3153188" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="31">All control points in Bézier editor</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER" id="bm_id3153188" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="31">All control points in Bézier editor</paragraph>
 <paragraph role="paragraph" id="par_id3153877" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HANDLES_BEZIER">Displays the control points of all Bézier points if you have previously selected a <link href="text/shared/00/00000005.xhp#bezierobjekt" name="Bézier curve">Bézier curve</link>. If the <emph>All control points in Bézier</emph> editor option is not marked, only the control points of the selected Bézier points will be visible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_MOVE_OUTLINE" id="bm_id3150115" localize="false"/><paragraph role="heading" id="hd_id3149418" xml-lang="en-US" level="3" l10n="U" oldref="33">Contour of each individual object</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE" id="bm_id3150115" localize="false"/><paragraph role="heading" id="hd_id3149418" xml-lang="en-US" level="3" l10n="U" oldref="33">Contour of each individual object</paragraph>
 <paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_MOVE_OUTLINE"><item type="productname">%PRODUCTNAME</item> displays the contour line of each individual object when moving this object.</ahelp> The <emph>Contour of each individual object </emph>option enables you to see if single objects conflict with other objects in the target position. If you do not mark the <emph>Contour of each individual object </emph>option, <item type="productname">%PRODUCTNAME</item> only displays a square contour that includes all selected objects.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp
index 1478f6666d..f05c46b1d5 100644
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070300.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,85 +29,97 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedoptionen01070300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Grid</title>
-<filename>/text/shared/optionen/01070300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="fangen">
+      <topic id="textsharedoptionen01070300xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Grid</title>
+         <filename>/text/shared/optionen/01070300.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="fangen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163802"><bookmark_value>snapping in presentations and drawings</bookmark_value>
-<bookmark_value>points;reducing editing points when snapping (Impress/Draw)</bookmark_value>
+         <bookmark_value>points;reducing editing points when snapping (Impress/Draw)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/><paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070300.xhp" name="Grid">Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_SNAP">Defines the grid settings for creating and moving objects.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#etopfe"/>
-</section>
-<embed href="text/shared/optionen/01050100.xhp#raster"/>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="3">If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed to deactivate this function for as long as needed.</paragraph>
-<embed href="text/shared/optionen/01050100.xhp#aufun"/>
-<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="4">Snap</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070300.xhp" name="Grid">Grid</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_SNAP">Defines the grid settings for creating and moving objects.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#etopfe"/>
+      </section>
+      <embed href="text/shared/optionen/01050100.xhp#raster"/>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="3">If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Shift key pressed to deactivate this function for as long as needed.</paragraph>
+      <embed href="text/shared/optionen/01050100.xhp#aufun"/>
+      <paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U" oldref="4">Snap</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_USE" id="bm_id3115680" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3147335" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="8">To snap lines</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><variable id="anlinie"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the nearest snap line when you release the mouse.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="U" oldref="9"><variable id="anlinie"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the nearest snap line when you release the mouse.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
+      <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
+</caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SNAP_BORDER" id="bm_id2054461" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="31">To the page margins</paragraph>
-<paragraph role="paragraph" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="11"><variable id="seitenrand"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER">Specifies whether to align the contour of the graphic object to the nearest page margin.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U"
+                 oldref="31">To the page margins</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="11"><variable id="seitenrand"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER">Specifies whether to align the contour of the graphic object to the nearest page margin.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range. 
+      <paragraph xml-lang="en-US" id="par_id3149670" role="paragraph" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
+      <paragraph xml-lang="en-US" id="par_id3148947" role="paragraph" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+</caseinline><defaultinline><emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SNAP_FRAME" id="bm_id215332" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id3153194" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="12">To object frame</paragraph>
-<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="13"><variable id="rahmen"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME">Specifies whether to align the contour of the graphic object to the border of the nearest graphic object.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="3" l10n="U"
+                 oldref="12">To object frame</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148674" role="paragraph" l10n="U" oldref="13"><variable id="rahmen"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME">Specifies whether to align the contour of the graphic object to the border of the nearest graphic object.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range. 
+      <paragraph xml-lang="en-US" id="par_id3147228" role="paragraph" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
+      <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+</caseinline><defaultinline><emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SNAP_POINTS" id="bm_id5317182" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id3155131" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/><paragraph role="heading" id="hd_id3155431" xml-lang="en-US" level="3" l10n="U" oldref="14">To object points</paragraph>
-<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="15"><variable id="opunkte"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS">Specifies whether to align the contour of the graphic object to the points of the nearest graphic object.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155431" role="heading" level="3" l10n="U"
+                 oldref="14">To object points</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="15"><variable id="opunkte"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS">Specifies whether to align the contour of the graphic object to the points of the nearest graphic object.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range. 
+      <paragraph xml-lang="en-US" id="par_id3149483" role="paragraph" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="40">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
+      <paragraph xml-lang="en-US" id="par_id3146146" role="paragraph" l10n="CHG" oldref="40">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Object Points</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA" id="bm_id3152460" localize="false"/><paragraph role="heading" id="hd_id3148645" xml-lang="en-US" level="3" l10n="U" oldref="16">Snap range</paragraph>
-<paragraph role="paragraph" id="par_id3154145" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA">Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the <emph>Snap range</emph> control.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="19">Snap position</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO" id="bm_id3153191" localize="false"/><paragraph role="heading" id="hd_id3154639" xml-lang="en-US" level="3" l10n="U" oldref="21">When creating or moving objects</paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO">Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them.</ahelp> You can temporarily deactivate this setting by pressing the Shift key.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO" id="bm_id3155415" localize="false"/><paragraph role="heading" id="hd_id3159345" xml-lang="en-US" level="3" l10n="U" oldref="23">Extend edges</paragraph>
-<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO">Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the<emph> Extend edges </emph>box is not marked, a square or a circle will be created based on the shorter side or diameter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ROTATE" id="bm_id3151073" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE" id="bm_id3153878" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="25">When rotating</paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE">Specifies that graphic objects can only be rotated within the rotation angle that you selected in the <emph>When rotating</emph> control.</ahelp> If you want to rotate an object outside the defined angle, press the <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key when rotating. Release the key when the desired rotation angle is reached.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE" id="bm_id3153839" localize="false"/><paragraph role="heading" id="hd_id3154163" xml-lang="en-US" level="3" l10n="U" oldref="27">Point reduction</paragraph>
-<paragraph role="paragraph" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE">Defines the angle for point reduction.</ahelp> When working with polygons, you might find it useful to reduce their editing points.</paragraph>
-</body>
-</helpdocument>
+</caseinline><defaultinline><emph>Snap to Object Points</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA" id="bm_id3152460" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148645" role="heading" level="3" l10n="U"
+                 oldref="16">Snap range</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154145" role="paragraph" l10n="CHG" oldref="17"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA">Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the <emph>Snap range</emph> control.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+                 oldref="19">Snap position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO" id="bm_id3153191" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154639" role="heading" level="3" l10n="U"
+                 oldref="21">When creating or moving objects</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150417" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO">Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them.</ahelp> You can temporarily deactivate this setting by pressing the Shift key.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO" id="bm_id3155415" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159345" role="heading" level="3" l10n="U"
+                 oldref="23">Extend edges</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154942" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO">Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the<emph> Extend edges </emph>box is not marked, a square or a circle will be created based on the shorter side or diameter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE" id="bm_id3151073" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE" id="bm_id3153878" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149413" role="heading" level="3" l10n="U"
+                 oldref="25">When rotating</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE">Specifies that graphic objects can only be rotated within the rotation angle that you selected in the <emph>When rotating</emph> control.</ahelp> If you want to rotate an object outside the defined angle, press the Shift key when rotating. Release the key when the desired rotation angle is reached.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE" id="bm_id3153839" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154163" role="heading" level="3" l10n="U"
+                 oldref="27">Point reduction</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156275" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE">Defines the angle for point reduction.</ahelp> When working with polygons, you might find it useful to reduce their editing points.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index 0f8e8040a0..2a2f58e3c1 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01070400.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -66,42 +63,43 @@
 </section><comment>removed contents-to-print section for impress, i85723</comment><paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="13">Print</paragraph>
 <paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="14">Defines additional elements to be printed on the page margin.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Page name</paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name of a document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
-<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies wither to print the current time.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies whether to print the current time.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES" id="bm_id3148457" localize="false"/><paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="23">Hidden pages</paragraph>
 <paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES">Specifies whether to print the pages that are currently hidden from the presentation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="2" l10n="U" oldref="43">Quality</paragraph>
 <paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="U" oldref="54">See also <embedvar href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="45">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="45">Default</paragraph>
 <paragraph role="paragraph" id="par_id3145608" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR">Specifies that you want to print in original colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_GRAYSCALE" id="bm_id3147287" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="50">Grayscale</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE" id="bm_id3147287" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="50">Grayscale</paragraph>
 <paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_GRAYSCALE">Specifies that you want to print colors as grayscale.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_BLACKWHITE" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="52">Black &amp; white</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="52">Black &amp; white</paragraph>
 <paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_BLACKWHITE">Specifies that you want to print the document in black and white.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="2" l10n="U" oldref="21">Page options</paragraph>
 <paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="22">Define additional options for printing the pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_DEFAULT" id="bm_id3146900" localize="false"/><paragraph role="heading" id="hd_id3151207" xml-lang="en-US" level="3" l10n="U" oldref="25">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT" id="bm_id3146900" localize="false"/><paragraph role="heading" id="hd_id3151207" xml-lang="en-US" level="3" l10n="U" oldref="25">Default</paragraph>
 <paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_DEFAULT">Specifies that you do not want to further scale pages when printing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGESIZE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3153710" xml-lang="en-US" level="3" l10n="U" oldref="27">Fit to page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3153710" xml-lang="en-US" level="3" l10n="U" oldref="27">Fit to page</paragraph>
 <section id="fittopage">
 <paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGESIZE">Specifies whether to scale down objects that are beyond the margins of the current printer, so that they fit on the paper in the printer.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGETILE" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="29">Tile pages</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="29">Tile pages</paragraph>
 <paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGETILE">Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BOOKLET" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="3" l10n="U" oldref="31">Brochure</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="3" l10n="U" oldref="31">Brochure</paragraph>
 <paragraph role="paragraph" id="par_id3147322" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BOOKLET">Select the<emph> Brochure </emph>option to print the document in brochure format.</ahelp> You can also decide if you want to print the front, the back or both sides of the brochure.</paragraph>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_FRONT" id="bm_id3147004" localize="false"/><paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="35">Front</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT" id="bm_id3147004" localize="false"/><paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="35">Front</paragraph>
 <paragraph role="paragraph" id="par_id3145766" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_FRONT">Select<emph> Front </emph>to print the front of a brochure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_BACK" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3145760" xml-lang="en-US" level="3" l10n="U" oldref="37">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3145760" xml-lang="en-US" level="3" l10n="U" oldref="37">Back</paragraph>
 <paragraph role="paragraph" id="par_id3154118" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_BACK">Select <emph>Back</emph> to print the back of a brochure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAPERBIN" id="bm_id3146808" localize="false"/><paragraph role="heading" id="hd_id3153704" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN" id="bm_id3146808" localize="false"/><paragraph role="heading" id="hd_id3153704" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
 <paragraph role="paragraph" id="par_id3150380" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAPERBIN">Determines that the paper tray to be used is the one defined in the printer setup.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 35ca157bf2..018a4d6580 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01070500.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
 <embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
 </section>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_QUICKEDIT" id="bm_id7033098" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow quick editing</paragraph>
@@ -68,7 +65,7 @@
 </caseinline><caseinline select="CHART">
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the<emph> Allow Quick Editing </emph><link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_PICK_THROUGH" id="bm_id1003023" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
 <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3" l10n="U" oldref="7">Only text area selectable</paragraph>
@@ -82,40 +79,40 @@
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline>In a presentation or drawing document, you can also activate this mode through the<emph> Select Text Area Only </emph><link href="text/simpress/02/13190000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
 <paragraph role="heading" id="hd_id3155308" xml-lang="en-US" level="2" l10n="U" oldref="9">New document (only in presentations)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE" id="bm_id3152460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE" id="bm_id3152460" localize="false"/>
 <paragraph role="heading" id="hd_id3146986" xml-lang="en-US" level="3" l10n="U" oldref="30">Start with Wizard</paragraph>
 <paragraph role="paragraph" id="par_id3148646" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE">Specifies whether to activate the Wizard when opening a presentation with <emph>File - New - Presentation</emph>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="2" l10n="U" oldref="13">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE" id="bm_id3145750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE" id="bm_id3145750" localize="false"/>
 <paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="3" l10n="U" oldref="15">Use background cache</paragraph>
 <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE">Specifies whether to use the cache for displaying objects on the master page.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3" l10n="U" oldref="17">Copy when moving</paragraph>
 <paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY">Specifies whether to automatically create a copy when you move an object while holding down the Ctrl key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/>
 <paragraph role="heading" id="hd_id3148457" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects always moveable</paragraph>
 <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS">Specifies that you want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can only be used to rotate an object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION" id="bm_id3151207" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION" id="bm_id3151207" localize="false"/>
 <paragraph role="heading" id="hd_id3154512" xml-lang="en-US" level="3" l10n="U" oldref="21">Do not distort objects in curve (only in drawings)</paragraph>
 <paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION">Maintains relative alignment of Bézier points and 2D drawing objects to each other when you distort the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_TP_OPTIONS_MISC_LB_METRIC" id="bm_id3153709" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:TP_OPTIONS_MISC:LB_METRIC" id="bm_id3153709" localize="false"/>
 <paragraph role="heading" id="hd_id3154163" xml-lang="en-US" level="3" l10n="U" oldref="32">Unit of measurement</paragraph>
 <paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SD_LISTBOX_TP_OPTIONS_MISC_LB_METRIC">Determines the <link href="text/shared/00/00000003.xhp#metrik" name="Unit of measurement">Unit of measurement</link> for presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_METRICFIELD_TP_OPTIONS_MISC_MTR_FLD_TABSTOP" id="bm_id3154757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP" id="bm_id3154757" localize="false"/>
 <paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="34">Tab stops</paragraph>
 <paragraph role="paragraph" id="par_id3155443" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SD_METRICFIELD_TP_OPTIONS_MISC_MTR_FLD_TABSTOP">Defines the spacing between tab stops.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156383" xml-lang="en-US" level="2" l10n="U" oldref="24">Start presentation (only in presentations)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE" id="bm_id3151249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE" id="bm_id3151249" localize="false"/>
 <paragraph role="heading" id="hd_id3155902" xml-lang="en-US" level="3" l10n="U" oldref="26">Always with current page</paragraph>
 <paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE">Specifies that you always want a presentation to start with the current slide.</ahelp> Unmark<emph> Always with current page</emph> to always start a presentation with the first page.</paragraph>
 <paragraph role="heading" id="hd_id3163806" xml-lang="en-US" level="2" l10n="U" oldref="41">Scale (only in drawings)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_COMBOBOX_TP_OPTIONS_MISC_CB_SCALE" id="bm_id3146317" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE" id="bm_id3146317" localize="false"/>
 <paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="3" l10n="U" oldref="43">Drawing scale</paragraph>
 <paragraph role="paragraph" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SD_COMBOBOX_TP_OPTIONS_MISC_CB_SCALE">Determines the drawing scale on the rulers.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155177" xml-lang="en-US" level="2" l10n="U" oldref="36">Compatibility (document specific settings)</paragraph>
 <paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="44">The settings in this area are valid for the current document only.</paragraph>
 <embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST" id="bm_id3153788" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST" id="bm_id3153788" localize="false"/>
 <paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="38">Add spacing between paragraphs in the current document</paragraph>
 <paragraph role="paragraph" id="par_id3145768" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST">Specifies that $[officename] Impress calculates the paragraph spacing exactly like Microsoft PowerPoint.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="40">Microsoft PowerPoint adds the bottom spacing of a paragraph to the top spacing of the next paragraph to calculate the total spacing between both paragraphs. $[officename] Impress utilizes only the larger of the two spacings.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01080000.xhp b/helpcontent2/source/text/shared/optionen/01080000.xhp
index 014f957bc1..906fe5f4cb 100644
--- a/helpcontent2/source/text/shared/optionen/01080000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01080000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01090000.xhp b/helpcontent2/source/text/shared/optionen/01090000.xhp
index 0c89a75233..000d4df425 100644
--- a/helpcontent2/source/text/shared/optionen/01090000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01090000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
 <paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
-</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph>Tools - Options</emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
+</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#etsodr"/>
 </section>
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index eee7100256..641f4e3e43 100755
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01090100.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -55,7 +52,7 @@
 <bookmark_value>scaling; printing in $[officename] Math</bookmark_value>
 <bookmark_value>fitting to pages;print settings in Math</bookmark_value>
 </bookmark><comment>mw inserted "fitting..."</comment>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:TABPAGE:RID_PRINTOPTIONPAGE" id="bm_id3150178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:TabPage:RID_PRINTOPTIONPAGE" id="bm_id3150178" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PRINT_OPTIONS" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="1" l10n="U" oldref="1">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="18"><variable id="einst"><ahelp hid="HID_PRINT_OPTIONS">Defines formula settings that will be valid for all documents.</ahelp>
 </variable></paragraph>
@@ -63,22 +60,22 @@
   <embed href="text/shared/00/00000406.xhp#formeinst"/>
 </section>
 <paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="2" l10n="U" oldref="2">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title</paragraph>
 <paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT">Specifies whether to include the contents of the <emph>Commands</emph> window at the bottom of the printout.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="8">Border</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME">Applies a thin border to the formula area in the printout.</ahelp><emph>Title row</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
+<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Applies a thin border to the formula area in the printout.</ahelp> <emph>Title</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
 <paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2" l10n="U" oldref="10">Print format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
 <paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE">Prints the formula without adjusting the current font size.</ahelp> It is possible that with large formulas a part of the command text is cut off.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE" id="bm_id3147264" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="14">Fit to size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE" id="bm_id3147264" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="14">Fit to size</paragraph>
 <paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE">Adjusts the formula to the page format used in the printout.</ahelp> The real size will be determined by the used paper format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ZOOM" id="bm_id3151210" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
 <paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM">Reduces or enlarges the size of the printed formula by a specified enlargement factor.</ahelp> Type the desired enlargement factor directly in the <emph>Scaling</emph> control, or set the value using the arrow buttons.</paragraph>
 <paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="19">Other options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
 <paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING">Specifies that these space wildcards will be removed if they are at the end of a line.</ahelp> In earlier versions of $[officename], adding such characters at the end of a line prevented the right edge of the formula from being cut off during printing.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01110000.xhp b/helpcontent2/source/text/shared/optionen/01110000.xhp
index 47effa3304..ea7cbcfd52 100755
--- a/helpcontent2/source/text/shared/optionen/01110000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01110100.xhp b/helpcontent2/source/text/shared/optionen/01110100.xhp
index 36b2810886..a6d44e6440 100755
--- a/helpcontent2/source/text/shared/optionen/01110100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#diagrgfarbe"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST" id="bm_id3153346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST" id="bm_id4940946" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="2" l10n="U" oldref="3">Chart colors</paragraph>
+<!-- removed HID SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST" id="bm_id4940946" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="2" l10n="U" oldref="3">Chart colors</paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST">Displays all the colors available for the data series.</ahelp> Select a data series to change its color. Select the desired color from the adjacent color table.</paragraph>
 <paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="2" l10n="U" oldref="5">Color table</paragraph>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6">This table is used as a means of replacing the chart colors for the selected data rows. For example, if you selected data row 6 and then click on the color green 8, the old color of the data row is replaced by green 8. The name of the selected color is shown below the color table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT" id="bm_id3145383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OPTPAGE_CHART_DEFCOLORS_PB_RESET_TO_DEFAULT" id="bm_id5361491" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="2" l10n="U" oldref="7">Default</paragraph>
+<!-- removed HID SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT" id="bm_id5361491" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="2" l10n="U" oldref="7">Default</paragraph>
 <paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT">Restores the color settings that were defined when the program was installed.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index 69f8c5eaa0..5981a50cf4 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,65 +32,70 @@
  
 	
 <meta>
-<topic id="textsharedoptionen01130100xml" indexer="include">
-<title id="tit" xml-lang="en-US">VBA Properties</title>
-<filename>/text/shared/optionen/01130100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="office">
+      <topic id="textsharedoptionen01130100xml" indexer="include">
+         <title xml-lang="en-US" id="tit">VBA Properties</title>
+         <filename>/text/shared/optionen/01130100.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="office">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>Microsoft Office; importing/exporting VBA code</bookmark_value>
-<bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
-<bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
-<bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
+         <bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
+         <bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
+         <bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
+         <bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
+         <bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
+         <bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="1" l10n="U" oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#etsofi"/>
-</section>
-<paragraph role="heading" id="hd_id3145582" xml-lang="en-US" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174017" id="bm_id0523200811471179" localize="false"/><comment>Help IDs got changed, but are not updated in hid.lst. So only numeric IDs here</comment>
-<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved. 
+<paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="1" l10n="U"
+                    oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#etsofi"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3145582" role="heading" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149762" role="paragraph" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE" id="bm_id1012200910594212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE" id="bm_id101220091104572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE" id="bm_id1012200911053796" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155420" role="heading" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159399" role="paragraph" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174018" id="bm_id052320081146569" localize="false"/>
-<paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
-<section id="origtext">
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with it in an unchanged form.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174019" id="bm_id0523200811462736" localize="false"/>
-<paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="11">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174020" id="bm_id0523200811460569" localize="false"/>
-<paragraph role="heading" id="hd_id0523200811475727" xml-lang="en-US" level="3" l10n="NEW">Executable code</paragraph>
-<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174021" id="bm_id0523200811454459" localize="false"/>
-<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="3" l10n="U" oldref="12">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174022" id="bm_id0523200811451458" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="15">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174023" id="bm_id0523200811435766" localize="false"/>
-<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="16">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG" id="bm_id1012200911004150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG" id="bm_id1012200911020741" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG" id="bm_id1012200911024686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
+      <section id="origtext">
+         <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with the code in an unchanged form.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151246" role="paragraph" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154072" role="heading" level="3" l10n="U"
+                 oldref="11">Load Basic code</paragraph>
+      <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL" id="bm_id1012200911063630" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0523200811475727" role="heading" level="3" l10n="NEW">Executable code</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0523200811475733" role="paragraph" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151211" role="heading" level="3" l10n="U"
+                 oldref="12">Save original Basic code</paragraph>
+      <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+      <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U"
+                 oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="3" l10n="U"
+                 oldref="15">Load Basic code</paragraph>
+      <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+      <paragraph xml-lang="en-US" id="hd_id3145419" role="heading" level="3" l10n="U"
+                 oldref="16">Save original Basic code</paragraph>
+      <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+         <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+         <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01130200.xhp b/helpcontent2/source/text/shared/optionen/01130200.xhp
index 2fa1eb0190..ad48159533 100755
--- a/helpcontent2/source/text/shared/optionen/01130200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130200.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01130200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,31 +27,31 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+ 
+	
 <meta>
-<topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Microsoft Office</title>
-<filename>/text/shared/optionen/01130200.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>
-  
-  
-  <section id="office1">
-  <paragraph id="hd_id3156410" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
-  <paragraph role="paragraph" id="par_id3149095" l10n="U" xml-lang="en-US" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
-  </section>
-  <paragraph role="paragraph" id="par_id3159233" l10n="U" xml-lang="en-US" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
-  <section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#etsofi2"/>
-</section>
-  <bookmark branch="hid/HID_OFAPAGE_MSFLTR2_CLB" xml-lang="en-US" id="bm_id3158430"/><paragraph role="heading" level="2" id="hd_id3146798" l10n="U" xml-lang="en-US" oldref="3">List Box</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3150670" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
-  <paragraph role="paragraph" id="par_id3154286" l10n="U" xml-lang="en-US" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
-  <paragraph role="paragraph" id="par_id3153880" l10n="U" xml-lang="en-US" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
- </body>
-</helpdocument>
+      <topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Microsoft Office</title>
+         <filename>/text/shared/optionen/01130200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="office1">
+         <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0107200910364795" role="paragraph" l10n="NEW">If an OLE server is active for the embedded object, then the OLE server will be used to handle the object.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0107200910364725" role="paragraph" l10n="NEW">If no OLE server is active for MathType objects, then embedded MathType objects can be converted to %PRODUCTNAME Math objects. For this conversion, the embedded MathType objects must not exceed the MathType 3.1 specifications.<comment>mail answer by Thomas Lange re i97686</comment></paragraph>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#etsofi2"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2" l10n="U" oldref="3">List Box</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153880" role="paragraph" l10n="U" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01140000.xhp b/helpcontent2/source/text/shared/optionen/01140000.xhp
index 7b8cb30ebc..0c7e811c28 100755
--- a/helpcontent2/source/text/shared/optionen/01140000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01140000.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,73 +31,86 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsharedoptionen01140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Languages</title>
-<filename>/text/shared/optionen/01140000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="sprachen">
+      <topic id="textsharedoptionen01140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Languages</title>
+         <filename>/text/shared/optionen/01140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="sprachen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154751"><bookmark_value>languages; locale settings</bookmark_value>
-<bookmark_value>locale settings</bookmark_value>
-<bookmark_value>Asian languages; enabling</bookmark_value>
-<bookmark_value>languages; Asian support</bookmark_value>
-<bookmark_value>complex text layout; enabling</bookmark_value>
-<bookmark_value>Arabic;language settings</bookmark_value>
-<bookmark_value>Hebrew;language settings</bookmark_value>
-<bookmark_value>Thai;language settings</bookmark_value>
-<bookmark_value>Hindi;language settings</bookmark_value>
-<bookmark_value>decimal separator key</bookmark_value>
-</bookmark><comment>mw deleted "language settings;" and "Asian languages;supporting"</comment><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01140000.xhp" name="Languages">Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Defines the default languages and some other locale settings for documents.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#sprachen"/>
-</section>
-<paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="2" l10n="U" oldref="21">Language of</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_USERINTERFACE" id="bm_id7035737" localize="false"/><paragraph role="heading" id="par_idN10681" xml-lang="en-US" level="3" l10n="NEW">User interface</paragraph>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Select the language used for the user interface, for example menus, dialogs, help files. You must have installed at least one additional language pack or a multi-language version of %PRODUCTNAME.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING" id="bm_id3145136" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_LOCALESETTING" id="bm_id1609241" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="22">Locale setting</paragraph>
-<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING">Specifies the locale setting of the country setting. This influences settings for numbering, currency and units of measure.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="27">A change in this field is immediately applicable. However, some formats that were formatted by default change only if the document is newly loaded.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR" id="bm_id2873012" localize="false"/><paragraph role="heading" id="par_idN106DE" xml-lang="en-US" level="3" l10n="NEW">Decimal separator key - Same as locale setting</paragraph>
-<paragraph role="paragraph" id="par_idN106E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies to use the decimal separator key that is set in your system when you press the respective key on the number pad.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN106F1" xml-lang="en-US" l10n="NEW">If this checkbox is activated, the character shown after "Same as locale setting" is inserted when you press the key on the number pad. If this checkbox is not activated, the character that your keyboard driver software provides is inserted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_CURRENCY" id="bm_id9471419" localize="false"/><paragraph role="heading" id="hd_id3147209" xml-lang="en-US" level="3" l10n="U" oldref="24">Default currency</paragraph>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY">Specifies the default currency that is used for the currency format and the currency fields.</ahelp> If you change the locale setting, the default currency changes automatically.</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="29">The default entry applies to the currency format that is assigned to the selected locale setting.</paragraph>
-<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="26">A change in <emph>Default currency</emph> field will be transmitted to all open documents and will lead to corresponding changes in the dialogs and icons that control the currency format in these documents.</paragraph>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="2" l10n="U" oldref="5">Default languages for documents</paragraph>
-<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="6">Specifies the languages for spellchecking, thesaurus and hyphenation.</paragraph>
-<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<section id="sprachmodul">
-<paragraph role="warning" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="8">The spellcheck for the selected language only functions when you have installed the corresponding language module. <embedvar href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
-</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG" id="bm_id3148452" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_WEST_LANG" id="bm_id4734946" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="U" oldref="9">Western</paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG">Specifies the language used for the spellcheck function in western alphabets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG" id="bm_id3152933" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_ASIAN_LANG" id="bm_id908841" localize="false"/><paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="3" l10n="U" oldref="11">Asian</paragraph>
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG">Specifies the language used for the spellcheck function in Asian alphabets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG" id="bm_id3151041" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_COMPLEX_LANG" id="bm_id2717062" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="31">CTL</paragraph>
-<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG">Specifies the language for the complex text layout spellcheck.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC" id="bm_id3155131" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC" id="bm_id3376262" localize="false"/><paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="15">For the current document only</paragraph>
-<paragraph role="paragraph" id="par_id3155432" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC">Specifies that the settings for default languages are valid only for the current document.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="CHG" oldref="17">Enhanced language support</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT" id="bm_id3155854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT" id="bm_id105594" localize="false"/><paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Enabled for Asian languages</paragraph>
-<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT">Activates Asian languages support. You can now modify the corresponding Asian language settings in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18">If you want to write in Chinese, Japanese or Korean, you can activate the support for these languages in the user interface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT" id="bm_id3150010" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT" id="bm_id295724" localize="false"/><paragraph role="heading" id="hd_id3146147" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Enabled for complex text layout (CTL)</paragraph>
-<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT">Activates complex text layout support. You can now modify the settings corresponding to complex text layout in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<embed href="text/shared/guide/ctl.xhp#ctl"/>
-</body>
-</helpdocument>
+         <bookmark_value>locale settings</bookmark_value>
+         <bookmark_value>Asian languages; enabling</bookmark_value>
+         <bookmark_value>languages; Asian support</bookmark_value>
+         <bookmark_value>complex text layout; enabling</bookmark_value>
+         <bookmark_value>Arabic;language settings</bookmark_value>
+         <bookmark_value>Hebrew;language settings</bookmark_value>
+         <bookmark_value>Thai;language settings</bookmark_value>
+         <bookmark_value>Hindi;language settings</bookmark_value>
+         <bookmark_value>decimal separator key</bookmark_value>
+</bookmark><comment>mw deleted "language settings;" and "Asian languages;supporting"</comment>
+<paragraph xml-lang="en-US" id="hd_id3151299" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01140000.xhp" name="Languages">Languages</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Defines the default languages and some other locale settings for documents.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#sprachen"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3156042" role="heading" level="2" l10n="U"
+                 oldref="21">Language of</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE" id="bm_id7035737" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="3" l10n="NEW">User interface</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10685" role="paragraph" l10n="CHG"><ahelp hid=".">Select the language used for the user interface, for example menus, dialogs, help files. You must have installed at least one additional language pack or a multi-language version of %PRODUCTNAME.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0125201009445727" role="paragraph" l10n="NEW">The "Default" entry selects the language of the user interface for the operating system. If this language is not available in the %PRODUCTNAME installation, the language of the %PRODUCTNAME installation is the default language.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING" id="bm_id1609241" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154751" role="heading" level="3" l10n="U"
+                 oldref="22">Locale setting</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157958" role="paragraph" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING">Specifies the locale setting of the country setting. This influences settings for numbering, currency and units of measure.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0125201009445950" role="paragraph" l10n="NEW">The "Default" entry selects the locale setting that is selected for the operating system.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="27">A change in this field is immediately applicable. However, some formats that were formatted by default change only if the document is newly loaded.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR" id="bm_id2873012" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106DE" role="heading" level="3" l10n="NEW">Decimal separator key - Same as locale setting</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106E2" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies to use the decimal separator key that is set in your system when you press the respective key on the number pad.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106F1" role="paragraph" l10n="NEW">If this checkbox is activated, the character shown after "Same as locale setting" is inserted when you press the key on the number pad. If this checkbox is not activated, the character that your keyboard driver software provides is inserted.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY" id="bm_id9471419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="3" l10n="U"
+                 oldref="24">Default currency</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="25"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY">Specifies the default currency that is used for the currency format and the currency fields.</ahelp> If you change the locale setting, the default currency changes automatically.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="29">The default entry applies to the currency format that is assigned to the selected locale setting.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157909" role="paragraph" l10n="U" oldref="26">A change in <emph>Default currency</emph> field will be transmitted to all open documents and will lead to corresponding changes in the dialogs and icons that control the currency format in these documents.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153127" role="heading" level="2" l10n="U" oldref="5">Default languages for documents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149763" role="paragraph" l10n="U" oldref="6">Specifies the languages for spellchecking, thesaurus and hyphenation.</paragraph>
+      <embed href="text/shared/guide/language_select.xhp#language_select"/>
+      <section id="sprachmodul">
+         <paragraph xml-lang="en-US" id="par_id3148663" role="warning" l10n="U" oldref="8">The spellcheck for the selected language only functions when you have installed the corresponding language module. <embedvar href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
+         </paragraph>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG" id="bm_id4734946" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="3" l10n="U" oldref="9">Western</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="10"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG">Specifies the language used for the spellcheck function in western alphabets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG" id="bm_id908841" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156422" role="heading" level="3" l10n="U"
+                 oldref="11">Asian</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="12"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG">Specifies the language used for the spellcheck function in Asian alphabets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG" id="bm_id2717062" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158407" role="heading" level="3" l10n="U"
+                 oldref="31">CTL</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156212" role="paragraph" l10n="U" oldref="32"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG">Specifies the language for the complex text layout spellcheck.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC" id="bm_id3376262" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="3" l10n="U"
+                 oldref="15">For the current document only</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155432" role="paragraph" l10n="U" oldref="16"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC">Specifies that the settings for default languages are valid only for the current document.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156441" role="heading" level="2" l10n="CHG"
+                 oldref="17">Enhanced language support</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT" id="bm_id105594" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148575" role="heading" level="3" l10n="CHG"
+                 oldref="19">Enabled for Asian languages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145748" role="paragraph" l10n="U" oldref="20"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT">Activates Asian languages support. You can now modify the corresponding Asian language settings in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152938" role="paragraph" l10n="U" oldref="18">If you want to write in Chinese, Japanese or Korean, you can activate the support for these languages in the user interface.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT" id="bm_id295724" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="CHG"
+                 oldref="33">Enabled for complex text layout (CTL)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="U" oldref="35"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT">Activates complex text layout support. You can now modify the settings corresponding to complex text layout in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
+      <embed href="text/shared/guide/ctl.xhp#ctl"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01150000.xhp b/helpcontent2/source/text/shared/optionen/01150000.xhp
index 1cb9e859b6..81fed70731 100644
--- a/helpcontent2/source/text/shared/optionen/01150000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01150000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01150100.xhp b/helpcontent2/source/text/shared/optionen/01150100.xhp
index f5f33089b7..9c9fc456d4 100755
--- a/helpcontent2/source/text/shared/optionen/01150100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01150100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,35 +54,35 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Kerning</paragraph>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for kerning between individual characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING" id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING" id="bm_id3149811" localize="false"/>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="5">Western characters only</paragraph>
 <paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING">Specifies that kerning is only applied to western text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT" id="bm_id3157910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT" id="bm_id3157910" localize="false"/>
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="7">Western text and Asian punctuation</paragraph>
 <paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT">Specifies that kerning is applied to both western text and Asian punctuation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="2" l10n="U" oldref="9">Character spacing</paragraph>
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="10">Defines the default settings for character spacing in Asian texts, cells, and drawing objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP" id="bm_id3159158" localize="false"/>
 <paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="11">No compression</paragraph>
 <paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP">Specifies that no compression at all will occur.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP" id="bm_id3154514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP" id="bm_id3154514" localize="false"/>
 <paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="3" l10n="U" oldref="13">Compress only punctuation</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP">Specifies that only the punctuation is compressed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP" id="bm_id3148944" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP" id="bm_id3148944" localize="false"/>
 <paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="15">Compress punctuation and Japanese Kana</paragraph>
 <paragraph role="paragraph" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP">Specifies that punctuation and Japanese Kana are compressed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="2" l10n="U" oldref="17">First and last characters</paragraph>
 <paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="18">Defines the default settings for 'first' and 'last' characters. In the dialog that appears when you choose <emph>Format -</emph><link href="text/shared/01/05020700.xhp" name="Asian Typography"><emph>Asian Typography</emph></link>, you can specify whether the list of forbidden characters applies to those at the beginning or end of a line in a paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE" id="bm_id3154138" localize="false"/>
 <paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="19">Language</paragraph>
 <paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE">Specifies the language for which you want to define first and last characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD" id="bm_id3150767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD" id="bm_id3150767" localize="false"/>
 <paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="21">Default</paragraph>
 <paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD">When you mark<emph> Default</emph>, the following two text boxes are filled with the default characters for the selected language:</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_START" id="bm_id3154216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START" id="bm_id3154216" localize="false"/>
 <paragraph role="heading" id="hd_id3144761" xml-lang="en-US" level="3" l10n="U" oldref="23">Not at start of line:</paragraph>
 <paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_START">Specifies the characters that should not appear alone at the beginning of a line.</ahelp> If a character typed here is positioned at the beginning of a line after a line break, it is automatically moved to the end of the previous line. For example, an exclamation point at the end of a sentence never appears at the start of a line if it is part of the <emph>Not at start of line</emph> list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_END" id="bm_id3149560" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END" id="bm_id3149560" localize="false"/>
 <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="U" oldref="25">Not at end of line:</paragraph>
 <paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_END">Specifies the characters that should not appear alone at the end of a line.</ahelp> If a character typed here is positioned at the end of a line due to a line break, it is automatically moved to the beginning of the next line. For example, a currency symbol that appears in front of an amount never appears at the end of a line if it is part of the<emph> Not at end of line</emph> list.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01150200.xhp b/helpcontent2/source/text/shared/optionen/01150200.xhp
index 9e5bc244c5..a915f6d9bf 100755
--- a/helpcontent2/source/text/shared/optionen/01150200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01150200.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,9 +49,9 @@
   <embed href="text/shared/00/00000406.xhp#suchja"/>
 </section>
   <section id="asia">
-  <bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_CASE" xml-lang="en-US" id="bm_id3150276"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_FULL_HALF_WIDTH" xml-lang="en-US" id="bm_id3152350"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_HIRAGANA_KATAKANA" xml-lang="en-US" id="bm_id3149233"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_CONTRACTIONS" xml-lang="en-US" id="bm_id3143270"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_MINUS_DASH_CHOON" xml-lang="en-US" id="bm_id3149415"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_REPEAT_CHAR_MARKS" xml-lang="en-US" id="bm_id3145119"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI" xml-lang="en-US" id="bm_id3156155"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_OLD_KANA_FORMS" xml-lang="en-US" id="bm_id3154898"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_DIZI_DUZU" xml-lang="en-US" id="bm_id3147574"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_BAVA_HAFA" xml-lang="en-US" id="bm_id3159157"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_TSITHICHI_DHIZI" xml-lang="en-US" id="bm_id3156329"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_HYUFYU_BYUVYU" xml-lang="en-US" id="bm_id3153821"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_SESHE_ZEJE" xml-lang="en-US" id="bm_id3156152"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_IAIYA" xml-lang="en-US" id="bm_id3145315"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_KIKU" xml-lang="en-US" id="bm_id3155135"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3155419"/><paragraph role="heading" level="2" id="hd_id3159399" l10n="U" xml-lang="en-US" oldref="3">Treat as equal</paragraph>
+  <bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE" xml-lang="en-US" id="bm_id3150276"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH" xml-lang="en-US" id="bm_id3152350"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA" xml-lang="en-US" id="bm_id3149233"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS" xml-lang="en-US" id="bm_id3143270"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON" xml-lang="en-US" id="bm_id3149415"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS" xml-lang="en-US" id="bm_id3145119"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI" xml-lang="en-US" id="bm_id3156155"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS" xml-lang="en-US" id="bm_id3154898"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU" xml-lang="en-US" id="bm_id3147574"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA" xml-lang="en-US" id="bm_id3159157"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI" xml-lang="en-US" id="bm_id3156329"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU" xml-lang="en-US" id="bm_id3153821"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE" xml-lang="en-US" id="bm_id3156152"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA" xml-lang="en-US" id="bm_id3145315"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU" xml-lang="en-US" id="bm_id3155135"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3155419"/><paragraph role="heading" level="2" id="hd_id3159399" l10n="U" xml-lang="en-US" oldref="3">Treat as equal</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154514" xml-lang="en-US" oldref="4"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_PROLONGED_SOUNDMARK" visibility="visible">Specifies the options to be treated as equal in a search.</ahelp></paragraph>
-  <bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PUNCTUATION" xml-lang="en-US" id="bm_id3156024"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3151246"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_WHITESPACES" xml-lang="en-US" id="bm_id3151245"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT" xml-lang="en-US" id="bm_id3153898"/><paragraph role="heading" level="2" id="hd_id3148944" l10n="U" xml-lang="en-US" oldref="5">Ignore</paragraph>
+  <bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION" xml-lang="en-US" id="bm_id3156024"/><!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PROLONGED_SOUNDMARK --><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES" xml-lang="en-US" id="bm_id3151245"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT" xml-lang="en-US" id="bm_id3153898"/><paragraph role="heading" level="2" id="hd_id3148944" l10n="U" xml-lang="en-US" oldref="5">Ignore</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147264" xml-lang="en-US" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT" visibility="visible">Specifies the characters to be ignored.</ahelp></paragraph>
   </section>
  </body>
diff --git a/helpcontent2/source/text/shared/optionen/01150300.xhp b/helpcontent2/source/text/shared/optionen/01150300.xhp
index 5257ba00fd..8c1375009a 100755
--- a/helpcontent2/source/text/shared/optionen/01150300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01150300.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,8 +55,8 @@ dedr: reviewed</lastedited>
 <embed href="text/shared/guide/ctl.xhp#ctl"/>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="5">Sequence checking</paragraph>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="6">In languages such as Thai, rules specify that certain characters are not allowed next to other characters. If Sequence Input Checking (SIC) is enabled, <item type="productname">%PRODUCTNAME</item> will not allow a character next to another if this is forbidden by a rule.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_OPTIONS_CTL_CB_SEQUENCECHECKING" id="bm_id3153681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK" id="bm_id3147009" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING" id="bm_id3153681" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK -->
 <paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="1">Use sequence checking</paragraph>
 <paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK">Enables sequence input checking for languages such as Thai.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW"><comment>hid/svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_RESTRICTED</comment><comment>UFI: must wait for next CWS to be converted to a Help ID</comment></paragraph>
@@ -67,14 +64,14 @@ dedr: reviewed</lastedited>
 <paragraph role="paragraph" id="par_idN10695" xml-lang="en-US" l10n="NEW">Prevents the use as well as the printing of illegal character combinations.<comment>UFI: see #103780#</comment></paragraph>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">Cursor control</paragraph>
 <paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="8">Select the type of text cursor movement and text selection for mixed text (right-to-left mixed with left-to-right text direction).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_LOGICAL" id="bm_id3145383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL" id="bm_id3145383" localize="false"/>
 <paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="3" l10n="U" oldref="9">Logical</paragraph>
 <paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_LOGICAL">Pressing the Right Arrow key moves the text cursor toward the end of the current text. Pressing the Left Arrow key moves the text cursor toward the beginning of the current text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_VISUAL" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL" id="bm_id3148685" localize="false"/>
 <paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="11">Visual</paragraph>
 <paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_VISUAL">Pressing the Right Arrow key moves the text cursor in the right-hand direction. Pressing the Left Arrow key moves the text cursor in the left-hand direction.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="2" l10n="U" oldref="13">General options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_OPTIONS_CTL_LB_NUMERALS" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS" id="bm_id3159400" localize="false"/>
 <paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="3" l10n="U" oldref="14">Numerals (in text only)</paragraph>
 <paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_OPTIONS_CTL_LB_NUMERALS">Selects the type of numerals used within text, text in objects, fields, and controls, in all <item type="productname">%PRODUCTNAME</item> modules. Only cell contents of <item type="productname">%PRODUCTNAME</item> Calc are not affected.</ahelp><comment>UFI: see http://www.webster-dictionary.org/definition/Indian%20numerals</comment></paragraph>
 <list type="unordered">
diff --git a/helpcontent2/source/text/shared/optionen/01160000.xhp b/helpcontent2/source/text/shared/optionen/01160000.xhp
index 414157cc5d..2ffb6cede2 100755
--- a/helpcontent2/source/text/shared/optionen/01160000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01160100.xhp b/helpcontent2/source/text/shared/optionen/01160100.xhp
index 1b2be3d82f..4228e383d0 100755
--- a/helpcontent2/source/text/shared/optionen/01160100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160100.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154136"><bookmark_value>connections to data sources (Base)</bookmark_value>
 <bookmark_value>data sources; connection settings (Base)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS" id="bm_id3147261" localize="false"/>
+<!-- removed HID OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS -->
 <bookmark xml-lang="en-US" branch="hid/HID_DSBROWSER_DISCONNECTING" id="bm_id3149798" localize="false"/>
 <paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01160100.xhp" name="Connections">Connections</link></paragraph>
 <paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="2">Defines how the connections to data sources are pooled.</paragraph>
@@ -59,20 +56,20 @@
   <embed href="text/shared/00/00000406.xhp#verbindungen"/>
 </section>
 <paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="2" l10n="U" oldref="12">Connection Pool</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS" id="bm_id3152997" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS" id="bm_id5568712" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS" id="bm_id5568712" localize="false"/>
 <paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="U" oldref="4">Connection pooling enabled</paragraph>
 <paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS">Specifies whether the chosen connections are pooled.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="6">Drivers known in $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="7">Displays a list of defined drivers and connection data.</paragraph>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="13">Current driver</paragraph>
 <paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="14">The currently selected driver is displayed below the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING" id="bm_id3149234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING" id="bm_id8145084" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING" id="bm_id8145084" localize="false"/>
 <paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="8">Enable pooling for this driver</paragraph>
 <paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING">Select a driver from the list and mark the <emph>Enable pooling for this driver</emph> checkbox in order to pool its connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT" id="bm_id3153562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT" id="bm_id5520798" localize="false"/>
+<!-- removed HID OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT" id="bm_id5520798" localize="false"/>
 <paragraph role="heading" id="hd_id3155135" xml-lang="en-US" level="3" l10n="U" oldref="10">Timeout (seconds)</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT">Defines the time in seconds after which a pooled connection is freed.</ahelp> The time can be anywhere between 30 and 600 seconds.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01160200.xhp b/helpcontent2/source/text/shared/optionen/01160200.xhp
index 90755e5285..47d3a6eb2a 100755
--- a/helpcontent2/source/text/shared/optionen/01160200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160200.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,13 +52,13 @@
 <bookmark xml-lang="en-US" branch="hid/HID_DBPATH_CTL_PATH" id="bm_id4985198" localize="false"/>
 <paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Registered Databases</paragraph>
 <paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid="35535">Lists the registered name and database file of all registered databases. Double-click an entry to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_NEW" id="bm_id1757866" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW" id="bm_id1757866" localize="false"/>
 <paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid="809226765">Opens the <link href="text/shared/optionen/01160201.xhp">Database Link</link> dialog to create a new entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_DELETE" id="bm_id2827234" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE" id="bm_id2827234" localize="false"/>
 <paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid="809226770">Removes the selected entry from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_EDIT" id="bm_id8034607" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT" id="bm_id8034607" localize="false"/>
 <paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid="809226766">Opens the <link href="text/shared/optionen/01160201.xhp">Database Link</link> dialog to edit the selected entry.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp
index 0e62397bb1..7dc925d156 100755
--- a/helpcontent2/source/text/shared/optionen/01160201.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160201.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,10 +44,10 @@
 <paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">Creates or edits an entry in the <link href="text/shared/optionen/01160200.xhp">Databases</link> tab page.</paragraph>
 <paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="2" l10n="NEW">Database file</paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter the path and the file name of the database file. The name of the file must end with the *.odb extension.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_DLG_DOCUMENTLINK_PB_BROWSEFILE" id="bm_id8789330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE" id="bm_id8789330" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid="1346114049">Opens a file dialog where you can select the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_DLG_DOCUMENTLINK_ET_NAME" id="bm_id2885219" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:DLG_DOCUMENTLINK:ET_NAME" id="bm_id2885219" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Registered name</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid="1346111489">Enter a name for the database. %PRODUCTNAME uses this name to access the database.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp
new file mode 100644
index 0000000000..2c72a97367
--- /dev/null
+++ b/helpcontent2/source/text/shared/optionen/improvement.xhp
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+      <topic id="textsharedoptionenimprovementxhp">
+         <title xml-lang="en-US" id="tit">Improvement Program</title>
+         <filename>/text/shared/optionen/improvement.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="improvement">
+<bookmark xml-lang="en-US" branch="index" id="bm_id7687094"><bookmark_value>improvement program</bookmark_value>
+         <bookmark_value>online feedback options</bookmark_value>
+         <bookmark_value>options;improvement program</bookmark_value>
+         <bookmark_value>improvement program</bookmark_value>
+         <bookmark_value>feedback;automatically</bookmark_value>
+         <bookmark_value>user feedback;automatically</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0526200912315340" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/improvement.xhp">Improvement Program</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0526200312315378" role="paragraph" l10n="NEW">The Improvement Program records some user interactions and sends them to the User Experience project.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#improvement"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the OpenOffice.org web site: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200903594946" role="paragraph" l10n="NEW">The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200904094345" role="paragraph" l10n="NEW">At this time you can choose to accept or deny your participation.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id052620090409438" role="paragraph" l10n="NEW">If you accept, data recording starts immediately. When you start a new session of %PRODUCTNAME, the collected data will be sent. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200904094433" role="paragraph" l10n="NEW">If you deny to participate, no data will be sent and recording of data stops immediately.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES" id="bm_id0526200903272942" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903594944" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>Yes, I am willing to participate …</emph> to enable the automatic feedback.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO" id="bm_id0526200903274930" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903595080" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>No, I do not wish to participate</emph> to disable the automatic feedback.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0526200903595037" role="heading" level="2" l10n="NEW">Tracked data</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id0526200903595096" role="heading" level="2" l10n="NEW">The following data will be recorded and sent:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595033" role="paragraph" l10n="NEW">Clicks on toolbar buttons, including extension toolbars </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595014" role="paragraph" l10n="NEW">Execution of menu commands, including extension menus</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595145" role="paragraph" l10n="NEW">Clicks on context menu commands</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595115" role="paragraph" l10n="NEW">Fonts applied by using the menu </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595144" role="paragraph" l10n="NEW">Font sizes applied by using the menu </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595146" role="paragraph" l10n="NEW">Buttons, like OK, Cancel, etc. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595296" role="paragraph" l10n="NEW">Document language and paragraph language applied by using the menu or status bar </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595242" role="paragraph" l10n="NEW">Each recorded item also includes a time stamp and the module (Writer, Calc, Impress, …) where it has been called </paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id0526200903595229" role="heading" level="2" l10n="NEW">The following data will not be recorded and sent:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595234" role="paragraph" l10n="NEW">User names and passwords </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595218" role="paragraph" l10n="NEW">Any type of document content </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595213" role="paragraph" l10n="NEW">Paths, filenames </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0526200903595354" role="paragraph" l10n="NEW">User's source code </paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id0526200904021320" role="heading" level="2" l10n="NEW">Show Data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA" id="bm_id052620090329187" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903595552" role="paragraph" l10n="NEW"><ahelp hid=".">Click the button to show the currently collected data. This data will be sent next time, plus any data that gets collected until you end the current session.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/java.xhp b/helpcontent2/source/text/shared/optionen/java.xhp
index 3cf438966a..b71eeaa119 100755
--- a/helpcontent2/source/text/shared/optionen/java.xhp
+++ b/helpcontent2/source/text/shared/optionen/java.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: java.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
   <embed href="text/shared/00/00000406.xhp#java"/>
 </section>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Java options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE" id="bm_id3150325" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_JAVA_LIST" id="bm_id6775719" localize="false"/><paragraph role="heading" id="par_idN10610" xml-lang="en-US" level="3" l10n="NEW">Java runtime environments (JRE) already installed:</paragraph>
 <paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_OPTIONS_JAVA_LIST">Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart %PRODUCTNAME to use your changed setting.</ahelp> The path to the JRE is displayed beneath the list box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
 <paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD">Add a path to the root folder of a JRE on your computer.</ahelp> The path is set in the following dialog.<comment>UFI: #i38927#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER" id="bm_id1588793" localize="false"/><paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Parameters</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER" id="bm_id1588793" localize="false"/><paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Parameters</paragraph>
 <paragraph role="paragraph" id="par_idN10657" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER">Opens the <link href="text/shared/optionen/javaparameters.xhp">Java Start Parameters</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH" id="bm_id5799127" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="3" l10n="NEW">Class Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH" id="bm_id5799127" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="3" l10n="NEW">Class Path</paragraph>
 <paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH">Opens the <link href="text/shared/optionen/javaclasspath.xhp">Class Path</link> dialog.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
index 91e8afd8b5..32c5652348 100755
--- a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: javaclasspath.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,18 +45,18 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#java"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH" id="bm_id3147004" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_JAVA_CLASSPATH_LB_PATH" id="bm_id6794640" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH" id="bm_id6794640" localize="false"/>
 <paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Assigned folders and archives</paragraph>
 <paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US" l10n="NEW"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH">Specifies the location of Java classes or Java class libraries.</ahelp> The new classpath becomes valid after you restart <item type="productname">%PRODUCTNAME</item>.<comment>UFI: moved these paras here from the Security tab page</comment></paragraph>
 <paragraph role="warning" id="par_idN105D9" xml-lang="en-US" l10n="NEW">Java classes that are accessed through the classpath do not undergo a security check.<comment>UFI: moved these paras here from the Security tab page</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDARCHIVE" id="bm_id5538804" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE" id="bm_id5538804" localize="false"/>
 <paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="3" l10n="NEW">Add Archive</paragraph>
 <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE">Select an archive file in jar or zip format and add the file to the class path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDPATH" id="bm_id3354899" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH" id="bm_id3354899" localize="false"/>
 <paragraph role="heading" id="par_idN10625" xml-lang="en-US" level="3" l10n="NEW">Add Folder</paragraph>
 <paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH">Select a folder and add the folder to the class path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_REMOVE_PATH" id="bm_id1084017" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH" id="bm_id1084017" localize="false"/>
 <paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
 <paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH">Select an archive or a folder in the list and click Remove to remove the object from the class path.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/javaparameters.xhp b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
index b5138b721a..fc42f592e0 100755
--- a/helpcontent2/source/text/shared/optionen/javaparameters.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: javaparameters.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@ dedr: reviewed</lastedited>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#java"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER" id="bm_id1370891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER" id="bm_id1370891" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Java Start parameter</paragraph>
 <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER">Enter a start parameter for a JRE as you would on a command line. Click Assign to add the parameter to the list of available start parameters.</ahelp></paragraph>
 <paragraph role="note" id="par_id5404522" xml-lang="en-US" l10n="NEW">Do not use escape characters or quotes in path names.</paragraph>
@@ -60,13 +57,13 @@ dedr: reviewed</lastedited>
 <paragraph role="example" id="par_idN1057E" xml-lang="en-US" l10n="NEW">-Xdebug</paragraph>
 <paragraph role="example" id="par_idN10581" xml-lang="en-US" l10n="NEW">-Xrunjdwp:transport=dt_socket,server=y,address=8000</paragraph>
 <paragraph role="note" id="par_idN1060C" xml-lang="en-US" l10n="NEW">These changes take effect after you restart %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_JAVA_PARAMETER_LB_ASSIGNED" id="bm_id9206518" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED" id="bm_id9206518" localize="false"/>
 <paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="3" l10n="NEW">Assigned start parameters</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED">Lists the assigned JRE start parameters. To remove a start parameter, select the parameter, and then click <emph>Remove</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_PARAMETER_PB_ASSIGN" id="bm_id4533829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN" id="bm_id4533829" localize="false"/>
 <paragraph role="heading" id="par_idN105A7" xml-lang="en-US" level="3" l10n="NEW">Assign</paragraph>
 <paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN">Adds the current JRE start parameter to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_PARAMETER_PB_REMOVE" id="bm_id2460402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE" id="bm_id2460402" localize="false"/>
 <paragraph role="heading" id="par_idN105C2" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
 <paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE">Deletes the selected JRE start parameter.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
index 29036fe5ed..ddd71a1d74 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrosecurity.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,9 +40,8 @@
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link></variable></paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01030300.xhp">%PRODUCTNAME - Security</link></emph> page.</paragraph>
 <embed href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
 <embed href="text/shared/optionen/macrosecurity_ts.xhp#macrosecurity_ts"/>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
index 79dcf0c06b..524aa05433 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrosecurity_sl.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,19 +45,19 @@
 <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_sl"><link href="text/shared/optionen/macrosecurity_sl.xhp">Security Level</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Select the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> level from one of four options. The options differ according to the security level. Macros that are allowed to run on a higher security level are also allowed to run in all lower levels.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_VERYHIGH" id="bm_id7283547" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH" id="bm_id7283547" localize="false"/>
 <paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Very high</paragraph>
 <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Only macros from trusted file locations are allowed to run. All other macros, regardless of whether they are signed or not, are disabled.<comment>UFI: for each option, the first para is copied from the string table.</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted file locations can be set on the Trusted Sources tab page. Any macro from a trusted file location is allowed to run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_HIGH" id="bm_id2273934" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH" id="bm_id2273934" localize="false"/>
 <paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="2" l10n="NEW">High</paragraph>
 <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW">Only signed macros from trusted sources are allowed to run. Unsigned macros are disabled.</paragraph>
 <paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Only signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_MEDIUM" id="bm_id7128818" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM" id="bm_id7128818" localize="false"/>
 <paragraph role="heading" id="par_idN105BA" xml-lang="en-US" level="2" l10n="NEW">Medium</paragraph>
 <paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Confirmation required before executing macros from unknown sources.</paragraph>
 <paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run. All other macros require your confirmation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_LOW" id="bm_id7408978" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW" id="bm_id7408978" localize="false"/>
 <paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Low (not recommended)</paragraph>
 <paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe.</paragraph>
 <paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A macro can be set to auto-start, and it can perform potentially damaging actions, as for example delete or rename files. This setting is not recommended when you open documents from other authors.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
index 247a2d92b4..93255e6bd7 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrosecurity_ts.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,15 +45,15 @@
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Specifies the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> settings for trusted certificates and trusted file locations.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_TRUSTSOURCES" id="bm_id3047883" localize="false"/><paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Trusted certificates</paragraph>
 <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the trusted certificates.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
 <paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the View Certificate dialog for the selected certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_REMOVE_TRUSTCERT" id="bm_id6915799" localize="false"/><paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT" id="bm_id6915799" localize="false"/><paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
 <paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected certificate from the list of trusted certificates.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_ListBox_RID_XMLSECTP_TRUSTSOURCES_LB_TRUSTFILELOC" id="bm_id1044038" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2" l10n="NEW">Trusted file locations</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC" id="bm_id1044038" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2" l10n="NEW">Trusted file locations</paragraph>
 <paragraph role="paragraph" id="par_idN105B1" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Document macros are only executed if they have been opened from one of the following locations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_ADD_TRUSTFILELOC" id="bm_id1952879" localize="false"/><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC" id="bm_id1952879" localize="false"/><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
 <paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a folder selection dialog. Select a folder from which all macros are allowed to execute.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_REMOVE_TRUSTFILELOC" id="bm_id6851405" localize="false"/><paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC" id="bm_id6851405" localize="false"/><paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
 <paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected folder from the list of trusted file locations.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/mailmerge.xhp b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
index e87352fb2b..bc5a3316cd 100755
--- a/helpcontent2/source/text/shared/optionen/mailmerge.xhp
+++ b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,34 +49,34 @@
 </section>
 <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">User information</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Enter the user information to use when you send e-mail.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
 <paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="3" l10n="NEW">Your name</paragraph>
 <paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_ADDRESS" id="bm_id5569627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_ADDRESS" id="bm_id5569627" localize="false"/>
 <paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">E-mail address</paragraph>
 <paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your e-mail address for replies.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO" id="bm_id8856166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" id="bm_id8856166" localize="false"/>
 <paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3" l10n="NEW">Send replies to different e-mail address</paragraph>
 <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the e-mail address that you enter in the Reply address text box as the reply-to e-mail address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_REPLYTO" id="bm_id2134769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_REPLYTO" id="bm_id2134769" localize="false"/>
 <paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="3" l10n="NEW">Reply address</paragraph>
 <paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the address to use for e-mail replies.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105EE" xml-lang="en-US" level="2" l10n="NEW">Outgoing server (SMTP) settings</paragraph>
 <paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US" l10n="NEW">Specify the server settings for outgoing e-mails.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_SERVER" id="bm_id7700735" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_SERVER" id="bm_id7700735" localize="false"/>
 <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="3" l10n="NEW">Server name</paragraph>
 <paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP server name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_TP_MAILCONFIG_NF_PORT" id="bm_id6578569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_MAILCONFIG:NF_PORT" id="bm_id6578569" localize="false"/>
 <paragraph role="heading" id="par_idN10618" xml-lang="en-US" level="3" l10n="NEW">Port</paragraph>
 <paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP port.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_MAILCONFIG_LB_SECURE" id="bm_id5304116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/879363086" id="bm_id72634" localize="false"/>
+<!-- removed HID sw_ListBox_TP_MAILCONFIG_LB_SECURE -->
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_MAILCONFIG_CB_SECURE" id="bm_id72634" localize="false"/>
 <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Use secure connection</paragraph>
 <paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When available, uses a secure connection to send e-mails.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
 <paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="2" l10n="NEW">Server Authentication</paragraph>
 <paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure e-mail.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_TEST" id="bm_id926847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_TEST" id="bm_id926847" localize="false"/>
 <paragraph role="heading" id="par_idN10677" xml-lang="en-US" level="2" l10n="NEW">Test Settings</paragraph>
 <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link> dialog to test the current settings.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 88d6249ab3..6804a1f093 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -117,6 +113,7 @@ XHPFILES = \
    01160100.xhp \
    01160200.xhp \
    01160201.xhp \
+   improvement.xhp \
    java.xhp \
    javaclasspath.xhp \
    javaparameters.xhp \
@@ -135,4 +132,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/optionen/online_update.xhp b/helpcontent2/source/text/shared/optionen/online_update.xhp
index 7e4398329d..83096d8ce1 100644
--- a/helpcontent2/source/text/shared/optionen/online_update.xhp
+++ b/helpcontent2/source/text/shared/optionen/online_update.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,46 +29,52 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Online Update</title>
-<filename>/text/shared/optionen/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="online_update">
+      <topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Online Update</title>
+         <filename>/text/shared/optionen/online_update.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="online_update">
 <bookmark xml-lang="en-US" branch="index" id="bm_id7657094"><bookmark_value>update options</bookmark_value>
-<bookmark_value>online update options</bookmark_value>
-<bookmark_value>options;online update</bookmark_value>
-<bookmark_value>online updates; checking automatically</bookmark_value>
-<bookmark_value>updates; checking automatically</bookmark_value>
+         <bookmark_value>online update options</bookmark_value>
+         <bookmark_value>options;online update</bookmark_value>
+         <bookmark_value>online updates; checking automatically</bookmark_value>
+         <bookmark_value>updates; checking automatically</bookmark_value>
+         <bookmark_value>Internet; checking for updates</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id29297" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
-<paragraph role="paragraph" id="par_id8754844" xml-lang="en-US" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#online_update"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/><paragraph role="heading" id="hd_id2189397" xml-lang="en-US" level="2" l10n="NEW">Check for updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7523728" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
-<paragraph role="paragraph" id="par_id8994109" xml-lang="en-US" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
-<paragraph role="paragraph" id="par_id476699" xml-lang="en-US" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
-<paragraph role="note" id="par_id4057130" xml-lang="en-US" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY" id="bm_id3116855" localize="false"/><paragraph role="heading" id="hd_id266426" xml-lang="en-US" level="3" l10n="NEW">Every Day</paragraph>
-<paragraph role="paragraph" id="par_id3031098" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK" id="bm_id9302041" localize="false"/><paragraph role="heading" id="hd_id8276619" xml-lang="en-US" level="3" l10n="NEW">Every Week</paragraph>
-<paragraph role="paragraph" id="par_id7824030" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH" id="bm_id5097201" localize="false"/><paragraph role="heading" id="hd_id7534104" xml-lang="en-US" level="3" l10n="NEW">Every Month</paragraph>
-<paragraph role="paragraph" id="par_id209051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW" id="bm_id5540025" localize="false"/><paragraph role="heading" id="hd_id1418805" xml-lang="en-US" level="3" l10n="NEW">Check now</paragraph>
-<paragraph role="paragraph" id="par_id1743522" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment><paragraph role="heading" id="hd_id5994140" xml-lang="en-US" level="2" l10n="NEW">Download updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7870113" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3051545" xml-lang="en-US" level="3" l10n="NEW">Download destination</paragraph>
-<paragraph role="paragraph" id="par_id3061311" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id4814905" xml-lang="en-US" level="3" l10n="NEW">Change</paragraph>
-<paragraph role="paragraph" id="par_id2143925" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id29297" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id8754844" role="paragraph" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#online_update"/>
+      </section>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK" id="bm_id877101" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY" id="bm_id3116855" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id266426" role="heading" level="3" l10n="NEW">Every Day</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3031098" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK" id="bm_id9302041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8276619" role="heading" level="3" l10n="NEW">Every Week</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7824030" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH" id="bm_id5097201" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7534104" role="heading" level="3" l10n="NEW">Every Month</paragraph>
+      <paragraph xml-lang="en-US" id="par_id209051" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW" id="bm_id5540025" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1418805" role="heading" level="3" l10n="NEW">Check now</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1743522" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id5994140" role="heading" level="2" l10n="NEW">Download updates automatically</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7870113" role="paragraph" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3051545" role="heading" level="3" l10n="NEW">Download destination</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3061311" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id4814905" role="heading" level="3" l10n="NEW">Change</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2143925" role="paragraph" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
index 4114a97952..e831448d6f 100755
--- a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
+++ b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: serverauthentication.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,45 +34,41 @@
 <title id="tit" xml-lang="en-US">Server Authentication</title>
 <filename>/text/shared/optionen/serverauthentication.xhp</filename>
 </topic>
-<history>
-<created date="2004-10-06T16:42:30">UFI: Server Authentication dialog from Writer Mail Merge settings</created>
-<lastedited date="2004-10-27T09:32:14">DEDR: Reviewed</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph>
-<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
+<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
 <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">The outgoing mail server (SMTP) requires authentication</paragraph>
 <paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SEP_AUTHENTICATION" id="bm_id3792535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION" id="bm_id3792535" localize="false"/>
 <paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="3" l10n="NEW">The outgoing mail server (SMTP) requires separate authentication</paragraph>
 <paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select if your SMTP server requires a user name and password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_USERNAME" id="bm_id1043122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME" id="bm_id1043122" localize="false"/>
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="4" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN105EA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name for the SMTP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_OUTPASSWORD" id="bm_id3897824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD" id="bm_id3897824" localize="false"/>
 <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="4" l10n="NEW">Password</paragraph>
 <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password for the user name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SMPTAFTERPOP" id="bm_id3506881" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" id="bm_id3506881" localize="false"/>
 <paragraph role="heading" id="par_idN10615" xml-lang="en-US" level="3" l10n="NEW">The outgoing mail server uses the same authentication as the incoming mail server.</paragraph>
 <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select if you are required to first read your e-mail before you can send e-mail.</ahelp> This method is also called "SMTP after POP3".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_SERVER" id="bm_id9126255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER" id="bm_id9126255" localize="false"/>
 <paragraph role="heading" id="par_idN10629" xml-lang="en-US" level="4" l10n="NEW">Server name</paragraph>
 <paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the server name of your POP 3 or IMAP mail server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_SERVERAUTHENTICATION_NF_PORT" id="bm_id8613849" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT" id="bm_id8613849" localize="false"/>
 <paragraph role="heading" id="par_idN1063B" xml-lang="en-US" level="4" l10n="NEW">Port</paragraph>
 <paragraph role="paragraph" id="par_idN10640" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port on the POP3 or IMAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_POP3" id="bm_id1679738" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3" id="bm_id1679738" localize="false"/>
 <paragraph role="heading" id="par_idN10653" xml-lang="en-US" level="4" l10n="NEW">POP 3</paragraph>
 <paragraph role="paragraph" id="par_idN10658" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies that the incoming mail server uses POP 3.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_IMAP" id="bm_id8912015" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP" id="bm_id8912015" localize="false"/>
 <paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="4" l10n="NEW">IMAP</paragraph>
 <paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies that the incoming mail server uses IMAP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_INUSERNAME" id="bm_id1524399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME" id="bm_id1524399" localize="false"/>
 <paragraph role="heading" id="par_idN10679" xml-lang="en-US" level="4" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name for the IMAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_INPASSWORD" id="bm_id5329447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD" id="bm_id5329447" localize="false"/>
 <paragraph role="heading" id="par_idN10691" xml-lang="en-US" level="4" l10n="NEW">Password</paragraph>
 <paragraph role="paragraph" id="par_idN10696" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/testaccount.xhp b/helpcontent2/source/text/shared/optionen/testaccount.xhp
index 6c2fac999d..2e81023e1a 100755
--- a/helpcontent2/source/text/shared/optionen/testaccount.xhp
+++ b/helpcontent2/source/text/shared/optionen/testaccount.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testaccount.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,21 +34,17 @@
 <title id="tit" xml-lang="en-US">Test Account Settings</title>
 <filename>/text/shared/optionen/testaccount.xhp</filename>
 </topic>
-<history>
-<created date="2004-10-06T16:32:57">UFI: Test Account Settings dialog from Mail Merge E-Mail tab page</created>
-<lastedited date="2004-10-15T13:08:20">YJ: checked</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MM_TESTACCOUNTSETTINGS_TLB" id="bm_id6709494" localize="false"/>
 <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">(Results list box)</paragraph>
 <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the top list box you will see the results of the test session.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR" id="bm_id3895382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" id="bm_id3895382" localize="false"/>
 <paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Errors</paragraph>
 <paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the Errors list box you can read an explanation of any errors encountered while testing the settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP" id="bm_id9591051" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" id="bm_id9591051" localize="false"/>
 <paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Stop</paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click the <emph>Stop</emph> button to stop a test session manually.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
index ffac5affd0..c66ed7d25c 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcertificate.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
index f46d1dcac9..ad9060d1f4 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcertificate_c.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_VIEWSIGNATURES" id="bm_id7465742" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_MultiLineEdit_RID_XMLSECTP_CERTPATH_ML_CERTSTATUS" id="bm_id3149815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS" id="bm_id3149815" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_TP_CERTPATH" id="bm_id3747978" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="certificatepath"><link href="text/shared/optionen/viewcertificate_c.xhp">Certificate Path</link>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
index 3856ea8a36..4afe249f80 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcertificate_d.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
 <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><variable id="details"><link href="text/shared/optionen/viewcertificate_d.xhp">Details</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Details page of the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog displays detailed information about the certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_MultiLineEdit_RID_XMLSECTP_DETAILS_ML_ELEMENT" id="bm_id6321909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT" id="bm_id6321909" localize="false"/>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use the value list box to view values and copy them to the clipboard.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
index c9c12827cc..b140a181f4 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcertificate_g.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp
index f06b372c8c..31991694cb 100755
--- a/helpcontent2/source/text/shared/tree_strings.xhp
+++ b/helpcontent2/source/text/shared/tree_strings.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tree_strings.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
   <paragraph role="paragraph" id="par_id3166461" l10n="U" xml-lang="en-US" oldref="10">&lt;node id=&quot;0205&quot; title=&quot;Tables in Text Documents&quot;&gt;</paragraph>
   <paragraph role="paragraph" id="par_id3155136" l10n="U" xml-lang="en-US" oldref="11">&lt;node id=&quot;0206&quot; title=&quot;Objects in Text Documents&quot;&gt;</paragraph>
   <paragraph role="paragraph" id="par_id3155629" l10n="U" xml-lang="en-US" oldref="12">&lt;node id=&quot;0207&quot; title=&quot;Sections and Frames in Text Documents&quot;&gt;</paragraph>
-  <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Content and Indexes&quot;&gt;</paragraph>
+  <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Contents and Indexes&quot;&gt;</paragraph>
   <paragraph role="paragraph" id="par_id3153349" l10n="U" xml-lang="en-US" oldref="14">&lt;node id=&quot;0209&quot; title=&quot;Fields in Text Documents&quot;&gt;</paragraph>
   <paragraph role="paragraph" id="par_id3145120" l10n="U" xml-lang="en-US" oldref="15">&lt;node id=&quot;0210&quot; title=&quot;Navigating Text Documents&quot;&gt;</paragraph>
   <paragraph role="paragraph" id="par_id3159400" l10n="U" xml-lang="en-US" oldref="16">&lt;node id=&quot;0211&quot; title=&quot;Calculating in Text Documents&quot;&gt;</paragraph>
diff --git a/helpcontent2/source/text/simpress/00/00000004.xhp b/helpcontent2/source/text/simpress/00/00000004.xhp
index affcaf6a44..501754a94d 100644
--- a/helpcontent2/source/text/simpress/00/00000004.xhp
+++ b/helpcontent2/source/text/simpress/00/00000004.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,9 +45,9 @@
 <paragraph role="heading" id="hd_id3149655" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command 
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_SAVEGRAPHIC" id="bm_id9900509" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/27353" id="bm_id2302316" localize="false"/><comment>Save as Picture context menu, #i63795</comment>
+<bookmark xml-lang="en-US" branch="hid/SID_SAVEGRAPHIC" id="bm_id2302316" localize="false"/><comment>Save as Picture context menu, #i63795</comment>
 <paragraph role="paragraph" id="par_id8789025" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to save the selected bitmap picture as a file. The default file format is the internal format of the image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/27328" id="bm_id9317300" localize="false"/><comment>Custom Animation context menu</comment>
+<bookmark xml-lang="en-US" branch="hid/SID_CUSTOM_ANIMATION_PANEL" id="bm_id9317300" localize="false"/><comment>Custom Animation context menu</comment>
 <paragraph role="paragraph" id="par_id5316324" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Custom Animation window on the Task pane.</ahelp></paragraph>
 <section id="syrechteck">
 <table id="tbl_id3153768">
diff --git a/helpcontent2/source/text/simpress/00/00000401.xhp b/helpcontent2/source/text/simpress/00/00000401.xhp
index 7580a480e1..cd5f2bd53b 100755
--- a/helpcontent2/source/text/simpress/00/00000401.xhp
+++ b/helpcontent2/source/text/simpress/00/00000401.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000401.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/00000402.xhp b/helpcontent2/source/text/simpress/00/00000402.xhp
index 832f04f200..528ff02fc8 100755
--- a/helpcontent2/source/text/simpress/00/00000402.xhp
+++ b/helpcontent2/source/text/simpress/00/00000402.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000402.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,35 +27,32 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsimpress0000000402xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Edit Menu</title>
-<filename>/text/simpress/00/00000402.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-11T13:15:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3150792" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Menu</paragraph>
-<section id="badpz">
-<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>Edit - Duplicate</emph>
+      <topic id="textsimpress0000000402xml" indexer="exclude" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Edit Menu</title>
+         <filename>/text/simpress/00/00000402.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="1" l10n="U" oldref="1">Edit Menu</paragraph>
+      <section id="badpz">
+         <paragraph xml-lang="en-US" id="par_id3145171" role="paragraph" l10n="U" oldref="2">Choose <emph>Edit - Duplicate</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="7">Shift+F3</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149263" xml-lang="en-US" l10n="U" oldref="3"><variable id="bearbueber">Choose <emph>Edit - Cross-fading</emph> (<item type="productname">%PRODUCTNAME</item> Draw only) 
+         <paragraph xml-lang="en-US" id="par_id3156441" role="paragraph" l10n="U" oldref="7">Shift+F3</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149263" role="paragraph" l10n="U" oldref="3"><variable id="bearbueber">Choose <emph>Edit - Cross-fading</emph> (<item type="productname">%PRODUCTNAME</item> Draw only) 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="CHG" oldref="4"><variable id="basl">Choose <emph>Edit - Delete Slide</emph>
+      <paragraph xml-lang="en-US" id="par_id3149666" role="paragraph" l10n="CHG" oldref="4"><variable id="basl">Choose <emph>Edit - Delete Slide</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147397" xml-lang="en-US" l10n="U" oldref="5"><variable id="baebl">Choose <emph>Edit - Layer - Delete</emph>
+      <paragraph xml-lang="en-US" id="par_id3147397" role="paragraph" l10n="CHG" oldref="5"><variable id="baebl">Open the context menu of an inserted layer, then choose <emph>Delete Layer</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="6"><variable id="feldbefehl">Choose <emph>Edit - Fields</emph>
+      <paragraph xml-lang="en-US" id="par_id3155603" role="paragraph" l10n="U" oldref="6"><variable id="feldbefehl">Choose <emph>Edit - Fields</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id8695944" xml-lang="en-US" l10n="NEW"><variable id="gluebar">Click the <emph>Glue Points</emph> icon on the Drawing Bar 
+      <paragraph xml-lang="en-US" id="par_id8695944" role="paragraph" l10n="NEW"><variable id="gluebar">Click the <emph>Glue Points</emph> icon on the Drawing Bar 
 </variable><comment>UFI: this is called from text\simpress\02\10030200.xhp to fix bug #i23785#</comment></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/00/00000403.xhp b/helpcontent2/source/text/simpress/00/00000403.xhp
index 76eca1ad2d..470c0d385d 100644
--- a/helpcontent2/source/text/simpress/00/00000403.xhp
+++ b/helpcontent2/source/text/simpress/00/00000403.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000403.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/00000404.xhp b/helpcontent2/source/text/simpress/00/00000404.xhp
index 3e74ad2314..a32b74b3e3 100644
--- a/helpcontent2/source/text/simpress/00/00000404.xhp
+++ b/helpcontent2/source/text/simpress/00/00000404.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000404.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/00000405.xhp b/helpcontent2/source/text/simpress/00/00000405.xhp
index 422cabbfb0..eb4d83bb78 100755
--- a/helpcontent2/source/text/simpress/00/00000405.xhp
+++ b/helpcontent2/source/text/simpress/00/00000405.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 00000405.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,13 +43,13 @@
 <paragraph role="heading" id="hd_id3147001" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
 <section id="bemaszung">
 <paragraph role="paragraph" id="par_id3148489" xml-lang="en-US" l10n="CHG" oldref="2">In the context menu of a dimension line, choose <emph>Dimensions</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="CHG" oldref="15">On the <emph>Lines and Arrows </emph>toolbar, click the <emph>Dimension Line</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="CHG" oldref="15">On the <emph>Lines and Arrows</emph> toolbar, click the <emph>Dimension Line</emph> icon.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3155530" xml-lang="en-US" l10n="U" oldref="9"><variable id="frtite">Choose <emph>Format - Page</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="13"><variable id="frtites">Choose <emph>Format - Page </emph>and then click the <emph>Page </emph>tab 
+<paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="13"><variable id="frtites">Choose <emph>Format - Page</emph> and then click the <emph>Page</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148866" xml-lang="en-US" l10n="U" oldref="14"><variable id="frtiteh">Choose <emph>Format - Page</emph> and then click the <emph>Background</emph> tab 
+<paragraph role="paragraph" id="par_id3148866" xml-lang="en-US" l10n="U" oldref="14"><variable id="frtiteh">Choose <emph>Format - Page</emph> and then click the <emph>Background</emph> tab
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3155266" xml-lang="en-US" l10n="CHG" oldref="10"><variable id="adnsei">Choose <emph>Format - Slide Layout</emph>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/simpress/00/00000406.xhp b/helpcontent2/source/text/simpress/00/00000406.xhp
index cd74b02f79..dabe2ab469 100755
--- a/helpcontent2/source/text/simpress/00/00000406.xhp
+++ b/helpcontent2/source/text/simpress/00/00000406.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/00000407.xhp b/helpcontent2/source/text/simpress/00/00000407.xhp
index d3c1ed30ee..c747c9ba52 100644
--- a/helpcontent2/source/text/simpress/00/00000407.xhp
+++ b/helpcontent2/source/text/simpress/00/00000407.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000407.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/00000413.xhp b/helpcontent2/source/text/simpress/00/00000413.xhp
index 420a82102a..6f61216c08 100644
--- a/helpcontent2/source/text/simpress/00/00000413.xhp
+++ b/helpcontent2/source/text/simpress/00/00000413.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000413.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/00/makefile.mk b/helpcontent2/source/text/simpress/00/makefile.mk
index 34c0e389fe..786a8482ab 100644
--- a/helpcontent2/source/text/simpress/00/makefile.mk
+++ b/helpcontent2/source/text/simpress/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,4 +57,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/simpress/01/01170000.xhp b/helpcontent2/source/text/simpress/01/01170000.xhp
index 49f812c952..6599837df0 100755
--- a/helpcontent2/source/text/simpress/01/01170000.xhp
+++ b/helpcontent2/source/text/simpress/01/01170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/01180000.xhp b/helpcontent2/source/text/simpress/01/01180000.xhp
index 400eae6d13..9fd60aebc5 100644
--- a/helpcontent2/source/text/simpress/01/01180000.xhp
+++ b/helpcontent2/source/text/simpress/01/01180000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01180000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/01180001.xhp b/helpcontent2/source/text/simpress/01/01180001.xhp
index 96df1a1ffa..abba1b05f0 100644
--- a/helpcontent2/source/text/simpress/01/01180001.xhp
+++ b/helpcontent2/source/text/simpress/01/01180001.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01180001.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/01180002.xhp b/helpcontent2/source/text/simpress/01/01180002.xhp
index 763b146be7..713145a49f 100755
--- a/helpcontent2/source/text/simpress/01/01180002.xhp
+++ b/helpcontent2/source/text/simpress/01/01180002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01180002.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/02110000.xhp b/helpcontent2/source/text/simpress/01/02110000.xhp
index 5e2e935a12..b1c077b42c 100644
--- a/helpcontent2/source/text/simpress/01/02110000.xhp
+++ b/helpcontent2/source/text/simpress/01/02110000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02110000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/02120000.xhp b/helpcontent2/source/text/simpress/01/02120000.xhp
index 72418a663c..a45904787e 100644
--- a/helpcontent2/source/text/simpress/01/02120000.xhp
+++ b/helpcontent2/source/text/simpress/01/02120000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02120000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,66 +32,74 @@
  
 	
 <meta>
-<topic id="textsimpress0102120000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Duplicate</title>
-<filename>/text/simpress/01/02120000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsimpress0102120000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Duplicate</title>
+         <filename>/text/simpress/01/02120000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_COPYOBJECTS" id="bm_id5589802" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CopyObjects" id="bm_id3149943" localize="false"/>
-<paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1" l10n="U" oldref="1">Duplicate</paragraph>
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
+<paragraph xml-lang="en-US" id="hd_id3148868" role="heading" level="1" l10n="U" oldref="1">Duplicate</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148604" role="paragraph" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/simpress/00/00000402.xhp#badpz"/>
-</section>
-<embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
-<bookmark xml-lang="en-US" branch="hid/SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" id="bm_id3153813" localize="false"/>
-<paragraph role="heading" id="hd_id3146962" xml-lang="en-US" level="2" l10n="U" oldref="3">Number of copies</paragraph>
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA" id="bm_id3147300" localize="false"/>
-<paragraph role="heading" id="hd_id3150431" xml-lang="en-US" level="2" l10n="U" oldref="25">Values from selection</paragraph>
-<table id="tbl_id3150395">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="E">
-<image id="img_id3157870" src="res/sc10350.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157870" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      <section id="howtoget">
+         <embed href="text/simpress/00/00000402.xhp#badpz"/>
+      </section>
+      <embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
+<bookmark xml-lang="en-US" branch="hid/sd:NumericField:DLG_COPY:NUM_FLD_COPIES" id="bm_id3153813" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146962" role="heading" level="2" l10n="U" oldref="3">Number of copies</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153075" role="paragraph" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA" id="bm_id3147300" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150431" role="heading" level="2" l10n="U"
+                 oldref="25">Values from selection</paragraph>
+      <table id="tbl_id3150395">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150534" role="paragraph" l10n="E">
+<image id="img_id3157870" src="res/sc10350.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3157870">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150744" role="paragraph" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="2" l10n="U" oldref="5">Placement</paragraph>
-<paragraph role="paragraph" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" id="bm_id3153110" localize="false"/>
-<paragraph role="heading" id="hd_id3153084" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
-<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3154507" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
-<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object up and negative values shift the duplicate object down.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" id="bm_id3153731" localize="false"/>
-<paragraph role="heading" id="hd_id3150022" xml-lang="en-US" level="3" l10n="U" oldref="11">Angle</paragraph>
-<paragraph role="paragraph" id="par_id3153738" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145296" xml-lang="en-US" level="2" l10n="U" oldref="13">Enlargement</paragraph>
-<paragraph role="paragraph" id="par_id3156065" xml-lang="en-US" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" id="bm_id3150568" localize="false"/>
-<paragraph role="heading" id="hd_id3148769" xml-lang="en-US" level="3" l10n="U" oldref="15">Width</paragraph>
-<paragraph role="paragraph" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" id="bm_id3153046" localize="false"/>
-<paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="17">Height</paragraph>
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154866" xml-lang="en-US" level="2" l10n="U" oldref="19">Colors</paragraph>
-<paragraph role="paragraph" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_START_COLOR" id="bm_id3155372" localize="false"/>
-<paragraph role="heading" id="hd_id3155819" xml-lang="en-US" level="3" l10n="U" oldref="21">Start</paragraph>
-<paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_END_COLOR" id="bm_id3155405" localize="false"/>
-<paragraph role="heading" id="hd_id3156258" xml-lang="en-US" level="3" l10n="U" oldref="23">End</paragraph>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#standard"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3153932" role="heading" level="2" l10n="U" oldref="5">Placement</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150860" role="paragraph" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X" id="bm_id3153110" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153084" role="heading" level="3" l10n="U" oldref="7">X axis</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153564" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y" id="bm_id3150338" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154507" role="heading" level="3" l10n="U" oldref="9">Y axis</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149882" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_COPY:MTR_FLD_ANGLE" id="bm_id3153731" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150022" role="heading" level="3" l10n="U"
+                 oldref="11">Angle</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153738" role="paragraph" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145296" role="heading" level="2" l10n="U"
+                 oldref="13">Enlargement</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156065" role="paragraph" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_COPY:MTR_FLD_WIDTH" id="bm_id3150568" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148769" role="heading" level="3" l10n="U"
+                 oldref="15">Width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150267" role="paragraph" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT" id="bm_id3153046" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150930" role="heading" level="3" l10n="U"
+                 oldref="17">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157970" role="paragraph" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154866" role="heading" level="2" l10n="U"
+                 oldref="19">Colors</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150474" role="paragraph" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_COPY:LB_START_COLOR" id="bm_id3155372" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155819" role="heading" level="3" l10n="U"
+                 oldref="21">Start</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155987" role="paragraph" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_COPY:LB_END_COLOR" id="bm_id3155405" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156258" role="heading" level="3" l10n="U"
+                 oldref="23">End</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#standard"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/01/02130000.xhp b/helpcontent2/source/text/simpress/01/02130000.xhp
index a4589891a7..713d9fe8c6 100644
--- a/helpcontent2/source/text/simpress/01/02130000.xhp
+++ b/helpcontent2/source/text/simpress/01/02130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02130000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/02140000.xhp b/helpcontent2/source/text/simpress/01/02140000.xhp
index cc1dd59ddf..5e0ce739a2 100644
--- a/helpcontent2/source/text/simpress/01/02140000.xhp
+++ b/helpcontent2/source/text/simpress/01/02140000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,31 +27,27 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsimpress0102140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Delete Layer</title>
-<filename>/text/simpress/01/02140000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-26T13:06:52">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textsimpress0102140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Delete Layer</title>
+         <filename>/text/simpress/01/02140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153541"><bookmark_value>layers; deleting</bookmark_value>
-<bookmark_value>deleting; layers</bookmark_value>
+      <bookmark_value>deleting; layers</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_DELETE_LAYER" id="bm_id8458750" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_LAYER" id="bm_id8458750" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DeleteLayer" id="bm_id3144510" localize="false"/>
-<paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="1" l10n="U" oldref="1">Delete Layer</paragraph>
-<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="2"><variable id="ebeneloeschen"><ahelp hid=".uno:DeleteLayer">Deletes the active layer.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3153541" role="heading" level="1" l10n="U" oldref="1">Delete Layer</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148664" role="paragraph" l10n="U" oldref="2"><variable id="ebeneloeschen"><ahelp hid=".uno:DeleteLayer">Deletes the active layer.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/simpress/00/00000402.xhp#baebl"/>
-</section>
-<paragraph role="note" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="3">This command is only available in %PRODUCTNAME Draw layer mode.</paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/simpress/00/00000402.xhp#baebl"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/01/02150000.xhp b/helpcontent2/source/text/simpress/01/02150000.xhp
index e590513f79..15c6b2db3c 100644
--- a/helpcontent2/source/text/simpress/01/02150000.xhp
+++ b/helpcontent2/source/text/simpress/01/02150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02150000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,13 +52,13 @@ dedr: fixed #i30766#</lastedited>
 </section>
 <paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="4">Sets the options for cross-fading.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_MORPH:MTF_STEPS" id="bm_id3145792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_MORPH:MTF_STEPS" id="bm_id3145792" localize="false"/>
 <paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="3" l10n="U" oldref="5">Increments</paragraph>
 <paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:METRICFIELD:DLG_MORPH:MTF_STEPS">Enter the number of shapes you want between the two selected objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_MORPH:CBX_ATTRIBUTES" id="bm_id3154650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES" id="bm_id3154650" localize="false"/>
 <paragraph role="heading" id="hd_id3149211" xml-lang="en-US" level="3" l10n="U" oldref="7">Cross-fade attributes</paragraph>
 <paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:CHECKBOX:DLG_MORPH:CBX_ATTRIBUTES">Applies cross-fading to the line and fill properties of the selected objects.</ahelp>For example, if the selected objects are filled with different colors, a color transition between the two colors is applied.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_MORPH:CBX_ORIENTATION" id="bm_id3149405" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_MORPH:CBX_ORIENTATION" id="bm_id3149405" localize="false"/>
 <paragraph role="heading" id="hd_id3152994" xml-lang="en-US" level="3" l10n="U" oldref="9">Same orientation</paragraph>
 <paragraph role="paragraph" id="par_id3153819" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:CHECKBOX:DLG_MORPH:CBX_ORIENTATION">Applies a smooth transition between the selected objects.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/02160000.xhp b/helpcontent2/source/text/simpress/01/02160000.xhp
index e48d329c8b..57f3c68294 100644
--- a/helpcontent2/source/text/simpress/01/02160000.xhp
+++ b/helpcontent2/source/text/simpress/01/02160000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_MODIFY_FIELD" id="bm_id9859157" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ModifyField" id="bm_id3155602" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD:MODALDIALOG:DLG_FIELD_MODIFY" id="bm_id3153417" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ModalDialog:DLG_FIELD_MODIFY" id="bm_id3153417" localize="false"/>
 <paragraph role="heading" id="hd_id3145251" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Fields </paragraph>
 <paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="2"><variable id="feldbefehltext"><ahelp hid="SD:MODALDIALOG:DLG_FIELD_MODIFY">Edits the properties of an inserted field.</ahelp>
 </variable> To edit an inserted field, double-click it. <switchinline select="appl"><caseinline select="IMPRESS">Then choose <emph>Edit - Fields</emph>.
@@ -63,16 +60,16 @@
 </section>
 <paragraph role="heading" id="hd_id3166425" xml-lang="en-US" level="2" l10n="U" oldref="3">Field type</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="4">Sets the type of a field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_DLG_FIELD_MODIFY_RBT_FIX" id="bm_id3145584" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX" id="bm_id3145584" localize="false"/>
 <paragraph role="heading" id="hd_id3150208" xml-lang="en-US" level="3" l10n="U" oldref="5">Fixed</paragraph>
 <paragraph role="paragraph" id="par_id3156447" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD_RADIOBUTTON_DLG_FIELD_MODIFY_RBT_FIX">Displays the content of the field when the field was inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_DLG_FIELD_MODIFY_RBT_VAR" id="bm_id3148870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR" id="bm_id3148870" localize="false"/>
 <paragraph role="heading" id="hd_id3153819" xml-lang="en-US" level="3" l10n="U" oldref="7">Variable</paragraph>
 <paragraph role="paragraph" id="par_id3153912" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD_RADIOBUTTON_DLG_FIELD_MODIFY_RBT_VAR">Displays the current value of the field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_DLG_FIELD_MODIFY_LB_LANGUAGE" id="bm_id3153251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE" id="bm_id3153251" localize="false"/>
 <paragraph role="heading" id="hd_id3148608" xml-lang="en-US" level="2" l10n="U" oldref="11">Language</paragraph>
 <paragraph role="paragraph" id="par_id3150210" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD_LISTBOX_DLG_FIELD_MODIFY_LB_LANGUAGE">Select the language for the field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_DLG_FIELD_MODIFY_LB_FORMAT" id="bm_id3146962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT" id="bm_id3146962" localize="false"/>
 <paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="2" l10n="U" oldref="9">Format</paragraph>
 <paragraph role="paragraph" id="par_id3145112" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD_LISTBOX_DLG_FIELD_MODIFY_LB_FORMAT">Select a display format for the field.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/03050000.xhp b/helpcontent2/source/text/simpress/01/03050000.xhp
index 6c61a58b27..fed34f670e 100644
--- a/helpcontent2/source/text/simpress/01/03050000.xhp
+++ b/helpcontent2/source/text/simpress/01/03050000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03060000.xhp b/helpcontent2/source/text/simpress/01/03060000.xhp
index 3a90f19f44..e4204e4126 100644
--- a/helpcontent2/source/text/simpress/01/03060000.xhp
+++ b/helpcontent2/source/text/simpress/01/03060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03070000.xhp b/helpcontent2/source/text/simpress/01/03070000.xhp
index 606d1afff7..4f1e6efd91 100644
--- a/helpcontent2/source/text/simpress/01/03070000.xhp
+++ b/helpcontent2/source/text/simpress/01/03070000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03070000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,22 +29,18 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0103070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Presentation Toolbar</title>
+<title id="tit" xml-lang="en-US">Presentation</title>
 <filename>/text/simpress/01/03070000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-10T10:14:04">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="praesentation">
 <bookmark xml-lang="en-US" branch="hid/.uno:CommonTaskBarVisible" id="bm_id3154013" localize="false"/>
-<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation Toolbar">Presentation Toolbar</link></paragraph>
+<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation">Presentation</link></paragraph>
 <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CommonTaskBarVisible">Common commands for slides.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/03080000.xhp b/helpcontent2/source/text/simpress/01/03080000.xhp
index 52c88a342b..d331a29309 100644
--- a/helpcontent2/source/text/simpress/01/03080000.xhp
+++ b/helpcontent2/source/text/simpress/01/03080000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03090000.xhp b/helpcontent2/source/text/simpress/01/03090000.xhp
index 7763debc3e..ea339ba23a 100644
--- a/helpcontent2/source/text/simpress/01/03090000.xhp
+++ b/helpcontent2/source/text/simpress/01/03090000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03100000.xhp b/helpcontent2/source/text/simpress/01/03100000.xhp
index 036a245452..8fca4247d8 100644
--- a/helpcontent2/source/text/simpress/01/03100000.xhp
+++ b/helpcontent2/source/text/simpress/01/03100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03110000.xhp b/helpcontent2/source/text/simpress/01/03110000.xhp
index ba7be360bf..67e71900df 100755
--- a/helpcontent2/source/text/simpress/01/03110000.xhp
+++ b/helpcontent2/source/text/simpress/01/03110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <section id="notizen">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153190"><bookmark_value>notes; adding to slides</bookmark_value>
-<bookmark_value>slides;inserting notes</bookmark_value>
+<bookmark_value>slides;inserting speaker notes</bookmark_value>
 <bookmark_value>speaker notes;inserting</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_BTN_NOTES" id="bm_id3154322" localize="false"/>
diff --git a/helpcontent2/source/text/simpress/01/03120000.xhp b/helpcontent2/source/text/simpress/01/03120000.xhp
index 013a7d6630..b26dddcfd6 100755
--- a/helpcontent2/source/text/simpress/01/03120000.xhp
+++ b/helpcontent2/source/text/simpress/01/03120000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03130000.xhp b/helpcontent2/source/text/simpress/01/03130000.xhp
index 9675a39e8b..b0bc6424d2 100644
--- a/helpcontent2/source/text/simpress/01/03130000.xhp
+++ b/helpcontent2/source/text/simpress/01/03130000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 03130000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0103130000xml" indexer="include" status="PUBLISH">
@@ -50,14 +47,13 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:Presentation" id="bm_id3150012" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_BTN_PRESENTATION" id="bm_id3151075" localize="false"/>
 <paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03130000.xhp" name="Slide Show">Slide Show</link></paragraph>
-<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp></variable></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000403.xhp#asbsp"/>
 </section>
 <paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="4">You can specify settings for running a slide show in <link href="text/simpress/01/06080000.xhp" name="Slide Show - Slide Show Settings"><emph>Slide Show - Slide Show Settings</emph></link>.</paragraph>
-<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="3">To start a slide show, do one of the following:</paragraph>
 <list type="unordered">
 <listitem>
diff --git a/helpcontent2/source/text/simpress/01/03150000.xhp b/helpcontent2/source/text/simpress/01/03150000.xhp
index 0d9e21d171..75c5b45a69 100644
--- a/helpcontent2/source/text/simpress/01/03150000.xhp
+++ b/helpcontent2/source/text/simpress/01/03150000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03150000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03150100.xhp b/helpcontent2/source/text/simpress/01/03150100.xhp
index 8ef1252bae..1036dc40b9 100644
--- a/helpcontent2/source/text/simpress/01/03150100.xhp
+++ b/helpcontent2/source/text/simpress/01/03150100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03150100.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03150300.xhp b/helpcontent2/source/text/simpress/01/03150300.xhp
index a363e7e708..47f3b474a2 100644
--- a/helpcontent2/source/text/simpress/01/03150300.xhp
+++ b/helpcontent2/source/text/simpress/01/03150300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03150300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03151000.xhp b/helpcontent2/source/text/simpress/01/03151000.xhp
index f50d58f11f..2f4847f8ef 100755
--- a/helpcontent2/source/text/simpress/01/03151000.xhp
+++ b/helpcontent2/source/text/simpress/01/03151000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03151000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03151100.xhp b/helpcontent2/source/text/simpress/01/03151100.xhp
index 0fb554fa2b..36f294f992 100755
--- a/helpcontent2/source/text/simpress/01/03151100.xhp
+++ b/helpcontent2/source/text/simpress/01/03151100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03151100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="master">
-<bookmark xml-lang="en-US" branch="hid/SID_MASTER_LAYOUTS_SLIDE" id="bm_id4572588" localize="false"/><paragraph role="heading" id="par_idN10537" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/03151100.xhp">Master Layout</link></paragraph>
+<!-- removed HID SID_MASTER_LAYOUTS_SLIDE --><paragraph role="heading" id="par_idN10537" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/03151100.xhp">Master Layout</link></paragraph>
 <paragraph role="paragraph" id="par_idN1053B" xml-lang="en-US" l10n="CHG"><ahelp hid="SID_MASTER_LAYOUTS_SLIDE">Adds or removes header, footer, date, and slide number placeholders to the layout of the slide master.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/03151200.xhp b/helpcontent2/source/text/simpress/01/03151200.xhp
index 3e3e6efa08..c4cb42f4f5 100755
--- a/helpcontent2/source/text/simpress/01/03151200.xhp
+++ b/helpcontent2/source/text/simpress/01/03151200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03151200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="notesmaster">
-<bookmark xml-lang="en-US" branch="hid/SID_MASTER_LAYOUTS_NOTES" id="bm_id1640064" localize="false"/><paragraph role="heading" id="par_idN10527" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/03151200.xhp">Notes Master Layout</link></paragraph>
+<!-- removed HID SID_MASTER_LAYOUTS_NOTES --><paragraph role="heading" id="par_idN10527" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/03151200.xhp">Notes Master Layout</link></paragraph>
 <paragraph role="paragraph" id="par_idN1052B" xml-lang="en-US" l10n="CHG"><ahelp hid="SID_MASTER_LAYOUTS_NOTES">Add header, footer, date, and slide number to the notes master.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/03152000.xhp b/helpcontent2/source/text/simpress/01/03152000.xhp
index 561f85c37d..f4e0f41f38 100755
--- a/helpcontent2/source/text/simpress/01/03152000.xhp
+++ b/helpcontent2/source/text/simpress/01/03152000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03152000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/03180000.xhp b/helpcontent2/source/text/simpress/01/03180000.xhp
index b742825606..b9eb64f85e 100644
--- a/helpcontent2/source/text/simpress/01/03180000.xhp
+++ b/helpcontent2/source/text/simpress/01/03180000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03180000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04010000.xhp b/helpcontent2/source/text/simpress/01/04010000.xhp
index ce833b8c08..ec8c1531b0 100644
--- a/helpcontent2/source/text/simpress/01/04010000.xhp
+++ b/helpcontent2/source/text/simpress/01/04010000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,15 +45,15 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_INSERTPAGE" id="bm_id8576712" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertPage" id="bm_id3149666" localize="false"/><paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/04010000.xhp" name="Insert Slide / Page">Insert Slide / Page</link></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide. 
+<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
 </caseinline><defaultinline>Inserts a page after the currently selected page.</defaultinline></switchinline></ahelp>
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#efgste"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_NEW_FOIL:CBX_BACKGROUND" id="bm_id3150364" localize="false"/><paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Applies the slide master background to the new slide. 
+<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_BACKGROUND --><paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Applies the slide master background to the new slide. 
 </caseinline><defaultinline>Applies the master page background to the new page.</defaultinline></switchinline></ahelp><comment>UFI: deleted some paras, changed avis to ahid tags, see #i60536</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_NEW_FOIL:CBX_OBJECTS" id="bm_id3152990" localize="false"/><paragraph role="paragraph" id="par_id3145584" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Includes objects on the slide master in the new slide. 
+<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_OBJECTS --><paragraph role="paragraph" id="par_id3145584" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Includes objects on the slide master in the new slide. 
 </caseinline><defaultinline>Includes objects on the master page in the new page.</defaultinline></switchinline></ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04020000.xhp b/helpcontent2/source/text/simpress/01/04020000.xhp
index 8130838f7d..8a9057f086 100644
--- a/helpcontent2/source/text/simpress/01/04020000.xhp
+++ b/helpcontent2/source/text/simpress/01/04020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,15 +48,15 @@
   <embed href="text/simpress/00/00000404.xhp#efgene"/>
 </section>
 <paragraph role="note" id="par_id3150205" xml-lang="en-US" l10n="CHG" oldref="13">To select a layer, click the corresponding tab at the bottom of the workspace.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_INSERT_LAYER:EDT_NAME" id="bm_id3156449" localize="false"/><paragraph role="heading" id="hd_id3145588" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_INSERT_LAYER:EDT_NAME" id="bm_id3156449" localize="false"/><paragraph role="heading" id="hd_id3145588" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3149404" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:EDIT:DLG_INSERT_LAYER:EDT_NAME">Enter a name for the new layer.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="5">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3151240" xml-lang="en-US" l10n="U" oldref="6">Set the properties for the new layer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_INSERT_LAYER:CBX_VISIBLE" id="bm_id3156017" localize="false"/><paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3" l10n="U" oldref="7">Visible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE" id="bm_id3156017" localize="false"/><paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3" l10n="U" oldref="7">Visible</paragraph>
 <paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:CHECKBOX:DLG_INSERT_LAYER:CBX_VISIBLE">Show or hide the layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_INSERT_LAYER:CBX_PRINTABLE" id="bm_id3150046" localize="false"/><paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="3" l10n="U" oldref="9">Printable</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE" id="bm_id3150046" localize="false"/><paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="3" l10n="U" oldref="9">Printable</paragraph>
 <paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SD:CHECKBOX:DLG_INSERT_LAYER:CBX_PRINTABLE">When printing, print or ignore this particular layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_INSERT_LAYER:CBX_LOCKED" id="bm_id3149870" localize="false"/><paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="3" l10n="U" oldref="11">Locked</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED" id="bm_id3149870" localize="false"/><paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="3" l10n="U" oldref="11">Locked</paragraph>
 <paragraph role="paragraph" id="par_id3149876" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:CHECKBOX:DLG_INSERT_LAYER:CBX_LOCKED">Prevent elements on the layer from being edited.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04030000.xhp b/helpcontent2/source/text/simpress/01/04030000.xhp
index b1c62cfe92..d3c9cf7c6d 100644
--- a/helpcontent2/source/text/simpress/01/04030000.xhp
+++ b/helpcontent2/source/text/simpress/01/04030000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,22 +54,22 @@
 </section>
 <paragraph role="tip" id="par_id3145388" xml-lang="en-US" l10n="U" oldref="19">You can drag a snap line from the rulers and drop them on the page. To delete a snap line, drag it back to the ruler.</paragraph>
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="3">Draw or move an object near a snap point or snap line to snap it in place.</paragraph>
-<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link>
+</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline> in the Options dialog box.</paragraph>
 <paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="2" l10n="U" oldref="5">Position</paragraph>
 <paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="6">Sets the position of a selected snap point or line relative to the top left corner of the page. </paragraph>
 <paragraph role="note" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="24">You can also drag a snap point or snap line to a new position.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_SNAPLINE:MTR_FLD_X" id="bm_id3145593" localize="false"/><paragraph role="heading" id="hd_id3153078" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_SNAPLINE:MTR_FLD_X" id="bm_id3145593" localize="false"/><paragraph role="heading" id="hd_id3153078" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
 <paragraph role="paragraph" id="par_id3149951" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_SNAPLINE:MTR_FLD_X">Enter the amount of space you want between the snap point or line and the left edge of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_SNAPLINE:MTR_FLD_Y" id="bm_id3149512" localize="false"/><paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y" id="bm_id3149512" localize="false"/><paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
 <paragraph role="paragraph" id="par_id3153113" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_SNAPLINE:MTR_FLD_Y">Enter the amount of space you want between the snap point or line and the top edge of the page.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145168" xml-lang="en-US" level="2" l10n="U" oldref="11">Type</paragraph>
 <paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="12">Specified the type of snap object you want to insert.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_POINT" id="bm_id3150131" localize="false"/><paragraph role="heading" id="hd_id3147366" xml-lang="en-US" level="3" l10n="U" oldref="13">Point</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT" id="bm_id3150131" localize="false"/><paragraph role="heading" id="hd_id3147366" xml-lang="en-US" level="3" l10n="U" oldref="13">Point</paragraph>
 <paragraph role="paragraph" id="par_id3155926" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_POINT">Inserts a snap point.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_VERTICAL" id="bm_id3153733" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL" id="bm_id3153733" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical</paragraph>
 <paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_VERTICAL">Inserts a vertical snap line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_HORIZONTAL" id="bm_id3148770" localize="false"/><paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL" id="bm_id3148770" localize="false"/><paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3145348" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_HORIZONTAL">Inserts a horizontal snap line.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04030000m.xhp b/helpcontent2/source/text/simpress/01/04030000m.xhp
index d299d853e6..3d50ab9c97 100644
--- a/helpcontent2/source/text/simpress/01/04030000m.xhp
+++ b/helpcontent2/source/text/simpress/01/04030000m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000m.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04030100.xhp b/helpcontent2/source/text/simpress/01/04030100.xhp
index 8dbcb343b7..9779e23298 100644
--- a/helpcontent2/source/text/simpress/01/04030100.xhp
+++ b/helpcontent2/source/text/simpress/01/04030100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#efglbe"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_SNAPLINE:BTN_DELETE" id="bm_id3150205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_SNAPLINE:BTN_DELETE" id="bm_id3150205" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_DELETE_SNAPITEM" id="bm_id3963543" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:DeleteSnapItem" id="bm_id3166427" localize="false"/>
 <paragraph role="heading" id="hd_id3159238" xml-lang="en-US" level="2" l10n="U" oldref="3">Delete Snap Line/Point</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/04040000m.xhp b/helpcontent2/source/text/simpress/01/04040000m.xhp
index 7a6cb036f1..c951b06b2b 100644
--- a/helpcontent2/source/text/simpress/01/04040000m.xhp
+++ b/helpcontent2/source/text/simpress/01/04040000m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04040000m.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04080100.xhp b/helpcontent2/source/text/simpress/01/04080100.xhp
index f0da42b439..e1e3ffc3a9 100644
--- a/helpcontent2/source/text/simpress/01/04080100.xhp
+++ b/helpcontent2/source/text/simpress/01/04080100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04080100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04110000.xhp b/helpcontent2/source/text/simpress/01/04110000.xhp
index 91816e8595..d8e67edaf6 100644
--- a/helpcontent2/source/text/simpress/01/04110000.xhp
+++ b/helpcontent2/source/text/simpress/01/04110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04110100.xhp b/helpcontent2/source/text/simpress/01/04110100.xhp
index 998dc7c4aa..881505c360 100755
--- a/helpcontent2/source/text/simpress/01/04110100.xhp
+++ b/helpcontent2/source/text/simpress/01/04110100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04110100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,9 +67,9 @@
 <paragraph role="listitem" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="7">At the prompt, click <emph>Yes </emph>to scale the elements to fit on the slide or <emph>No </emph>to preserve the original size of the elements.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_INSERT_PAGES_OBJS:CBX_LINK" id="bm_id3152991" localize="false"/><paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2" l10n="U" oldref="10">Link</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK" id="bm_id3152991" localize="false"/><paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2" l10n="U" oldref="10">Link</paragraph>
 <paragraph role="paragraph" id="par_id3156448" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SD:CHECKBOX:DLG_INSERT_PAGES_OBJS:CBX_LINK">Inserts a file or some file elements as a link that is automatically updated when the source file is modified.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS" id="bm_id3151240" localize="false"/><paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete unused backgrounds</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS" id="bm_id3151240" localize="false"/><paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete unused backgrounds</paragraph>
 <paragraph role="paragraph" id="par_id3148868" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD:CHECKBOX:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS">Unused master pages are not inserted.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04110200.xhp b/helpcontent2/source/text/simpress/01/04110200.xhp
index 1d1079cfa3..8029138436 100755
--- a/helpcontent2/source/text/simpress/01/04110200.xhp
+++ b/helpcontent2/source/text/simpress/01/04110200.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04110200.xhp,v $
- *
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04120000.xhp b/helpcontent2/source/text/simpress/01/04120000.xhp
index 4e2b259cbf..c2d939ff21 100644
--- a/helpcontent2/source/text/simpress/01/04120000.xhp
+++ b/helpcontent2/source/text/simpress/01/04120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04130000.xhp b/helpcontent2/source/text/simpress/01/04130000.xhp
index 8104676a2a..90ad4eee67 100644
--- a/helpcontent2/source/text/simpress/01/04130000.xhp
+++ b/helpcontent2/source/text/simpress/01/04130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04130000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04140000.xhp b/helpcontent2/source/text/simpress/01/04140000.xhp
index ca69b6903c..67956c82ac 100644
--- a/helpcontent2/source/text/simpress/01/04140000.xhp
+++ b/helpcontent2/source/text/simpress/01/04140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04140000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990000.xhp b/helpcontent2/source/text/simpress/01/04990000.xhp
index 777e321334..c4e7441693 100755
--- a/helpcontent2/source/text/simpress/01/04990000.xhp
+++ b/helpcontent2/source/text/simpress/01/04990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990100.xhp b/helpcontent2/source/text/simpress/01/04990100.xhp
index 29e40b695a..1a75d60d22 100644
--- a/helpcontent2/source/text/simpress/01/04990100.xhp
+++ b/helpcontent2/source/text/simpress/01/04990100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990200.xhp b/helpcontent2/source/text/simpress/01/04990200.xhp
index 4380c6d31d..3d19489a77 100644
--- a/helpcontent2/source/text/simpress/01/04990200.xhp
+++ b/helpcontent2/source/text/simpress/01/04990200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990300.xhp b/helpcontent2/source/text/simpress/01/04990300.xhp
index 577c075fc7..1694a19683 100644
--- a/helpcontent2/source/text/simpress/01/04990300.xhp
+++ b/helpcontent2/source/text/simpress/01/04990300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990400.xhp b/helpcontent2/source/text/simpress/01/04990400.xhp
index bdd647ed7f..932e669924 100644
--- a/helpcontent2/source/text/simpress/01/04990400.xhp
+++ b/helpcontent2/source/text/simpress/01/04990400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990500.xhp b/helpcontent2/source/text/simpress/01/04990500.xhp
index 6b366a65d5..5cac3d5931 100644
--- a/helpcontent2/source/text/simpress/01/04990500.xhp
+++ b/helpcontent2/source/text/simpress/01/04990500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/04990600.xhp b/helpcontent2/source/text/simpress/01/04990600.xhp
index a3b0bb7d20..f0cd5446c9 100644
--- a/helpcontent2/source/text/simpress/01/04990600.xhp
+++ b/helpcontent2/source/text/simpress/01/04990600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0104990600xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Author  </title>
 <filename>/text/simpress/01/04990600.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T15:30:35">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="autor">
@@ -52,7 +45,7 @@
 <paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04990600.xhp" name="Author">Author</link></paragraph>
 <paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the first and last names listed in the $[officename] user data into the active slide.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data"><emph>$[officename] - User Data</emph></link>.</paragraph>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#feldbf6"/>
 </section>
diff --git a/helpcontent2/source/text/simpress/01/04990700.xhp b/helpcontent2/source/text/simpress/01/04990700.xhp
index 42bcae9b01..fa3582274e 100644
--- a/helpcontent2/source/text/simpress/01/04990700.xhp
+++ b/helpcontent2/source/text/simpress/01/04990700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05090000m.xhp b/helpcontent2/source/text/simpress/01/05090000m.xhp
index 52e66e4f57..8960457dde 100644
--- a/helpcontent2/source/text/simpress/01/05090000m.xhp
+++ b/helpcontent2/source/text/simpress/01/05090000m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090000m.xhp,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05100000.xhp b/helpcontent2/source/text/simpress/01/05100000.xhp
index c63298ca7f..3d48626d76 100644
--- a/helpcontent2/source/text/simpress/01/05100000.xhp
+++ b/helpcontent2/source/text/simpress/01/05100000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -105,7 +102,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="E">
-<image id="img_id3151390" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151390" xml-lang="en-US">Icon</alt>
+<image id="img_id3151390" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151390" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/01/05110500m.xhp b/helpcontent2/source/text/simpress/01/05110500m.xhp
index e2a3ae0460..05cffd1ea1 100644
--- a/helpcontent2/source/text/simpress/01/05110500m.xhp
+++ b/helpcontent2/source/text/simpress/01/05110500m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110500m.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05120000.xhp b/helpcontent2/source/text/simpress/01/05120000.xhp
index 2ecaa5b8f8..7eb687a139 100644
--- a/helpcontent2/source/text/simpress/01/05120000.xhp
+++ b/helpcontent2/source/text/simpress/01/05120000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,18 +42,17 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/SID_PRESENTATION_LAYOUT" id="bm_id8828300" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PresentationLayout" id="bm_id3155961" localize="false"/><paragraph role="heading" id="hd_id3154253" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05120000.xhp" name="Slide Design">Slide Design</link></paragraph>
-<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp></variable></paragraph>
 <section id="howtoget">
   <embed href="text/simpress/00/00000405.xhp#seitenvorlage"/>
 </section>
 <paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="2" l10n="U" oldref="3">Slide design</paragraph>
 <paragraph role="paragraph" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="4">Displays the slide designs you can apply to your slide. Select a design and click <emph>OK</emph> to apply it to the current slide.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PRESLT:CBX_MASTER_PAGE" id="bm_id3145385" localize="false"/><paragraph role="heading" id="hd_id3154372" xml-lang="en-US" level="2" l10n="U" oldref="7">Exchange background page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE" id="bm_id3145385" localize="false"/><paragraph role="heading" id="hd_id3154372" xml-lang="en-US" level="2" l10n="U" oldref="7">Exchange background page</paragraph>
 <paragraph role="paragraph" id="par_id3149407" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:CHECKBOX:DLG_PRESLT:CBX_MASTER_PAGE">Applies the background of the selected slide design to all of the slides in your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PRESLT:CBX_CHECK_MASTERS" id="bm_id3149946" localize="false"/><paragraph role="heading" id="hd_id3153818" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Delete unused backgrounds</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS" id="bm_id3149946" localize="false"/><paragraph role="heading" id="hd_id3153818" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Delete unused backgrounds</paragraph>
 <paragraph role="paragraph" id="par_id3148871" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:CHECKBOX:DLG_PRESLT:CBX_CHECK_MASTERS">Deletes unreferenced background slides and presentation layouts from your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PRESLT:BTN_LOAD" id="bm_id3148608" localize="false"/><paragraph role="heading" id="hd_id3157982" xml-lang="en-US" level="2" l10n="U" oldref="5">Load</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PRESLT:BTN_LOAD" id="bm_id3148608" localize="false"/><paragraph role="heading" id="hd_id3157982" xml-lang="en-US" level="2" l10n="U" oldref="5">Load</paragraph>
 <paragraph role="paragraph" id="par_id3156020" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:PUSHBUTTON:DLG_PRESLT:BTN_LOAD">Displays the <link href="text/simpress/01/05120100.xhp" name="Load Slide Design"><emph>Load Slide Design</emph></link> dialog, where you can select additional slide designs.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05120100.xhp b/helpcontent2/source/text/simpress/01/05120100.xhp
index 49a5e48ea9..f86c76bc7b 100644
--- a/helpcontent2/source/text/simpress/01/05120100.xhp
+++ b/helpcontent2/source/text/simpress/01/05120100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,16 +44,16 @@
 <paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="2">Load additional slide designs for your presentation.</paragraph>
 <paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="U" oldref="4">Select a design category, and then a template you want to apply.</paragraph>
 <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><comment>how to get this page?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION" id="bm_id3154756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_REGION" id="bm_id3154756" localize="false"/>
 <paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="2" l10n="U" oldref="27">Categories</paragraph>
 <paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION">Displays the available slide design categories.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE" id="bm_id3154703" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE" id="bm_id3154703" localize="false"/>
 <paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="2" l10n="U" oldref="5">Templates</paragraph>
 <paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE">Displays the templates for the selected design category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_MOREBUTTON_DLG_NEW_FILE_BT_MORE" id="bm_id3159237" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MoreButton:DLG_NEW_FILE:BT_MORE" id="bm_id3159237" localize="false"/>
 <paragraph role="heading" id="hd_id3145791" xml-lang="en-US" level="2" l10n="U" oldref="7">More&gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3150344" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SFX2_MOREBUTTON_DLG_NEW_FILE_BT_MORE">Shows or hides a preview and the properties of a selected template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_BTN_PREVIEW" id="bm_id3145585" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW" id="bm_id3145585" localize="false"/>
 <paragraph role="heading" id="hd_id3154659" xml-lang="en-US" level="3" l10n="U" oldref="9">Preview</paragraph>
 <paragraph role="paragraph" id="par_id3166431" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_BTN_PREVIEW">Turns on a preview of the template.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150369" xml-lang="en-US" level="3" l10n="U" oldref="11">Preview field</paragraph>
@@ -65,16 +62,16 @@
 <paragraph role="heading" id="hd_id3149053" xml-lang="en-US" level="2" l10n="U" oldref="14">Description</paragraph>
 <paragraph role="paragraph" id="par_id3150051" xml-lang="en-US" l10n="U" oldref="15">Lists the properties of the selected template.</paragraph>
 <paragraph role="note" id="par_id3145234" xml-lang="en-US" l10n="U" oldref="29">These properties are optional and the boxes may be blank.You cannot edit the properties in this area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_NEW_FILE_ED_TITLE" id="bm_id3144503" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_NEW_FILE:ED_TITLE" id="bm_id3144503" localize="false"/>
 <paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="16">Title</paragraph>
 <paragraph role="paragraph" id="par_id3150650" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2_EDIT_DLG_NEW_FILE_ED_TITLE">Displays the title of the template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_NEW_FILE_ED_THEMA" id="bm_id3149888" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_NEW_FILE:ED_THEMA" id="bm_id3149888" localize="false"/>
 <paragraph role="heading" id="hd_id3157900" xml-lang="en-US" level="3" l10n="U" oldref="18">Subject</paragraph>
 <paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2_EDIT_DLG_NEW_FILE_ED_THEMA">Displays the subject of the template. Some templates are grouped together by subject.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_NEW_FILE_ED_KEYWORDS" id="bm_id3150745" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS" id="bm_id3150745" localize="false"/>
 <paragraph role="heading" id="hd_id3148728" xml-lang="en-US" level="3" l10n="U" oldref="20">Keywords</paragraph>
 <paragraph role="paragraph" id="par_id3153036" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SFX2_EDIT_DLG_NEW_FILE_ED_KEYWORDS">Displays the keywords for searching.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_MULTILINEEDIT_DLG_NEW_FILE_ED_DESC" id="bm_id3149511" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC" id="bm_id3149511" localize="false"/>
 <paragraph role="heading" id="hd_id3148583" xml-lang="en-US" level="3" l10n="U" oldref="22">Description</paragraph>
 <paragraph role="paragraph" id="par_id3155260" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SFX2_MULTILINEEDIT_DLG_NEW_FILE_ED_DESC">Brief summary of the selected template.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/05120500m.xhp b/helpcontent2/source/text/simpress/01/05120500m.xhp
index b3c34d0389..f930d6c798 100644
--- a/helpcontent2/source/text/simpress/01/05120500m.xhp
+++ b/helpcontent2/source/text/simpress/01/05120500m.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120500m.xhp,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05130000.xhp b/helpcontent2/source/text/simpress/01/05130000.xhp
index a2771d334a..6f4b07ca63 100644
--- a/helpcontent2/source/text/simpress/01/05130000.xhp
+++ b/helpcontent2/source/text/simpress/01/05130000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05130000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +29,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0105130000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Slide Layout</title>
 <filename>/text/simpress/01/05130000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T11:37:02">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154754"><bookmark_value>changing; slide layouts</bookmark_value>
@@ -56,6 +49,9 @@
 <section id="howtoget">
   <embed href="text/simpress/00/00000405.xhp#adnsei"/>
 </section>
+
+<paragraph role="paragraph" id="par_id31469757" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">The icon in the Presentation toolbar opens a submenu. Select the slide layout for the slide.</caseinline></switchinline></paragraph>
+
 <embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05140000.xhp b/helpcontent2/source/text/simpress/01/05140000.xhp
index 8b72e63724..1cdfc46749 100644
--- a/helpcontent2/source/text/simpress/01/05140000.xhp
+++ b/helpcontent2/source/text/simpress/01/05140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05140000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05150000.xhp b/helpcontent2/source/text/simpress/01/05150000.xhp
index a5485feb6a..bf6f40d393 100644
--- a/helpcontent2/source/text/simpress/01/05150000.xhp
+++ b/helpcontent2/source/text/simpress/01/05150000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05150000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,25 +53,25 @@
 <paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="93">A Dimension Line is always inserted on the <link href="text/simpress/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any Dimension Line in your drawing.</paragraph>
 <paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2" l10n="U" oldref="3">Line</paragraph>
 <paragraph role="paragraph" id="par_id3159344" xml-lang="en-US" l10n="U" oldref="4">Sets the distance properties of the dimension line and the guides with respect to each other and to the baseline.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_LINE_DIST" id="bm_id3155532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST" id="bm_id3155532" localize="false"/>
 <paragraph role="heading" id="hd_id3150368" xml-lang="en-US" level="3" l10n="U" oldref="5">Line distance</paragraph>
 <paragraph role="paragraph" id="par_id3145388" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_LINE_DIST">Specifies the distance between the dimension line and the baseline (line distance = 0).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG" id="bm_id3152899" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG" id="bm_id3152899" localize="false"/>
 <paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="3" l10n="U" oldref="7">Guide overhang</paragraph>
 <paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG">Specifies the length of the left and right guides starting at the baseline (line distance = 0). Positive values extend the guides above the baseline and negative values extend the guides below the baseline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST" id="bm_id3156020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST" id="bm_id3156020" localize="false"/>
 <paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3" l10n="U" oldref="9">Guide distance</paragraph>
 <paragraph role="paragraph" id="par_id3159203" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST">Specifies the length of the right and left guides starting at the dimension line. Positive values extend the guides above the dimension line and negative values extend the guides below the dimension line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN" id="bm_id3145357" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN" id="bm_id3145357" localize="false"/>
 <paragraph role="heading" id="hd_id3150212" xml-lang="en-US" level="3" l10n="U" oldref="11">Left guide</paragraph>
 <paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN">Specifies the length of the left guide starting at the dimension line. Positive values extend the guide below the dimension line and negative values extend the guide above the dimension line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN" id="bm_id3149870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN" id="bm_id3149870" localize="false"/>
 <paragraph role="heading" id="hd_id3153809" xml-lang="en-US" level="3" l10n="U" oldref="13">Right guide</paragraph>
 <paragraph role="paragraph" id="par_id3149876" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN">Specifies the length of the right guide starting at the dimension line. Positive values extend the guide below the dimension line and negative values extend the guide above the dimension line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE" id="bm_id3147402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE" id="bm_id3147402" localize="false"/>
 <paragraph role="heading" id="hd_id3150436" xml-lang="en-US" level="3" l10n="U" oldref="15">Dimension line below the object</paragraph>
 <paragraph role="paragraph" id="par_id3151388" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE">Reverses the properties set in the <emph>Line</emph> area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_MEASURE_MTR_FLD_DECIMALPLACES" id="bm_id3166469" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES" id="bm_id3166469" localize="false"/>
 <paragraph role="heading" id="hd_id3145236" xml-lang="en-US" level="3" l10n="U" oldref="91">Decimal places</paragraph>
 <paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="U" oldref="92"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_MEASURE_MTR_FLD_DECIMALPLACES">Specifies the number of decimal places used for the display of line properties.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150653" xml-lang="en-US" level="2" l10n="U" oldref="19">Legend</paragraph>
@@ -83,17 +80,17 @@
 <paragraph role="heading" id="hd_id3149892" xml-lang="en-US" level="3" l10n="U" oldref="21">Text position</paragraph>
 <paragraph role="paragraph" id="par_id3148730" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_MEASURE_CTL_POSITION">Determines the position of the dimension text with respect to the dimension line and the guides.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3148569" xml-lang="en-US" l10n="U" oldref="88">The <emph>AutoVertical </emph>and <emph>AutoHorizontal </emph>checkboxes must be cleared before you can assign the <emph>Text position</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_MEASURE_TSB_AUTOPOSV" id="bm_id3153571" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV" id="bm_id3153571" localize="false"/>
 <paragraph role="heading" id="hd_id3145167" xml-lang="en-US" level="3" l10n="U" oldref="23">AutoVertical</paragraph>
 <paragraph role="paragraph" id="par_id3150019" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_MEASURE_TSB_AUTOPOSV">Determines the optimal vertical position for the dimension text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_MEASURE_TSB_AUTOPOSH" id="bm_id3153738" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH" id="bm_id3153738" localize="false"/>
 <paragraph role="heading" id="hd_id3155928" xml-lang="en-US" level="3" l10n="U" oldref="86">AutoHorizontal</paragraph>
 <paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_MEASURE_TSB_AUTOPOSH">Determines the optimal horizontal position for the dimension text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT" id="bm_id3155441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_MEASURE:LB_UNIT" id="bm_id3155440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT" id="bm_id3155441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT" id="bm_id3155440" localize="false"/>
 <paragraph role="heading" id="hd_id3145247" xml-lang="en-US" level="3" l10n="U" oldref="17">Show meas. units</paragraph>
 <paragraph role="paragraph" id="par_id3148386" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_MEASURE:LB_UNIT">Shows or hides the dimension measurement units. You can also select a measurement unit you want to display from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_PARALLEL" id="bm_id3150567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL" id="bm_id3150567" localize="false"/>
 <paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="83">Parallel to line</paragraph>
 <paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_PARALLEL">Displays the text parallel to or at 90 degrees to the dimension line.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/simpress/01/05170000.xhp b/helpcontent2/source/text/simpress/01/05170000.xhp
index 08ec992185..0fb37f28f6 100644
--- a/helpcontent2/source/text/simpress/01/05170000.xhp
+++ b/helpcontent2/source/text/simpress/01/05170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05170000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,32 +47,32 @@
 <paragraph role="heading" id="hd_id3150297" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05170000.xhp" name="Connectors">Connectors</link></paragraph>
 <paragraph role="paragraph" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="2"><variable id="verbindertext"><ahelp hid=".uno:ConnectorAttributes">Sets the properties of a connector.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE" id="bm_id3149405" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE" id="bm_id3149405" localize="false"/>
 <paragraph role="heading" id="hd_id3145384" xml-lang="en-US" level="2" l10n="U" oldref="21">Type</paragraph>
 <paragraph role="paragraph" id="par_id3152899" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE">Lists the types of connectors that are available.</ahelp>There are four types of connectors: <emph>standard, line, straight, and curved</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3148866" xml-lang="en-US" level="2" l10n="U" oldref="3">Line skew</paragraph>
 <paragraph role="paragraph" id="par_id3148605" xml-lang="en-US" l10n="U" oldref="4">Defines the skew of a connector line. The preview window displays the result.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1" id="bm_id3159206" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1" id="bm_id3159206" localize="false"/>
 <paragraph role="heading" id="hd_id3157982" xml-lang="en-US" level="3" l10n="U" oldref="5">Line 1</paragraph>
 <paragraph role="paragraph" id="par_id3150215" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1">Enter a skew value for Line 1.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2" id="bm_id3150046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2" id="bm_id3150046" localize="false"/>
 <paragraph role="heading" id="hd_id3145360" xml-lang="en-US" level="3" l10n="U" oldref="7">Line 2</paragraph>
 <paragraph role="paragraph" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2">Enter a skew value for Line 2.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3" id="bm_id3153071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3" id="bm_id3153071" localize="false"/>
 <paragraph role="heading" id="hd_id3149873" xml-lang="en-US" level="3" l10n="U" oldref="9">Line 3</paragraph>
 <paragraph role="paragraph" id="par_id3153957" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3">Enter a skew value for Line 3.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145581" xml-lang="en-US" level="2" l10n="U" oldref="11">Line spacing</paragraph>
 <paragraph role="paragraph" id="par_id3150395" xml-lang="en-US" l10n="U" oldref="12">Sets the line spacing for the connectors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1" id="bm_id3150538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1" id="bm_id3150538" localize="false"/>
 <paragraph role="heading" id="hd_id3147297" xml-lang="en-US" level="3" l10n="U" oldref="13">Begin horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3145238" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1">Enter the amount of horizontal space you want at the beginning of the connector.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1" id="bm_id3149353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1" id="bm_id3149353" localize="false"/>
 <paragraph role="heading" id="hd_id3153118" xml-lang="en-US" level="3" l10n="U" oldref="15">Begin vertical</paragraph>
 <paragraph role="paragraph" id="par_id3150653" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1">Enter the amount of vertical space you want at the beginning of the connector.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2" id="bm_id3149889" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2" id="bm_id3149889" localize="false"/>
 <paragraph role="heading" id="hd_id3150746" xml-lang="en-US" level="3" l10n="U" oldref="17">End horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3148726" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2">Enter the amount of horizontal space you want at the end of the connector.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2" id="bm_id3145596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2" id="bm_id3145596" localize="false"/>
 <paragraph role="heading" id="hd_id3153038" xml-lang="en-US" level="3" l10n="U" oldref="19">End vertical</paragraph>
 <paragraph role="paragraph" id="par_id3155260" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2">Enter the amount of vertical space you want at the end of the connector.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_CONNECTION_NEW_ROUTING" id="bm_id5161886" localize="false"/><!-- HID added by script -->
diff --git a/helpcontent2/source/text/simpress/01/05250000.xhp b/helpcontent2/source/text/simpress/01/05250000.xhp
index ea41baf154..8ebc6766f8 100644
--- a/helpcontent2/source/text/simpress/01/05250000.xhp
+++ b/helpcontent2/source/text/simpress/01/05250000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05250500.xhp b/helpcontent2/source/text/simpress/01/05250500.xhp
index a12d5c969e..57642eda08 100644
--- a/helpcontent2/source/text/simpress/01/05250500.xhp
+++ b/helpcontent2/source/text/simpress/01/05250500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05250600.xhp b/helpcontent2/source/text/simpress/01/05250600.xhp
index cf2a854148..d8d7289f0f 100644
--- a/helpcontent2/source/text/simpress/01/05250600.xhp
+++ b/helpcontent2/source/text/simpress/01/05250600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/05250700.xhp b/helpcontent2/source/text/simpress/01/05250700.xhp
index b69a2f6b88..1c78dab809 100644
--- a/helpcontent2/source/text/simpress/01/05250700.xhp
+++ b/helpcontent2/source/text/simpress/01/05250700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05250700.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/06030000.xhp b/helpcontent2/source/text/simpress/01/06030000.xhp
index 4381ac17a3..1a3a46ce82 100644
--- a/helpcontent2/source/text/simpress/01/06030000.xhp
+++ b/helpcontent2/source/text/simpress/01/06030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/06040000.xhp b/helpcontent2/source/text/simpress/01/06040000.xhp
index ee86dcd63b..a38d7204c9 100644
--- a/helpcontent2/source/text/simpress/01/06040000.xhp
+++ b/helpcontent2/source/text/simpress/01/06040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,19 +54,19 @@
   <embed href="text/simpress/00/00000407.xhp#etdaw"/>
 </section>
 <paragraph role="tip" id="par_id3154704" xml-lang="en-US" l10n="U" oldref="54">To apply the same transition effect to more than one slide, switch to the <link href="text/simpress/01/03100000.xhp" name="Slide View">Slide Sorter</link>, select the slides, and then choose <emph>Slide Show - Slide Transition</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_VT_EFFECT" id="bm_id3150298" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:FLT_WIN_SLIDE_CHANGE:LB_EFFECT" id="bm_id3148870" localize="false"/>
+<!-- removed HID SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_VT_EFFECT -->
+<!-- removed HID SD:LISTBOX:FLT_WIN_SLIDE_CHANGE:LB_EFFECT -->
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS" id="bm_id9115573" localize="false"/><comment>UFI: removed a help id</comment><paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Apply to selected slides</paragraph>
 <paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_VT_EFFECT">Select the slide transition you want to use for the selected slides.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN106A5" xml-lang="en-US" level="2" l10n="NEW">Modify transition</paragraph>
 <paragraph role="paragraph" id="par_idN106AB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the transition properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:FLT_WIN_SLIDE_CHANGE:LB_SPEED" id="bm_id3150213" localize="false"/>
+<!-- removed HID SD:LISTBOX:FLT_WIN_SLIDE_CHANGE:LB_SPEED -->
 <bookmark xml-lang="en-US" branch="hid/.uno:DiaSpeed" id="bm_id3153247" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDETRANSITIONPANE_LB_SPEED" id="bm_id1421246" localize="false"/><paragraph role="heading" id="hd_id3159207" xml-lang="en-US" level="3" l10n="U" oldref="5">Speed</paragraph>
 <paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="U" oldref="20"><variable id="geschwindigkeit1"><ahelp hid=".uno:DiaSpeed">Sets the speed of the slide transition.</ahelp>
 </variable><variable id="geschwindigkeit2">
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_SOUND" id="bm_id3149447" localize="false"/>
+<!-- removed HID SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_SOUND -->
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDETRANSITIONPANE_LB_SOUND" id="bm_id2305673" localize="false"/><paragraph role="heading" id="hd_id3156304" xml-lang="en-US" level="3" l10n="U" oldref="11">Sound</paragraph>
 <paragraph role="paragraph" id="par_id3153212" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:IMAGEBUTTON:FLT_WIN_SLIDE_CHANGE:BTN_SOUND">Lists sounds that can played during the slide transition.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND" id="bm_id8703573" localize="false"/><paragraph role="heading" id="par_idN1071E" xml-lang="en-US" level="3" l10n="NEW">Loop until next sound</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/06050000.xhp b/helpcontent2/source/text/simpress/01/06050000.xhp
index 52aa68f233..7c9ccbda0c 100644
--- a/helpcontent2/source/text/simpress/01/06050000.xhp
+++ b/helpcontent2/source/text/simpress/01/06050000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,172 +29,211 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsimpress0106050000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Animation</title>
-<filename>/text/simpress/01/06050000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="animation">
+      <topic id="textsimpress0106050000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Animation</title>
+         <filename>/text/simpress/01/06050000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="animation">
 <bookmark xml-lang="en-US" branch="hid/SID_ANIMATION_OBJECTS" id="bm_id8175410" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AnimationObjects" id="bm_id3156444" localize="false"/><paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/06050000.xhp" name="Animation">Animation</link></paragraph>
-<paragraph role="paragraph" id="par_id3150012" xml-lang="en-US" l10n="U" oldref="2"><variable id="animtext"><ahelp hid=".uno:AnimationObjects">Creates a custom animation on the current slide.</ahelp> You can only use existing objects to create an animation. 
+<bookmark xml-lang="en-US" branch="hid/.uno:AnimationObjects" id="bm_id3156444" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U" oldref="1"><link href="text/simpress/01/06050000.xhp" name="Animation">Animation</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150012" role="paragraph" l10n="U" oldref="2"><variable id="animtext"><ahelp hid=".uno:AnimationObjects">Creates a custom animation on the current slide.</ahelp> You can only use existing objects to create an animation. 
 </variable></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/simpress/00/00000407.xhp#etani"/>
-</section>
-<paragraph role="tip" id="par_id3155444" xml-lang="en-US" l10n="U" oldref="86">You can copy and paste animations into <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<paragraph role="heading" id="hd_id3155959" xml-lang="en-US" level="2" l10n="U" oldref="3">Animation</paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="4">Shows a preview of the objects in the animation. You can also press the <emph>Play</emph> button to view the animation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_FIRST" id="bm_id3147004" localize="false"/><paragraph role="paragraph" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_FIRST">Jumps to the first image in the animation sequence.</ahelp></paragraph>
-<table id="tbl_id3150301">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150363" xml-lang="en-US" l10n="E">
-<image id="img_id3154657" src="res/helpimg/left2.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154657" xml-lang="en-US">Icon</alt>
+      </section>
+      <section id="howtoget">
+         <embed href="text/simpress/00/00000407.xhp#etani"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155444" role="tip" l10n="U" oldref="86">You can copy and paste animations into <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155959" role="heading" level="2" l10n="U" oldref="3">Animation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="4">Shows a preview of the objects in the animation. You can also press the <emph>Play</emph> button to view the animation.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST" id="bm_id3147004" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="6"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_FIRST">Jumps to the first image in the animation sequence.</ahelp></paragraph>
+      <table id="tbl_id3150301">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150363" role="paragraph" l10n="E">
+<image id="img_id3154657" src="res/helpimg/left2.png" width="0.2189in" height="0.1874in"><alt xml-lang="en-US" id="alt_id3154657">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155530" xml-lang="en-US" l10n="U" oldref="5">First image</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REVERSE" id="bm_id3149407" localize="false"/><paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REVERSE">Moves back one image in the animation sequence.</ahelp></paragraph>
-<table id="tbl_id3148839">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153912" xml-lang="en-US" l10n="E">
-<image id="img_id3155268" src="res/helpimg/left.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3155268" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155530" role="paragraph" l10n="U" oldref="5">First image</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE" id="bm_id3149407" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145386" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REVERSE">Plays the animation backwards.</ahelp></paragraph>
+      <table id="tbl_id3148839">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153912" role="paragraph" l10n="E">
+<image id="img_id3155268" src="res/helpimg/left.png" width="0.2189in" height="0.1874in"><alt xml-lang="en-US" id="alt_id3155268">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152871" xml-lang="en-US" l10n="U" oldref="7">Backwards</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_STOP" id="bm_id3149048" localize="false"/><paragraph role="paragraph" id="par_id3150210" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_STOP">Stops playing the animation.</ahelp></paragraph>
-<table id="tbl_id3145362">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153011" xml-lang="en-US" l10n="E">
-<image id="img_id3147250" src="res/helpimg/sistop.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3147250" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152871" role="paragraph" l10n="U" oldref="7">Backwards</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP" id="bm_id3149048" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150210" role="paragraph" l10n="U" oldref="10"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_STOP">Stops playing the animation.</ahelp></paragraph>
+      <table id="tbl_id3145362">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153011" role="paragraph" l10n="E">
+<image id="img_id3147250" src="res/helpimg/sistop.png" width="0.2189in" height="0.1874in"><alt xml-lang="en-US" id="alt_id3147250">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153961" xml-lang="en-US" l10n="U" oldref="9">Stop</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_PLAY" id="bm_id3151393" localize="false"/><paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_PLAY">Plays the animation.</ahelp></paragraph>
-<table id="tbl_id3150535">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153119" xml-lang="en-US" l10n="E">
-<image id="img_id3149352" src="res/helpimg/right.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3149352" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153961" role="paragraph" l10n="U" oldref="9">Stop</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY" id="bm_id3151393" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147297" role="paragraph" l10n="U" oldref="12"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_PLAY">Plays the animation.</ahelp></paragraph>
+      <table id="tbl_id3150535">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153119" role="paragraph" l10n="E">
+<image id="img_id3149352" src="res/helpimg/right.png" width="0.2189in" height="0.1874in"><alt xml-lang="en-US" id="alt_id3149352">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150478" xml-lang="en-US" l10n="U" oldref="11">Play</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_LAST" id="bm_id3150743" localize="false"/><paragraph role="paragraph" id="par_id3154675" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_LAST">Jumps to the last image in the animation sequence.</ahelp></paragraph>
-<table id="tbl_id3145829">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153932" xml-lang="en-US" l10n="E">
-<image id="img_id3145593" src="res/helpimg/right2.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3145593" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150478" role="paragraph" l10n="U" oldref="11">Play</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST" id="bm_id3150743" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154675" role="paragraph" l10n="U" oldref="14"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_LAST">Jumps to the last image in the animation sequence.</ahelp></paragraph>
+      <table id="tbl_id3145829">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153932" role="paragraph" l10n="E">
+<image id="img_id3145593" src="res/helpimg/right2.png" width="0.2189in" height="0.1874in"><alt xml-lang="en-US" id="alt_id3145593">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149504" xml-lang="en-US" l10n="U" oldref="13">Last image</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_NUMERICFIELD_FLT_WIN_ANIMATION_NUM_FLD_BITMAP" id="bm_id3150003" localize="false"/><paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="2" l10n="U" oldref="15">Image Number</paragraph>
-<paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD_NUMERICFIELD_FLT_WIN_ANIMATION_NUM_FLD_BITMAP">Indicates the position of the current image in the animation sequence.</ahelp> If you want to view another image, enter its number or click the up and down arrows.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_TIMEFIELD_FLT_WIN_ANIMATION_TIME_FIELD" id="bm_id3153571" localize="false"/><paragraph role="heading" id="hd_id3148569" xml-lang="en-US" level="2" l10n="U" oldref="17">Duration</paragraph>
-<paragraph role="paragraph" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD_TIMEFIELD_FLT_WIN_ANIMATION_TIME_FIELD">Enter the number of seconds to display the current image. This option is only available if you select the <emph>Bitmap object</emph> option in the <emph>Animation group</emph> field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_FLT_WIN_ANIMATION_LB_LOOP_COUNT" id="bm_id3150133" localize="false"/><paragraph role="heading" id="hd_id3147368" xml-lang="en-US" level="2" l10n="U" oldref="83">Loop count</paragraph>
-<paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SD_LISTBOX_FLT_WIN_ANIMATION_LB_LOOP_COUNT">Sets the number of times that the animation is played.</ahelp> If you want the animation to play continuously, choose <emph>Max</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3155928" xml-lang="en-US" level="2" l10n="U" oldref="19">Image</paragraph>
-<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="37">Adds or removes objects from your animation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ONE_OBJECT" id="bm_id3150936" localize="false"/><paragraph role="heading" id="hd_id3145353" xml-lang="en-US" level="3" l10n="U" oldref="38">Apply Object</paragraph>
-<paragraph role="paragraph" id="par_id3157974" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ONE_OBJECT">Adds selected object(s) as a single image.</ahelp></paragraph>
-<table id="tbl_id3150568">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156068" xml-lang="en-US" l10n="E">
-<image id="img_id3148768" src="sd/res/get1obj.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148768" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149504" role="paragraph" l10n="U" oldref="13">Last image</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP" id="bm_id3150003" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149956" role="heading" level="2" l10n="U"
+                 oldref="15">Image Number</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150008" role="paragraph" l10n="U" oldref="16"><ahelp hid="SD_NUMERICFIELD_FLT_WIN_ANIMATION_NUM_FLD_BITMAP">Indicates the position of the current image in the animation sequence.</ahelp> If you want to view another image, enter its number or click the up and down arrows.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD" id="bm_id3153571" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148569" role="heading" level="2" l10n="U"
+                 oldref="17">Duration</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150337" role="paragraph" l10n="U" oldref="18"><ahelp hid="SD_TIMEFIELD_FLT_WIN_ANIMATION_TIME_FIELD">Enter the number of seconds to display the current image. This option is only available if you select the <emph>Bitmap object</emph> option in the <emph>Animation group</emph> field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT" id="bm_id3150133" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147368" role="heading" level="2" l10n="U"
+                 oldref="83">Loop count</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154326" role="paragraph" l10n="U" oldref="84"><ahelp hid="SD_LISTBOX_FLT_WIN_ANIMATION_LB_LOOP_COUNT">Sets the number of times that the animation is played.</ahelp> If you want the animation to play continuously, choose <emph>Max</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155928" role="heading" level="2" l10n="U"
+                 oldref="19">Image</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155434" role="paragraph" l10n="U" oldref="37">Adds or removes objects from your animation.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT" id="bm_id3150936" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145353" role="heading" level="2" l10n="U"
+                 oldref="38">Apply Object</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3157974" role="paragraph" l10n="U" oldref="39"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ONE_OBJECT">Adds selected object(s) as a single image.</ahelp></paragraph>
+      <table id="tbl_id3150568">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E">
+<image id="img_id3148768" src="sd/res/get1obj.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3148768">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150268" xml-lang="en-US" l10n="U" oldref="79">Apply Object</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ALL_OBJECTS" id="bm_id3154867" localize="false"/><paragraph role="heading" id="hd_id3153221" xml-lang="en-US" level="3" l10n="U" oldref="40">Apply Objects Individually</paragraph>
-<paragraph role="paragraph" id="par_id3147533" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ALL_OBJECTS">Adds an image for each selected object.</ahelp> If you select a grouped object, an image is created for each object in the group.</paragraph>
-<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="85">You can also select an animation, such as an animated GIF, and click this icon to open it for editing. When you are finished editing the animation, click <emph>Create</emph> to insert a new animation into your slide. </paragraph>
-<table id="tbl_id3148431">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156257" xml-lang="en-US" l10n="E">
-<image id="img_id3153716" src="sd/res/getallob.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3153716" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150268" role="paragraph" l10n="U" oldref="79">Apply Object</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS" id="bm_id3154867" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153221" role="heading" level="2" l10n="U"
+                 oldref="40">Apply Objects Individually</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147533" role="paragraph" l10n="U" oldref="41"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_GET_ALL_OBJECTS">Adds an image for each selected object.</ahelp> If you select a grouped object, an image is created for each object in the group.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150470" role="paragraph" l10n="U" oldref="85">You can also select an animation, such as an animated GIF, and click this icon to open it for editing. When you are finished editing the animation, click <emph>Create</emph> to insert a new animation into your slide. </paragraph>
+      <table id="tbl_id3148431">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156257" role="paragraph" l10n="E">
+<image id="img_id3153716" src="sd/res/getallob.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153716">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145621" xml-lang="en-US" l10n="U" oldref="80">Apply Objects Individually</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_BITMAP" id="bm_id3152482" localize="false"/><paragraph role="heading" id="hd_id3163826" xml-lang="en-US" level="3" l10n="U" oldref="42">Delete Current Image</paragraph>
-<paragraph role="paragraph" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_BITMAP">Deletes current image from the animation sequence.</ahelp></paragraph>
-<table id="tbl_id3149447">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152926" xml-lang="en-US" l10n="E">
-<image id="img_id3153210" src="sd/res/del1bmp.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153210" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145621" role="paragraph" l10n="U" oldref="80">Apply Objects Individually</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP" id="bm_id3152482" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163826" role="heading" level="2" l10n="U"
+                 oldref="42">Delete Current Image</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149710" role="paragraph" l10n="U" oldref="43"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_BITMAP">Deletes current image from the animation sequence.</ahelp></paragraph>
+      <table id="tbl_id3149447">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152926" role="paragraph" l10n="E">
+<image id="img_id3153210" src="sd/res/del1bmp.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153210">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="81">Delete Current Image</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_ALL" id="bm_id3150760" localize="false"/><paragraph role="heading" id="hd_id3154641" xml-lang="en-US" level="3" l10n="U" oldref="44">Delete All Images</paragraph>
-<paragraph role="paragraph" id="par_id3150765" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_ALL">Deletes all of the images in the animation.</ahelp></paragraph>
-<table id="tbl_id3145209">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147271" xml-lang="en-US" l10n="E">
-<image id="img_id3154049" src="sd/res/delall.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154049" xml-lang="en-US">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151187" role="paragraph" l10n="U" oldref="81">Delete Current Image</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+<bookmark xml-lang="en-US" branch="hid/sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL" id="bm_id3150760" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154641" role="heading" level="2" l10n="U"
+                 oldref="44">Delete All Images</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150765" role="paragraph" l10n="U" oldref="45"><ahelp hid="SD_IMAGEBUTTON_FLT_WIN_ANIMATION_BTN_REMOVE_ALL">Deletes all of the images in the animation.</ahelp></paragraph>
+      <table id="tbl_id3145209">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147271" role="paragraph" l10n="E">
+<image id="img_id3154049" src="sd/res/delall.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154049">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153618" xml-lang="en-US" l10n="U" oldref="82">Delete All Images</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id3143234" xml-lang="en-US" level="3" l10n="CHG" oldref="22">Number</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="23">Total number of images in the animation.</paragraph>
-<paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="24">Animation group</paragraph>
-<paragraph role="paragraph" id="par_id3146088" xml-lang="en-US" l10n="U" oldref="25">Sets object properties for your animation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_GROUP" id="bm_id3145667" localize="false"/><paragraph role="heading" id="hd_id3147259" xml-lang="en-US" level="3" l10n="U" oldref="26">Group object</paragraph>
-<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_GROUP">Assembles images into a single object so that they can be moved as a group. You can still edit individual objects by double-clicking the group in the slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_BITMAP" id="bm_id3155322" localize="false"/><paragraph role="heading" id="hd_id3154688" xml-lang="en-US" level="3" l10n="U" oldref="28">Bitmap object</paragraph>
-<paragraph role="paragraph" id="par_id3155329" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_BITMAP">Combines images into a single image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_FLT_WIN_ANIMATION_LB_ADJUSTMENT" id="bm_id3148827" localize="false"/><paragraph role="heading" id="hd_id3148815" xml-lang="en-US" level="3" l10n="U" oldref="32">Alignment</paragraph>
-<paragraph role="paragraph" id="par_id3148834" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SD_LISTBOX_FLT_WIN_ANIMATION_LB_ADJUSTMENT">Aligns the images in your animation.</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_FLT_WIN_ANIMATION_BTN_CREATE_GROUP" id="bm_id3154288" localize="false"/><paragraph role="heading" id="hd_id3148803" xml-lang="en-US" level="3" l10n="U" oldref="34">Create</paragraph>
-<paragraph role="paragraph" id="par_id3154294" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SD_PUSHBUTTON_FLT_WIN_ANIMATION_BTN_CREATE_GROUP">Inserts the animation into the current slide.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/animated_gif_create.xhp#animated_gif_create"/>
-</section>
-</body>
-</helpdocument>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153618" role="paragraph" l10n="U" oldref="82">Delete All Images</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id3143234" role="heading" level="2" l10n="CHG"
+                 oldref="22">Number</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="U" oldref="23">Total number of images in the animation.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3159177" role="heading" level="2" l10n="U"
+                 oldref="24">Animation group</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146088" role="paragraph" l10n="U" oldref="25">Sets object properties for your animation.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP" id="bm_id3145667" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147259" role="heading" level="2" l10n="U"
+                 oldref="26">Group object</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151170" role="paragraph" l10n="U" oldref="27"><ahelp hid="SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_GROUP">Assembles images into a single object so that they can be moved as a group. You can still edit individual objects by double-clicking the group in the slide.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP" id="bm_id3155322" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154688" role="heading" level="2" l10n="U"
+                 oldref="28">Bitmap object</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155329" role="paragraph" l10n="U" oldref="29"><ahelp hid="SD_RADIOBUTTON_FLT_WIN_ANIMATION_RBT_BITMAP">Combines images into a single image.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT" id="bm_id3148827" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148815" role="heading" level="2" l10n="U"
+                 oldref="32">Alignment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148834" role="paragraph" l10n="U" oldref="33"><ahelp hid="SD_LISTBOX_FLT_WIN_ANIMATION_LB_ADJUSTMENT">Aligns the images in your animation.</ahelp>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP" id="bm_id3154288" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148803" role="heading" level="2" l10n="U"
+                 oldref="34">Create</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154294" role="paragraph" l10n="U" oldref="35"><ahelp hid="SD_PUSHBUTTON_FLT_WIN_ANIMATION_BTN_CREATE_GROUP">Inserts the animation into the current slide.</ahelp></paragraph>
+      <section id="relatedtopics">
+         <embed href="text/simpress/guide/animated_gif_create.xhp#animated_gif_create"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/01/06060000.xhp b/helpcontent2/source/text/simpress/01/06060000.xhp
index 17affdc63d..f428aac14c 100644
--- a/helpcontent2/source/text/simpress/01/06060000.xhp
+++ b/helpcontent2/source/text/simpress/01/06060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/06070000.xhp b/helpcontent2/source/text/simpress/01/06070000.xhp
index 29de95a9b5..67579feba2 100644
--- a/helpcontent2/source/text/simpress/01/06070000.xhp
+++ b/helpcontent2/source/text/simpress/01/06070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06070000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
 <section id="howtoget">
   <embed href="text/simpress/00/00000407.xhp#interaktion"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:TP_ANIMATION:LB_ACTION" id="bm_id3150432" localize="false"/><paragraph role="heading" id="hd_id3145116" xml-lang="en-US" level="2" l10n="U" oldref="3">Action at mouse click</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:TP_ANIMATION:LB_ACTION" id="bm_id3150432" localize="false"/><paragraph role="heading" id="hd_id3145116" xml-lang="en-US" level="2" l10n="U" oldref="3">Action at mouse click</paragraph>
 <paragraph role="paragraph" id="par_id3153955" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SD:LISTBOX:TP_ANIMATION:LB_ACTION">Specifies the action that will run when you click the selected object during a slide show.</ahelp> You can also assign actions to grouped objects.</paragraph>
 <paragraph role="heading" id="hd_id3150397" xml-lang="en-US" level="2" l10n="U" oldref="4">No action</paragraph>
 <paragraph role="paragraph" id="par_id3147405" xml-lang="en-US" l10n="U" oldref="45">No action occurs.</paragraph>
@@ -73,23 +70,23 @@
 <paragraph role="paragraph" id="par_id3148585" xml-lang="en-US" l10n="U" oldref="50">Jumps to a slide or a named object in a slide.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_CTL_ACTION_DLG_1" id="bm_id3149511" localize="false"/><paragraph role="heading" id="hd_id3153082" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Target</paragraph>
 <paragraph role="paragraph" id="par_id3153934" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_CTL_ACTION_DLG_1">Lists the slides and the objects that you can target.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_TP_ANIMATION_EDT_BOOKMARK" id="bm_id3153000" localize="false"/><paragraph role="heading" id="hd_id3154561" xml-lang="en-US" level="3" l10n="U" oldref="11">Slide / Object</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:TP_ANIMATION:EDT_BOOKMARK" id="bm_id3153000" localize="false"/><paragraph role="heading" id="hd_id3154561" xml-lang="en-US" level="3" l10n="U" oldref="11">Slide / Object</paragraph>
 <paragraph role="paragraph" id="par_id3153006" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SD_EDIT_TP_ANIMATION_EDT_BOOKMARK">Enter the name of the slide or the object that you want to look for.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:TP_ANIMATION:BTN_SEEK" id="bm_id3153566" localize="false"/><paragraph role="heading" id="hd_id3145162" xml-lang="en-US" level="3" l10n="U" oldref="12">Find</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:TP_ANIMATION:BTN_SEEK" id="bm_id3153566" localize="false"/><paragraph role="heading" id="hd_id3145162" xml-lang="en-US" level="3" l10n="U" oldref="12">Find</paragraph>
 <paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SD:PUSHBUTTON:TP_ANIMATION:BTN_SEEK">Searches for the specified slide or object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_CTL_ACTION_DLG_2" id="bm_id3149879" localize="false"/><paragraph role="heading" id="hd_id3150128" xml-lang="en-US" level="2" l10n="U" oldref="13">Go to document</paragraph>
 <paragraph role="paragraph" id="par_id3153730" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_CTL_ACTION_DLG_2">Opens and displays a file during a slide show. If you select a $[officename] file as the target document, you can also specify the page that will open.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150018" xml-lang="en-US" level="2" l10n="U" oldref="14">Document</paragraph>
 <paragraph role="paragraph" id="par_id3155931" xml-lang="en-US" l10n="U" oldref="56">Define the location of the target document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:TP_ANIMATION:EDT_DOCUMENT" id="bm_id3148391" localize="false"/><paragraph role="heading" id="hd_id3155437" xml-lang="en-US" level="3" l10n="U" oldref="15">Document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:TP_ANIMATION:EDT_DOCUMENT" id="bm_id3148391" localize="false"/><paragraph role="heading" id="hd_id3155437" xml-lang="en-US" level="3" l10n="U" oldref="15">Document</paragraph>
 <paragraph role="paragraph" id="par_id3150566" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SD:EDIT:TP_ANIMATION:EDT_DOCUMENT">Enter a path to the file you want to open, or click <emph>Browse </emph>to locate the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:TP_ANIMATION:BTN_SEARCH" id="bm_id3151017" localize="false"/><paragraph role="heading" id="hd_id3150658" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:TP_ANIMATION:BTN_SEARCH" id="bm_id3151017" localize="false"/><paragraph role="heading" id="hd_id3150658" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3156061" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="SD:PUSHBUTTON:TP_ANIMATION:BTN_SEARCH">Locate the file you want to open.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148776" xml-lang="en-US" level="2" l10n="U" oldref="18">Play sound</paragraph>
 <paragraph role="paragraph" id="par_id3155816" xml-lang="en-US" l10n="U" oldref="60">Plays a sound file.</paragraph>
 <paragraph role="heading" id="hd_id3147539" xml-lang="en-US" level="2" l10n="U" oldref="19">Sound</paragraph>
 <paragraph role="paragraph" id="par_id3150467" xml-lang="en-US" l10n="U" oldref="61">Define the location of the sound file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:TP_ANIMATION:EDT_SOUND" id="bm_id3153925" localize="false"/><paragraph role="heading" id="hd_id3154869" xml-lang="en-US" level="3" l10n="U" oldref="20">Sound</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:TP_ANIMATION:EDT_SOUND" id="bm_id3153925" localize="false"/><paragraph role="heading" id="hd_id3154869" xml-lang="en-US" level="3" l10n="U" oldref="20">Sound</paragraph>
 <paragraph role="paragraph" id="par_id3155986" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SD:EDIT:TP_ANIMATION:EDT_SOUND">Enter a path to the sound file you want to open, or click <emph>Browse </emph>to locate the file.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155401" xml-lang="en-US" level="3" l10n="U" oldref="21">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3147171" xml-lang="en-US" l10n="U" oldref="63">Locate the sound file you want to play.</paragraph>
@@ -99,14 +96,14 @@
 <paragraph role="heading" id="hd_id3154260" xml-lang="en-US" level="2" l10n="U" oldref="35">Run program</paragraph>
 <paragraph role="paragraph" id="par_id3155357" xml-lang="en-US" l10n="U" oldref="79">Starts a program during a slide show.</paragraph>
 <paragraph role="heading" id="hd_id3149157" xml-lang="en-US" level="2" l10n="U" oldref="36">Program</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_TP_ANIMATION_EDT_PROGRAM" id="bm_id3148911" localize="false"/><paragraph role="heading" id="hd_id3154277" xml-lang="en-US" level="3" l10n="U" oldref="37">Program</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:TP_ANIMATION:EDT_PROGRAM" id="bm_id3148911" localize="false"/><paragraph role="heading" id="hd_id3154277" xml-lang="en-US" level="3" l10n="U" oldref="37">Program</paragraph>
 <paragraph role="paragraph" id="par_id3148918" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="SD_EDIT_TP_ANIMATION_EDT_PROGRAM">Enter a path to the program you want to start, or click <emph>Browse </emph>to locate the program.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="3" l10n="U" oldref="38">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3154097" xml-lang="en-US" l10n="U" oldref="82">Locate the program you want to start.</paragraph>
 <paragraph role="heading" id="hd_id3152940" xml-lang="en-US" level="2" l10n="U" oldref="39">Run macro</paragraph>
 <paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="83">Runs a macro during the slide show.</paragraph>
 <paragraph role="heading" id="hd_id3149916" xml-lang="en-US" level="2" l10n="U" oldref="40">Macro</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_TP_ANIMATION_EDT_MACRO" id="bm_id3148618" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="41">Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:TP_ANIMATION:EDT_MACRO" id="bm_id3148618" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="41">Macro</paragraph>
 <paragraph role="paragraph" id="par_id3148625" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SD_EDIT_TP_ANIMATION_EDT_MACRO">Enter a path to the macro you want to run, or click <emph>Browse </emph>to locate the macro.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150628" xml-lang="en-US" level="3" l10n="U" oldref="42">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3148417" xml-lang="en-US" l10n="U" oldref="86">Locate the macro you want to run.</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/06080000.xhp b/helpcontent2/source/text/simpress/01/06080000.xhp
index a284143e74..b760741ccb 100644
--- a/helpcontent2/source/text/simpress/01/06080000.xhp
+++ b/helpcontent2/source/text/simpress/01/06080000.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0106080000xml" indexer="include" status="PUBLISH">
@@ -60,57 +57,57 @@
 </section>
 <paragraph role="heading" id="hd_id3150213" xml-lang="en-US" level="2" l10n="U" oldref="3">Range</paragraph>
 <paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="4">Specifies which slides to include in the slide show.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_ALL" id="bm_id3146965" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL" id="bm_id3146965" localize="false"/>
 <paragraph role="heading" id="hd_id3145363" xml-lang="en-US" level="3" l10n="U" oldref="5">All slides</paragraph>
 <paragraph role="paragraph" id="par_id3145114" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_ALL">Includes all of the slides in your slide show.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AT_DIA" id="bm_id3153959" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_START_PRESENTATION:LB_DIAS" id="bm_id3153958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA" id="bm_id3153959" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_START_PRESENTATION:LB_DIAS" id="bm_id3153958" localize="false"/>
 <paragraph role="heading" id="hd_id3150431" xml-lang="en-US" level="3" l10n="U" oldref="7">From:</paragraph>
 <paragraph role="paragraph" id="par_id3150391" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:LISTBOX:DLG_START_PRESENTATION:LB_DIAS">Enter the number of the start slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_CUSTOMSHOW" id="bm_id3145235" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_START_PRESENTATION:LB_CUSTOMSHOW" id="bm_id3145239" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW" id="bm_id3145235" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW" id="bm_id3145239" localize="false"/>
 <paragraph role="heading" id="hd_id3147404" xml-lang="en-US" level="3" l10n="U" oldref="86">Custom Slide Show</paragraph>
 <paragraph role="paragraph" id="par_id3150538" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SD:LISTBOX:DLG_START_PRESENTATION:LB_CUSTOMSHOW">Runs a custom slide show in the order that you defined in <link href="text/simpress/01/06100000.xhp" name="Slide Show - Custom Slide Show"><emph>Slide Show - Custom Slide Show</emph></link>.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150653" xml-lang="en-US" level="2" l10n="U" oldref="88">Type</paragraph>
 <paragraph role="paragraph" id="par_id3149354" xml-lang="en-US" l10n="U" oldref="93">Select the slide show type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_STANDARD" id="bm_id3148725" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD" id="bm_id3148725" localize="false"/>
 <paragraph role="heading" id="hd_id3150482" xml-lang="en-US" level="3" l10n="U" oldref="89">Default</paragraph>
 <paragraph role="paragraph" id="par_id3148730" xml-lang="en-US" l10n="U" oldref="94"><ahelp hid="SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_STANDARD">A full screen slide is shown.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_WINDOW" id="bm_id3154558" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW" id="bm_id3154558" localize="false"/>
 <paragraph role="heading" id="hd_id3153034" xml-lang="en-US" level="3" l10n="U" oldref="90">Window</paragraph>
 <paragraph role="paragraph" id="par_id3155257" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_WINDOW">Slide show runs in the $[officename] program window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AUTO" id="bm_id3153085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO" id="bm_id3153085" localize="false"/>
 <paragraph role="heading" id="hd_id3145593" xml-lang="en-US" level="3" l10n="U" oldref="91">Auto</paragraph>
 <paragraph role="paragraph" id="par_id3149509" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AUTO">Restarts the slide show after the pause interval you specify. A pause slide is displayed between the final slide and the start slide. Press the Esc key to stop the show.</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_START_PRESENTATION:TMF_PAUSE" id="bm_id3153006" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE" id="bm_id3153006" localize="false"/>
 <paragraph role="heading" id="hd_id3150862" xml-lang="en-US" level="3" l10n="U" oldref="96">Duration of pause</paragraph>
 <paragraph role="paragraph" id="par_id3153112" xml-lang="en-US" l10n="U" oldref="97"><ahelp hid="SD:TIMEFIELD:DLG_START_PRESENTATION:TMF_PAUSE">Enter the duration of the pause before the slide show is repeated. If you enter zero, the show restarts immediately without showing a pause slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_AUTOLOGO" id="bm_id3153566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO" id="bm_id3153566" localize="false"/>
 <paragraph role="heading" id="hd_id3166420" xml-lang="en-US" level="3" l10n="U" oldref="92">Show logo</paragraph>
 <paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="98"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_AUTOLOGO">Displays the $[officename] logo on the pause slide.</ahelp> The logo cannot be exchanged.</paragraph>
 <paragraph role="heading" id="hd_id3150130" xml-lang="en-US" level="2" l10n="U" oldref="9">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MANUEL" id="bm_id3147367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL" id="bm_id3147367" localize="false"/>
 <paragraph role="heading" id="hd_id3149883" xml-lang="en-US" level="3" l10n="U" oldref="13">Change slides manually</paragraph>
 <paragraph role="paragraph" id="par_id3147373" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MANUEL">Slides never change automatically when this box is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MOUSEPOINTER" id="bm_id3150266" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER" id="bm_id3150266" localize="false"/>
 <paragraph role="heading" id="hd_id3155439" xml-lang="en-US" level="3" l10n="U" oldref="15">Mouse pointer visible</paragraph>
 <paragraph role="paragraph" id="par_id3150272" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MOUSEPOINTER">Shows the mouse pointer during a slide show.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_PEN" id="bm_id3150659" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN" id="bm_id3150659" localize="false"/>
 <paragraph role="heading" id="hd_id3150570" xml-lang="en-US" level="3" l10n="U" oldref="17">Mouse pointer as pen</paragraph>
 <paragraph role="paragraph" id="par_id3150665" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_PEN">Changes the mouse pointer to a pen which you can use to draw on slides during the presentation.</ahelp></paragraph>
 <paragraph role="note" id="par_id3150475" xml-lang="en-US" l10n="U" oldref="19">Anything you write with the pen is not saved when you exit the slide show. The color of the pen cannot be changed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_NAVIGATOR" id="bm_id3148425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR" id="bm_id3148425" localize="false"/>
 <paragraph role="heading" id="hd_id3153927" xml-lang="en-US" level="3" l10n="U" oldref="20">Navigator visible</paragraph>
 <paragraph role="paragraph" id="par_id3148430" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_NAVIGATOR">Displays the <link href="text/simpress/01/02110000.xhp" name="Navigator">Navigator</link> during the slide show.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED" id="bm_id3147171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED" id="bm_id3147171" localize="false"/>
 <paragraph role="heading" id="hd_id3153718" xml-lang="en-US" level="3" l10n="U" oldref="84">Animations allowed</paragraph>
 <paragraph role="paragraph" id="par_id3083445" xml-lang="en-US" l10n="CHG" oldref="85"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED">Displays all frames of animated GIF files during the slide show.</ahelp> If this option is not selected, only the first frame of an animated GIF file is displayed.<comment>see #i63884</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE" id="bm_id3149713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE" id="bm_id3149713" localize="false"/>
 <paragraph role="heading" id="hd_id3152478" xml-lang="en-US" level="3" l10n="U" oldref="22">Change slides by clicking on background</paragraph>
 <paragraph role="paragraph" id="par_id3156305" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE">Advances to the next slide when you click on the background of a slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP" id="bm_id3150758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP" id="bm_id3150758" localize="false"/>
 <paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="3" l10n="U" oldref="24">Presentation always on top</paragraph>
-<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP">The $[officename] window remains on top during the presentation. No other program will show its window in front of your presentation.</ahelp></paragraph><comment>see http://qa.openoffice.org/issues/show_bug.cgi?id=12719</comment>
+<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP">The $[officename] window remains on top during the presentation. No other program will show its window in front of your presentation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6086611" xml-lang="en-US" level="2" l10n="NEW">Multiple Monitors</paragraph>
 <paragraph role="paragraph" id="par_id5446943" xml-lang="en-US" l10n="NEW">By default the primary monitor is used for slide show mode. If the current desktop is displayed on more than one monitor, you can select which monitor to use for full screen slide show mode. If the current desktop spans only one monitor, or if the multi monitor feature is not supported on the current system, you cannot select another monitor.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDESHOW_DISPLAY" id="bm_id6976836" localize="false"/>
diff --git a/helpcontent2/source/text/simpress/01/06100000.xhp b/helpcontent2/source/text/simpress/01/06100000.xhp
index 6c85c2ff73..befa3090cb 100644
--- a/helpcontent2/source/text/simpress/01/06100000.xhp
+++ b/helpcontent2/source/text/simpress/01/06100000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,11 +47,11 @@
 <embed href="text/simpress/00/00000407.xhp#indipra"/>
 </section>
 <embed href="text/simpress/guide/individual.xhp#individual"/>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS" id="bm_id3146980" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS" id="bm_id3146980" localize="false"/>
 <paragraph role="heading" id="hd_id3155530" xml-lang="en-US" level="2" l10n="U" oldref="3">Name of the presentation(s)</paragraph>
 <paragraph role="paragraph" id="par_id3156449" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS">Lists the custom slide shows that are available.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="U" oldref="5">To create a custom slide show, click <emph>New</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW" id="bm_id3148870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW" id="bm_id3148870" localize="false"/>
 <paragraph role="heading" id="hd_id3152899" xml-lang="en-US" level="2" l10n="U" oldref="9">Use Custom Slide Show</paragraph>
 <paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW">Runs the custom slide show you selected when you click <emph>Start</emph>. Otherwise, the entire presentation is shown.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148604" xml-lang="en-US" level="3" l10n="U" oldref="6">To run a custom slide show:</paragraph>
@@ -66,17 +63,17 @@
 <paragraph role="listitem" id="par_id3159230" xml-lang="en-US" l10n="U" oldref="8">Click <emph>Start</emph>.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_NEW" id="bm_id3153013" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW" id="bm_id3153013" localize="false"/>
 <paragraph role="heading" id="hd_id3153808" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/simpress/01/06100100.xhp" name="New">New</link></paragraph>
 <embed href="text/simpress/01/06100100.xhp#neu"/>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT" id="bm_id3147244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT" id="bm_id3147244" localize="false"/>
 <paragraph role="heading" id="hd_id3153073" xml-lang="en-US" level="2" l10n="U" oldref="12">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT"><link href="text/simpress/01/06100100.xhp" name="Add, remove or reorder">Add, remove or reorder</link> slides as well as change the name of the selected custom slide show.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY" id="bm_id3147404" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY" id="bm_id3147404" localize="false"/>
 <paragraph role="heading" id="hd_id3151393" xml-lang="en-US" level="2" l10n="U" oldref="14">Copy</paragraph>
 <paragraph role="paragraph" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY">Creates a copy of the selected custom slide show. You can modify the name of the show by clicking <emph>Edit</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW" id="bm_id3157900" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW" id="bm_id3157900" localize="false"/>
 <paragraph role="heading" id="hd_id3153121" xml-lang="en-US" level="2" l10n="U" oldref="16">Start</paragraph>
 <paragraph role="paragraph" id="par_id3157907" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW">Runs the slide show. Ensure that <emph>Use Custom Slide Show</emph> is selected if you want to run a custom presentation.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen"/>
diff --git a/helpcontent2/source/text/simpress/01/06100100.xhp b/helpcontent2/source/text/simpress/01/06100100.xhp
index cecf8be8e9..e07520dd57 100755
--- a/helpcontent2/source/text/simpress/01/06100100.xhp
+++ b/helpcontent2/source/text/simpress/01/06100100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06100100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,11 +47,11 @@
 </section>
   <embed href="text/simpress/guide/individual.xhp#individual"/>
   <paragraph xml-lang="en-US" oldref="3" role="paragraph" id="par_id3155379" l10n="U">Select a slide and click <emph>&gt;&gt;</emph> or <emph>&lt;&lt;</emph> to add or remove the slide from the list.</paragraph>
-  <bookmark branch="hid/SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_ADD" xml-lang="en-US" id="bm_id3148704"/><paragraph l10n="U" role="paragraph" id="par_id3156449" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_ADD">Adds an existing slide to the bottom of the <emph>Selected slides</emph> list. You need to select a slide in the <emph>Existing slides</emph> list before you can use this button.</ahelp></paragraph>
-  <bookmark branch="hid/SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE" xml-lang="en-US" id="bm_id3148868"/><paragraph l10n="U" role="paragraph" id="par_id3151240" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE">Removes a slide from the <emph>Selected slides </emph>list. You need to choose a slide in the <emph>Selected slides </emph>list before you can use this button.</ahelp></paragraph>
-  <bookmark branch="hid/SD_EDIT_DLG_DEFINE_CUSTOMSHOW_EDT_NAME" xml-lang="en-US" id="bm_id3159204"/><paragraph role="heading" level="2" id="hd_id3156018" l10n="U" xml-lang="en-US" oldref="6">Name</paragraph>
+  <bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" xml-lang="en-US" id="bm_id3148704"/><paragraph l10n="U" role="paragraph" id="par_id3156449" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_ADD">Adds an existing slide to the bottom of the <emph>Selected slides</emph> list. You need to select a slide in the <emph>Existing slides</emph> list before you can use this button.</ahelp></paragraph>
+  <bookmark branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE" xml-lang="en-US" id="bm_id3148868"/><paragraph l10n="U" role="paragraph" id="par_id3151240" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_DEFINE_CUSTOMSHOW_BTN_REMOVE">Removes a slide from the <emph>Selected slides </emph>list. You need to choose a slide in the <emph>Selected slides </emph>list before you can use this button.</ahelp></paragraph>
+  <bookmark branch="hid/sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME" xml-lang="en-US" id="bm_id3159204"/><paragraph role="heading" level="2" id="hd_id3156018" l10n="U" xml-lang="en-US" oldref="6">Name</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3152871" xml-lang="en-US" oldref="7"><ahelp hid="SD_EDIT_DLG_DEFINE_CUSTOMSHOW_EDT_NAME" visibility="visible">Displays the name of the custom slide show. If you want, you can enter a new name.</ahelp></paragraph>
-  <bookmark branch="hid/SD_MULTILISTBOX_DLG_DEFINE_CUSTOMSHOW_LB_PAGES" xml-lang="en-US" id="bm_id3154762"/><paragraph role="heading" level="2" id="hd_id3149050" l10n="U" xml-lang="en-US" oldref="8">Existing slides</paragraph>
+  <bookmark branch="hid/sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES" xml-lang="en-US" id="bm_id3154762"/><paragraph role="heading" level="2" id="hd_id3149050" l10n="U" xml-lang="en-US" oldref="8">Existing slides</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154767" xml-lang="en-US" oldref="9"><ahelp hid="SD_MULTILISTBOX_DLG_DEFINE_CUSTOMSHOW_LB_PAGES" visibility="visible">Lists all of the slides in the order in which they appear in the current document.</ahelp></paragraph>
   <bookmark branch="hid/HID_DLG_DEFINE_CUSTOMSHOW_CTL" xml-lang="en-US" id="bm_id3145118"/><paragraph role="heading" level="2" id="hd_id3146965" l10n="U" xml-lang="en-US" oldref="10">Selected slides</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149874" xml-lang="en-US" oldref="11"><ahelp hid="HID_DLG_DEFINE_CUSTOMSHOW_CTL" visibility="visible">Lists all of the slides in the custom slide show. If you want, you can change the order of the list by dragging the slides up or down.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/simpress/01/13050000.xhp b/helpcontent2/source/text/simpress/01/13050000.xhp
index 95a007b937..0642447887 100755
--- a/helpcontent2/source/text/simpress/01/13050000.xhp
+++ b/helpcontent2/source/text/simpress/01/13050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050100.xhp b/helpcontent2/source/text/simpress/01/13050100.xhp
index d1875eca24..23df8ed188 100644
--- a/helpcontent2/source/text/simpress/01/13050100.xhp
+++ b/helpcontent2/source/text/simpress/01/13050100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050200.xhp b/helpcontent2/source/text/simpress/01/13050200.xhp
index f4fa563bf9..974d1d4e04 100644
--- a/helpcontent2/source/text/simpress/01/13050200.xhp
+++ b/helpcontent2/source/text/simpress/01/13050200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
 <paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="U" oldref="5">The following options are required to convert a bitmap image to a polygon. The converted image is actually a collection of smaller polygons filled with color.</paragraph>
 <paragraph role="heading" id="hd_id3154254" xml-lang="en-US" level="2" l10n="U" oldref="6">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="7">Set the conversion options for the image.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:NUMERICFIELD:DLG_VECTORIZE:NM_LAYERS" id="bm_id3150202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:NumericField:DLG_VECTORIZE:NM_LAYERS" id="bm_id3150202" localize="false"/>
 <paragraph role="heading" id="hd_id3146314" xml-lang="en-US" level="3" l10n="U" oldref="8">Number of colors:</paragraph>
 <paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:NUMERICFIELD:DLG_VECTORIZE:NM_LAYERS">Enter the number of colors to be displayed in the converted image. $[officename] generates a polygon for each occurrence of a color in the image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_VECTORIZE:MT_REDUCE" id="bm_id3154658" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_VECTORIZE:MT_REDUCE" id="bm_id3154658" localize="false"/>
 <paragraph role="heading" id="hd_id3150206" xml-lang="en-US" level="3" l10n="U" oldref="10">Point reduction</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:METRICFIELD:DLG_VECTORIZE:MT_REDUCE">Removes color polygons that are smaller than the pixel value you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_VECTORIZE:CB_FILLHOLES" id="bm_id3166432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES" id="bm_id3166432" localize="false"/>
 <paragraph role="heading" id="hd_id3150364" xml-lang="en-US" level="3" l10n="U" oldref="12">Fill holes</paragraph>
 <paragraph role="paragraph" id="par_id3145584" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD:CHECKBOX:DLG_VECTORIZE:CB_FILLHOLES">Fills the color gaps caused by applying a point reduction.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_VECTORIZE:MT_FILLHOLES" id="bm_id3152986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES" id="bm_id3152986" localize="false"/>
 <paragraph role="heading" id="hd_id3154371" xml-lang="en-US" level="3" l10n="U" oldref="14">Tile size</paragraph>
 <paragraph role="paragraph" id="par_id3156448" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD:METRICFIELD:DLG_VECTORIZE:MT_FILLHOLES">Enter the size of the rectangle for the background fill.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148840" xml-lang="en-US" level="3" l10n="U" oldref="16">Source picture:</paragraph>
@@ -75,7 +72,7 @@
 <paragraph role="paragraph" id="par_id3148605" xml-lang="en-US" l10n="U" oldref="19">Preview of the converted image. Click <emph>Preview</emph> to generate the vectorized image.</paragraph>
 <paragraph role="heading" id="hd_id3156020" xml-lang="en-US" level="3" l10n="U" oldref="20">Progress</paragraph>
 <paragraph role="paragraph" id="par_id3159207" xml-lang="en-US" l10n="U" oldref="21">Displays the conversion progress.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_VECTORIZE:BTN_PREVIEW" id="bm_id3154762" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW" id="bm_id3154762" localize="false"/>
 <paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="3" l10n="U" oldref="22">Preview</paragraph>
 <paragraph role="paragraph" id="par_id3150046" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SD:PUSHBUTTON:DLG_VECTORIZE:BTN_PREVIEW">Previews the converted image without applying the changes.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/13050300.xhp b/helpcontent2/source/text/simpress/01/13050300.xhp
index 0b2cb00275..1e599b271c 100644
--- a/helpcontent2/source/text/simpress/01/13050300.xhp
+++ b/helpcontent2/source/text/simpress/01/13050300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050400.xhp b/helpcontent2/source/text/simpress/01/13050400.xhp
index 46b759203d..6449566f79 100644
--- a/helpcontent2/source/text/simpress/01/13050400.xhp
+++ b/helpcontent2/source/text/simpress/01/13050400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050500.xhp b/helpcontent2/source/text/simpress/01/13050500.xhp
index bce9e0ff50..9bf91c9875 100644
--- a/helpcontent2/source/text/simpress/01/13050500.xhp
+++ b/helpcontent2/source/text/simpress/01/13050500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050500.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050600.xhp b/helpcontent2/source/text/simpress/01/13050600.xhp
index 12fe306758..754c56bd4b 100644
--- a/helpcontent2/source/text/simpress/01/13050600.xhp
+++ b/helpcontent2/source/text/simpress/01/13050600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13050700.xhp b/helpcontent2/source/text/simpress/01/13050700.xhp
index 3cc6aeb262..bfab3fb28e 100644
--- a/helpcontent2/source/text/simpress/01/13050700.xhp
+++ b/helpcontent2/source/text/simpress/01/13050700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13140000.xhp b/helpcontent2/source/text/simpress/01/13140000.xhp
index 3299dabbc1..4306a4bf7b 100644
--- a/helpcontent2/source/text/simpress/01/13140000.xhp
+++ b/helpcontent2/source/text/simpress/01/13140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13140000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13150000.xhp b/helpcontent2/source/text/simpress/01/13150000.xhp
index 25600007a8..0946ad07d0 100644
--- a/helpcontent2/source/text/simpress/01/13150000.xhp
+++ b/helpcontent2/source/text/simpress/01/13150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13150000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13160000.xhp b/helpcontent2/source/text/simpress/01/13160000.xhp
index 2d7733bb3d..c7f2583692 100644
--- a/helpcontent2/source/text/simpress/01/13160000.xhp
+++ b/helpcontent2/source/text/simpress/01/13160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13160000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13170000.xhp b/helpcontent2/source/text/simpress/01/13170000.xhp
index 572ff8cc28..add0eda028 100644
--- a/helpcontent2/source/text/simpress/01/13170000.xhp
+++ b/helpcontent2/source/text/simpress/01/13170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13170000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13180000.xhp b/helpcontent2/source/text/simpress/01/13180000.xhp
index 24c65af4d8..15cebe5fa0 100755
--- a/helpcontent2/source/text/simpress/01/13180000.xhp
+++ b/helpcontent2/source/text/simpress/01/13180000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13180000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13180100.xhp b/helpcontent2/source/text/simpress/01/13180100.xhp
index 0f48b21c78..0d52434726 100644
--- a/helpcontent2/source/text/simpress/01/13180100.xhp
+++ b/helpcontent2/source/text/simpress/01/13180100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13180100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13180200.xhp b/helpcontent2/source/text/simpress/01/13180200.xhp
index 4c1909b388..704525b15f 100644
--- a/helpcontent2/source/text/simpress/01/13180200.xhp
+++ b/helpcontent2/source/text/simpress/01/13180200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13180200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/13180300.xhp b/helpcontent2/source/text/simpress/01/13180300.xhp
index a443955438..ed514327d2 100644
--- a/helpcontent2/source/text/simpress/01/13180300.xhp
+++ b/helpcontent2/source/text/simpress/01/13180300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13180300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/animationeffect.xhp b/helpcontent2/source/text/simpress/01/animationeffect.xhp
index c9b657ee26..442d5206b4 100644
--- a/helpcontent2/source/text/simpress/01/animationeffect.xhp
+++ b/helpcontent2/source/text/simpress/01/animationeffect.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationeffect.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/878874113" id="bm_id5167699" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_RID_TP_CUSTOMANIMATION_ENTRANCE_LB_EFFECTS" id="bm_id5167699" localize="false"/>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW">Custom Animation</paragraph>
 <paragraph role="paragraph" id="par_idN105C7" xml-lang="en-US" l10n="NEW"><ahelp hid="878874113" visibility="hidden">Select an effect and click OK to assign it.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW">Adds a new animation effect to the object selected in the slide, or changes the animation of the selected element in the <link href="text/simpress/01/06060000.xhp">Custom Animations Pane</link>.</paragraph>
@@ -56,10 +53,10 @@
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW">Select an exiting effect from the effect categories.</paragraph>
 <paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="2" l10n="NEW">Motion Paths</paragraph>
 <paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="NEW">Select a motion path from the motion path categories.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ComboBox_RID_TP_CUSTOMANIMATION_ENTRANCE_CB_SPEED" id="bm_id2424390" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED" id="bm_id2424390" localize="false"/>
 <paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3" l10n="NEW">Speed</paragraph>
 <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid="878874627">Specifies the speed or duration of the selected animation effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_CheckBox_RID_TP_CUSTOMANIMATION_ENTRANCE_CBX_PREVIEW" id="bm_id1790215" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW" id="bm_id1790215" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="3" l10n="NEW">Automatic preview</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid="878871556">Select to preview new or edited effects on the slide.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/effectoptions.xhp b/helpcontent2/source/text/simpress/01/effectoptions.xhp
index 71ddf1daee..54a178fd46 100644
--- a/helpcontent2/source/text/simpress/01/effectoptions.xhp
+++ b/helpcontent2/source/text/simpress/01/effectoptions.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: effectoptions.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/effectoptionseffect.xhp b/helpcontent2/source/text/simpress/01/effectoptionseffect.xhp
index b0c177a420..72376576a7 100644
--- a/helpcontent2/source/text/simpress/01/effectoptionseffect.xhp
+++ b/helpcontent2/source/text/simpress/01/effectoptionseffect.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: effectoptionseffect.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,13 +47,13 @@
 <paragraph role="paragraph" id="par_idN106B5" xml-lang="en-US" l10n="NEW">For some effects, the settings can be specified on the <emph>Effect</emph> tab page.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX" id="bm_id3438825" localize="false"/><paragraph role="heading" id="hd_id950041" xml-lang="en-US" level="3" l10n="NEW">Direction</paragraph>
 <paragraph role="paragraph" id="par_id2195196" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the direction for the effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_START" id="bm_id9050263" localize="false"/><paragraph role="heading" id="hd_id8484756" xml-lang="en-US" level="4" l10n="NEW">Accelerated start</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_START" id="bm_id9050263" localize="false"/><paragraph role="heading" id="hd_id8484756" xml-lang="en-US" level="4" l10n="NEW">Accelerated start</paragraph>
 <paragraph role="paragraph" id="par_id5049287" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to assign a gradually increasing speed to the start of the effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_END" id="bm_id4501785" localize="false"/><paragraph role="heading" id="hd_id7056794" xml-lang="en-US" level="4" l10n="NEW">Decelerated end</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_END" id="bm_id4501785" localize="false"/><paragraph role="heading" id="hd_id7056794" xml-lang="en-US" level="4" l10n="NEW">Decelerated end</paragraph>
 <paragraph role="paragraph" id="par_id1145359" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to assign a gradually decreasing speed to the end of the effect.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10707" xml-lang="en-US" level="2" l10n="NEW">Enhancements</paragraph>
 <paragraph role="paragraph" id="par_idN1070B" xml-lang="en-US" l10n="NEW">Specifies the enhancements for the current effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_EFFECT_LB_SOUND" id="bm_id1584215" localize="false"/><paragraph role="heading" id="par_idN1070E" xml-lang="en-US" level="3" l10n="NEW">Sound</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND" id="bm_id1584215" localize="false"/><paragraph role="heading" id="par_idN1070E" xml-lang="en-US" level="3" l10n="NEW">Sound</paragraph>
 <paragraph role="paragraph" id="par_idN10712" xml-lang="en-US" l10n="NEW"><ahelp hid="878824971">Select a sound from the Gallery or select one of the special entries.</ahelp></paragraph>
 <list type="unordered">
 <listitem>
@@ -72,10 +69,10 @@
 <emph>Other sound</emph> - displays a file open dialog to select a sound file.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_PushButton_RID_TP_CUSTOMANIMATION_EFFECT_PB_SOUND_PREVIEW" id="bm_id2927640" localize="false"/><paragraph role="heading" id="par_idN1072C" xml-lang="en-US" level="3" l10n="NEW">Sound button</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW" id="bm_id2927640" localize="false"/><paragraph role="heading" id="par_idN1072C" xml-lang="en-US" level="3" l10n="NEW">Sound button</paragraph>
 <paragraph role="paragraph" id="par_idN10730" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Plays the selected sound file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/878824973" id="bm_id4091921" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_EFFECT_LB_AFTER_EFFECT" id="bm_id6066164" localize="false"/><paragraph role="heading" id="par_idN10733" xml-lang="en-US" level="3" l10n="NEW">After animation</paragraph>
+<!-- removed HID 878824973 -->
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT" id="bm_id6066164" localize="false"/><paragraph role="heading" id="par_idN10733" xml-lang="en-US" level="3" l10n="NEW">After animation</paragraph>
 <paragraph role="paragraph" id="par_idN10737" xml-lang="en-US" l10n="NEW"><ahelp hid="878824973">Select a color to be shown after the animation ends, or select another after-effect from the list</ahelp>:</paragraph>
 <list type="unordered">
 <listitem>
@@ -95,9 +92,9 @@
 <emph>Hide on next animation</emph> - hides the shape on the next animation.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_EFFECT_CLB_DIMCOLOR" id="bm_id5983153" localize="false"/><paragraph role="heading" id="par_idN10865" xml-lang="en-US" level="3" l10n="NEW">Dim color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR" id="bm_id5983153" localize="false"/><paragraph role="heading" id="par_idN10865" xml-lang="en-US" level="3" l10n="NEW">Dim color</paragraph>
 <paragraph role="paragraph" id="par_idN1087B" xml-lang="en-US" l10n="NEW"><ahelp hid="878824975">Select the dim color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_EFFECT_LB_TEXT_ANIM" id="bm_id2982879" localize="false"/><paragraph role="heading" id="par_idN10758" xml-lang="en-US" level="3" l10n="NEW">Text animation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM" id="bm_id2982879" localize="false"/><paragraph role="heading" id="par_idN10758" xml-lang="en-US" level="3" l10n="NEW">Text animation</paragraph>
 <paragraph role="paragraph" id="par_idN1075C" xml-lang="en-US" l10n="NEW"><ahelp hid="878824977">Select the animation mode for the text of the current shape</ahelp>:</paragraph>
 <list type="unordered">
 <listitem>
@@ -113,7 +110,7 @@
 <emph>Letter by letter</emph> - animates the text letter by letter.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_MetricField_RID_TP_CUSTOMANIMATION_EFFECT_MF_TEXT_DELAY" id="bm_id2306588" localize="false"/><paragraph role="heading" id="par_idN10776" xml-lang="en-US" level="4" l10n="NEW">Delay between characters</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY" id="bm_id2306588" localize="false"/><paragraph role="heading" id="par_idN10776" xml-lang="en-US" level="4" l10n="NEW">Delay between characters</paragraph>
 <paragraph role="paragraph" id="par_idN1077A" xml-lang="en-US" l10n="NEW"><ahelp hid="878828050">Specifies the percentage of delay between animations of words or letters.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/effectoptionstext.xhp b/helpcontent2/source/text/simpress/01/effectoptionstext.xhp
index 563ce5bbcb..17676a5275 100644
--- a/helpcontent2/source/text/simpress/01/effectoptionstext.xhp
+++ b/helpcontent2/source/text/simpress/01/effectoptionstext.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: effectoptionstext.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 <paragraph role="heading" id="par_idN105AE" xml-lang="en-US" level="1" l10n="NEW"><variable id="text"><link href="text/simpress/01/effectoptionstext.xhp">Text Animation</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW">Specifies the text animation settings for the current effect in the <link href="text/simpress/01/effectoptions.xhp">Effect Options</link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_TEXT_LB_GROUP_TEXT" id="bm_id5857112" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT" id="bm_id5857112" localize="false"/>
 <paragraph role="heading" id="par_idN105DD" xml-lang="en-US" level="2" l10n="NEW">Group text</paragraph>
 <paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="NEW"><ahelp hid="878857730">Specifies how multiple paragraphs are animated</ahelp>:</paragraph>
 <list type="unordered">
@@ -63,15 +60,15 @@
 <emph>By 1st level paragraphs</emph> - the first level paragraphs, including sub-level paragraphs, are animated one after another.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_Checkbox_RID_TP_CUSTOMANIMATION_TEXT_CBX_GROUP_AUTO" id="bm_id2183294" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO" id="bm_id2183294" localize="false"/>
 <paragraph role="heading" id="par_idN105FB" xml-lang="en-US" level="3" l10n="NEW">Automatically after</paragraph>
 <paragraph role="paragraph" id="par_idN105FF" xml-lang="en-US" l10n="NEW"><ahelp hid="878855171">If "Group text - By 1st level paragraphs" is selected, the paragraphs are animated one after the other.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_MetricField_RID_TP_CUSTOMANIMATION_TEXT_MF_GROUP_AUTO" id="bm_id7408368" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO" id="bm_id7408368" localize="false"/>
 <paragraph role="paragraph" id="par_idN1067F" xml-lang="en-US" l10n="NEW"><ahelp hid="878860804">Enter an additional delay in seconds to animate subsequent paragraphs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_Checkbox_RID_TP_CUSTOMANIMATION_TEXT_CBX_ANIMATE_FORM" id="bm_id5005035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM" id="bm_id5005035" localize="false"/>
 <paragraph role="heading" id="par_idN10602" xml-lang="en-US" level="3" l10n="NEW">Animate attached shape</paragraph>
 <paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="878855173">Deselect this box to animate only the text, not the shape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_Checkbox_RID_TP_CUSTOMANIMATION_TEXT_CBX_REVERSE" id="bm_id7387005" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE" id="bm_id7387005" localize="false"/>
 <paragraph role="heading" id="par_idN10609" xml-lang="en-US" level="3" l10n="NEW">In reverse order</paragraph>
 <paragraph role="paragraph" id="par_idN1060D" xml-lang="en-US" l10n="NEW"><ahelp hid="878855174">Animates the paragraphs in reverse order.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/simpress/01/effectoptionstiming.xhp b/helpcontent2/source/text/simpress/01/effectoptionstiming.xhp
index 7384e61d81..4fdc9ebc22 100644
--- a/helpcontent2/source/text/simpress/01/effectoptionstiming.xhp
+++ b/helpcontent2/source/text/simpress/01/effectoptionstiming.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: effectoptionstiming.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><variable id="timing"><link href="text/simpress/01/effectoptionstiming.xhp">Timing</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW">Specifies the timing for the current effect in the <link href="text/simpress/01/effectoptions.xhp">Effect Options</link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_DURATION_LB_START" id="bm_id1604358" localize="false"/><paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Start</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START" id="bm_id1604358" localize="false"/><paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Start</paragraph>
 <paragraph role="paragraph" id="par_idN1066F" xml-lang="en-US" l10n="NEW"><ahelp hid="878841346">Displays the start property of the selected animation effect.</ahelp> The following start properties are available:</paragraph>
 <list type="unordered">
 <listitem>
@@ -62,11 +59,11 @@
 <emph>After previous</emph> - the animation runs as soon as the previous animation ends.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_MetricField_RID_TP_CUSTOMANIMATION_DURATION_MF_START_DELAY" id="bm_id3206274" localize="false"/><paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2" l10n="NEW">Delay</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY" id="bm_id3206274" localize="false"/><paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2" l10n="NEW">Delay</paragraph>
 <paragraph role="paragraph" id="par_idN10693" xml-lang="en-US" l10n="NEW"><ahelp hid="878844420">Specifies an additional delay of n seconds until the effect starts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ComboBox_RID_TP_CUSTOMANIMATION_DURATION_CB_DURATION" id="bm_id5189977" localize="false"/><paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Speed</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION" id="bm_id5189977" localize="false"/><paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Speed</paragraph>
 <paragraph role="paragraph" id="par_idN106A0" xml-lang="en-US" l10n="NEW"><ahelp hid="878841862">Specifies the duration of the effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ComboBox_RID_TP_CUSTOMANIMATION_DURATION_CB_REPEAT" id="bm_id9711294" localize="false"/><paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Repeat</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT" id="bm_id9711294" localize="false"/><paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Repeat</paragraph>
 <paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="NEW"><ahelp hid="878841864">Specifies whether and how to repeat the current effect.</ahelp> Enter the number of repeats, or select from the list:</paragraph>
 <list type="unordered">
 <listitem>
@@ -82,12 +79,12 @@
 <emph>Until end of slide</emph> - the animation repeats as long as the slide is displayed.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/sd_CheckBox_RID_TP_CUSTOMANIMATION_DURATION_CBX_REWIND" id="bm_id8539689" localize="false"/><paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Rewind when done playing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND" id="bm_id8539689" localize="false"/><paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Rewind when done playing</paragraph>
 <paragraph role="paragraph" id="par_idN106D1" xml-lang="en-US" l10n="NEW"><ahelp hid="878838793">Specifies whether to let the animated shape return to its starting state after the animation ends.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_RID_TP_CUSTOMANIMATION_DURATION_RB_CLICKSEQUENCE" id="bm_id2061525" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2" l10n="NEW">Animate as part of click sequence</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE" id="bm_id2061525" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2" l10n="NEW">Animate as part of click sequence</paragraph>
 <paragraph role="paragraph" id="par_idN106DE" xml-lang="en-US" l10n="NEW"><ahelp hid="878838283">Specifies whether to let the animation start in the normal click sequence.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_RID_TP_CUSTOMANIMATION_DURATION_RB_INTERACTIVE" id="bm_id1462752" localize="false"/><paragraph role="heading" id="par_idN10597" xml-lang="en-US" level="2" l10n="NEW">Start effect on click of</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE" id="bm_id1462752" localize="false"/><paragraph role="heading" id="par_idN10597" xml-lang="en-US" level="2" l10n="NEW">Start effect on click of</paragraph>
 <paragraph role="paragraph" id="par_idN106EB" xml-lang="en-US" l10n="NEW"><ahelp hid="878838284">Specifies whether to let the animation start when a specified shape is clicked.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_RID_TP_CUSTOMANIMATION_DURATION_LB_TRIGGER" id="bm_id2343821" localize="false"/><paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US" l10n="NEW"><ahelp hid="878841357">Select the shape by its name from the list box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER" id="bm_id2343821" localize="false"/><paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US" l10n="NEW"><ahelp hid="878841357">Select the shape by its name from the list box.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/makefile.mk b/helpcontent2/source/text/simpress/01/makefile.mk
index 4b08f2a41a..4523a4bfd9 100644
--- a/helpcontent2/source/text/simpress/01/makefile.mk
+++ b/helpcontent2/source/text/simpress/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -145,4 +141,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/simpress/01/slidesorter.xhp b/helpcontent2/source/text/simpress/01/slidesorter.xhp
index 6b828cae25..bdb7c90406 100755
--- a/helpcontent2/source/text/simpress/01/slidesorter.xhp
+++ b/helpcontent2/source/text/simpress/01/slidesorter.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slidesorter.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/01/taskpanel.xhp b/helpcontent2/source/text/simpress/01/taskpanel.xhp
index 2550d2afbe..009573445b 100755
--- a/helpcontent2/source/text/simpress/01/taskpanel.xhp
+++ b/helpcontent2/source/text/simpress/01/taskpanel.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskpanel.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 <paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Master Pages tab page, where you apply a master page (background) to all slides (left-click) or to the selected slides (right-click).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_CURRENT_MASTERS" id="bm_id5079500" localize="false"/><comment>Used in this presentation</comment>
 <paragraph role="paragraph" id="par_idN1067D" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the currently used master pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/59907" id="bm_id4361705" localize="false"/><comment>Recently used</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_RECENT_MASTERS" id="bm_id4361705" localize="false"/><comment>Recently used</comment>
 <paragraph role="paragraph" id="par_idN106A8" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the recently used master pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_ALL_MASTERS" id="bm_id746177" localize="false"/><comment>Available for Use</comment>
 <paragraph role="paragraph" id="par_idN106D3" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists all available master pages.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/simpress/02/04010000.xhp b/helpcontent2/source/text/simpress/02/04010000.xhp
index 30676f3743..1f8217640f 100644
--- a/helpcontent2/source/text/simpress/02/04010000.xhp
+++ b/helpcontent2/source/text/simpress/02/04010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/04020000.xhp b/helpcontent2/source/text/simpress/02/04020000.xhp
index 3e923d75bd..cbde698589 100644
--- a/helpcontent2/source/text/simpress/02/04020000.xhp
+++ b/helpcontent2/source/text/simpress/02/04020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/04030000.xhp b/helpcontent2/source/text/simpress/02/04030000.xhp
index 43873989c8..a67092ec83 100755
--- a/helpcontent2/source/text/simpress/02/04030000.xhp
+++ b/helpcontent2/source/text/simpress/02/04030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/04040000.xhp b/helpcontent2/source/text/simpress/02/04040000.xhp
index 29baaaff65..832bc48e86 100755
--- a/helpcontent2/source/text/simpress/02/04040000.xhp
+++ b/helpcontent2/source/text/simpress/02/04040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/04060000.xhp b/helpcontent2/source/text/simpress/02/04060000.xhp
index 93fdab0870..4a00dc064b 100755
--- a/helpcontent2/source/text/simpress/02/04060000.xhp
+++ b/helpcontent2/source/text/simpress/02/04060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/04070000.xhp b/helpcontent2/source/text/simpress/02/04070000.xhp
index 25e6ee36ff..bd87825954 100644
--- a/helpcontent2/source/text/simpress/02/04070000.xhp
+++ b/helpcontent2/source/text/simpress/02/04070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/08020000.xhp b/helpcontent2/source/text/simpress/02/08020000.xhp
index 9a23b6f41e..3ac189c32b 100644
--- a/helpcontent2/source/text/simpress/02/08020000.xhp
+++ b/helpcontent2/source/text/simpress/02/08020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,10 +34,6 @@
 <title id="tit" xml-lang="en-US">Current Size</title>
 <filename>/text/simpress/02/08020000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T09:25:51">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="aktuellegroesse">
@@ -49,6 +42,6 @@
 <paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/08020000.xhp" name="Current Size">Current Size</link></paragraph>
 <paragraph role="paragraph" id="par_id3154321" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Position">Displays the X and Y position of the cursor and the size of the selected object.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General"><emph>%PRODUCTNAME Impress - General</emph></link>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/02/08060000.xhp b/helpcontent2/source/text/simpress/02/08060000.xhp
index 95b5d978c9..7b68f6e026 100644
--- a/helpcontent2/source/text/simpress/02/08060000.xhp
+++ b/helpcontent2/source/text/simpress/02/08060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10020000.xhp b/helpcontent2/source/text/simpress/02/10020000.xhp
index c5e4411489..c73d733fb3 100644
--- a/helpcontent2/source/text/simpress/02/10020000.xhp
+++ b/helpcontent2/source/text/simpress/02/10020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10030000.xhp b/helpcontent2/source/text/simpress/02/10030000.xhp
index 0703484213..fde2db2d98 100644
--- a/helpcontent2/source/text/simpress/02/10030000.xhp
+++ b/helpcontent2/source/text/simpress/02/10030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10030000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10030200.xhp b/helpcontent2/source/text/simpress/02/10030200.xhp
index 5e7cc7a4f1..631cc8315e 100644
--- a/helpcontent2/source/text/simpress/02/10030200.xhp
+++ b/helpcontent2/source/text/simpress/02/10030200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10030200.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="E">
-<image id="img_id3150650" src="res/commandimagelist/sc_glueinsertpoint.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150650" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150650" src="res/commandimagelist/sc_glueinsertpoint.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150650" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -75,7 +72,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145165" xml-lang="en-US" l10n="E">
-<image id="img_id3153567" src="res/commandimagelist/sc_glueescapedirectionleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153567" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153567" src="res/commandimagelist/sc_glueescapedirectionleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153567" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -92,7 +89,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153042" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="res/commandimagelist/sc_glueescapedirectiontop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148386" src="res/commandimagelist/sc_glueescapedirectiontop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -109,7 +106,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155401" xml-lang="en-US" l10n="E">
-<image id="img_id3156256" src="res/commandimagelist/sc_glueescapedirectionright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156256" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156256" src="res/commandimagelist/sc_glueescapedirectionright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156256" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -126,7 +123,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145204" xml-lang="en-US" l10n="E">
-<image id="img_id3150756" src="res/commandimagelist/sc_glueescapedirectionbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150756" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150756" src="res/commandimagelist/sc_glueescapedirectionbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150756" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -143,7 +140,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153622" xml-lang="en-US" l10n="E">
-<image id="img_id3153149" src="res/commandimagelist/sc_gluepercent.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153149" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153149" src="res/commandimagelist/sc_gluepercent.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153149" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -160,7 +157,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="E">
-<image id="img_id3148829" src="res/commandimagelist/sc_gluehorzalignleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148829" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148829" src="res/commandimagelist/sc_gluehorzalignleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148829" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -177,7 +174,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148910" xml-lang="en-US" l10n="E">
-<image id="img_id3148919" src="res/commandimagelist/sc_gluehorzaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148919" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148919" src="res/commandimagelist/sc_gluehorzaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148919" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -194,7 +191,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148627" xml-lang="en-US" l10n="E">
-<image id="img_id3149808" src="res/commandimagelist/sc_gluehorzalignright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149808" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149808" src="res/commandimagelist/sc_gluehorzalignright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149808" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -211,7 +208,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="E">
-<image id="img_id3154571" src="res/commandimagelist/sc_gluevertaligntop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154571" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154571" src="res/commandimagelist/sc_gluevertaligntop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -228,7 +225,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150996" xml-lang="en-US" l10n="E">
-<image id="img_id3151106" src="res/commandimagelist/sc_gluevertaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3151106" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151106" src="res/commandimagelist/sc_gluevertaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3151106" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -245,7 +242,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="E">
-<image id="img_id3154192" src="res/commandimagelist/sc_gluevertalignbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154192" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154192" src="res/commandimagelist/sc_gluevertalignbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154192" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/10050000.xhp b/helpcontent2/source/text/simpress/02/10050000.xhp
index f998ff73de..47db1efa4d 100644
--- a/helpcontent2/source/text/simpress/02/10050000.xhp
+++ b/helpcontent2/source/text/simpress/02/10050000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10050000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10060000.xhp b/helpcontent2/source/text/simpress/02/10060000.xhp
index def6ff39bc..0668a9e796 100644
--- a/helpcontent2/source/text/simpress/02/10060000.xhp
+++ b/helpcontent2/source/text/simpress/02/10060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10060000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10070000.xhp b/helpcontent2/source/text/simpress/02/10070000.xhp
index e8f3f034b0..1fefa2a3d1 100644
--- a/helpcontent2/source/text/simpress/02/10070000.xhp
+++ b/helpcontent2/source/text/simpress/02/10070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10070000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10080000.xhp b/helpcontent2/source/text/simpress/02/10080000.xhp
index 6a781faf8c..5043f5bfd9 100644
--- a/helpcontent2/source/text/simpress/02/10080000.xhp
+++ b/helpcontent2/source/text/simpress/02/10080000.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10080000.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0210080000xml" indexer="include" status="PUBLISH">
@@ -57,7 +54,7 @@
 <paragraph role="heading" id="hd_id3149875" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/02/10080000.xhp" name="Curve">Curve</link></paragraph>
 <paragraph role="paragraph" id="par_id3147301" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:LineToolbox">The Curve icon on the Drawing bar opens the <emph>Lines</emph> toolbar, where you can add lines and shapes to the current slide.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3157873" xml-lang="en-US" l10n="U" oldref="3">If you hold the Shift key down, the movement of the mouse is limited to multiples of 45 degrees. If you hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key, the new point will not be connected to the last point. This allows you to create objects that consist of curves that are not connected together. If you draw a smaller object while holding down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key into a larger object that you have not closed yet, the smaller object is subtracted from the larger one, thus appearing as a hole in the larger one.</paragraph>
+<paragraph role="paragraph" id="par_id3157873" xml-lang="en-US" l10n="U" oldref="3">If you hold the Shift key down, the movement of the mouse is limited to multiples of 45 degrees. If you hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key, the new point will not be connected to the last point. This allows you to create objects that consist of curves that are not connected together. If you draw a smaller object while holding down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key into a larger object that you have not closed yet, the smaller object is subtracted from the larger one, thus appearing as a hole in the larger one.</paragraph>
 <paragraph role="paragraph" id="par_id3153083" xml-lang="en-US" l10n="CHG" oldref="8">Closed shapes automatically receive the fill that is displayed in the <emph>Area Style/Filling</emph> box on <emph>Line and Filling</emph> bar. </paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_BEZIER_FILL" id="bm_id9220187" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:BezierFill" id="bm_id3153734" localize="false"/>
@@ -159,7 +156,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/.uno:Polygon_Diagonal_Unfill" id="bm_id3150347" localize="false"/>
 <paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2" l10n="U" oldref="26">Polygon (45°)</paragraph>
-<paragraph role="paragraph" id="par_id3150354" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:Polygon_Diagonal_Unfill">Draws a line composed of a series of straight line segments, that are constrained by angles of 45 degree. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, hold down <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> and double-click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150354" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:Polygon_Diagonal_Unfill">Draws a line composed of a series of straight line segments, that are constrained by angles of 45 degree. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and double-click.</ahelp></paragraph>
 <table id="tbl_id3150978">
 <tablerow>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10090000.xhp b/helpcontent2/source/text/simpress/02/10090000.xhp
index bc012c6d98..109f72961a 100644
--- a/helpcontent2/source/text/simpress/02/10090000.xhp
+++ b/helpcontent2/source/text/simpress/02/10090000.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10090000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0210090000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">3D Objects</title>
 <filename>/text/simpress/02/10090000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-19T12:17:19">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150208"><bookmark_value>toolbars;3D objects</bookmark_value>
@@ -61,7 +54,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_DRAWTBX_3D_OBJECTS" id="bm_id8169159" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:Objects3DToolbox" id="bm_id3152994" localize="false"/>
 <paragraph role="heading" id="hd_id3159238" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/10090000.xhp" name="3D Objects">3D Objects</link></paragraph>
-<paragraph role="paragraph" id="par_id3152900" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Objects3DToolbox">Open the <emph>3D Objects</emph> toolbar, where you can add 3D shapes to the current slide.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152900" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Objects3DToolbox">Opens the <emph>3D Objects</emph> toolbar. The objects are three dimensional, with depth, illumination, and reflection.</ahelp> Each inserted object initially forms a 3D scene. You can press F3 to enter the scene. For these 3D objects, you can open the 3D Effects dialog to edit the properties.</paragraph>
 </section>
 <section id="syobjekte">
 <table id="tbl_id3153248">
diff --git a/helpcontent2/source/text/simpress/02/10100000.xhp b/helpcontent2/source/text/simpress/02/10100000.xhp
index eb7cc6998f..a7183eb7d8 100644
--- a/helpcontent2/source/text/simpress/02/10100000.xhp
+++ b/helpcontent2/source/text/simpress/02/10100000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10100000.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsimpress0210100000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Connectors</title>
@@ -49,7 +46,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155445" xml-lang="en-US" l10n="E">
-<image id="img_id3149018" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149018" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149018" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -59,6 +56,7 @@
 </table>
 
 <paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:ConnectorToolbox">Open the <emph>Connectors</emph> toolbar, where you can add connectors to objects in the current slide. A connector is a line that joins objects, and remains attached when the objects are moved. If you copy an object with a connector, the connector is also copied.</ahelp></paragraph>
+</section>
 <paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="122">There are four types of connector lines:</paragraph>
 <list type="ordered">
 <listitem>
@@ -74,7 +72,7 @@
 <paragraph role="listitem" id="par_id3149943" xml-lang="en-US" l10n="U" oldref="126">Curved</paragraph>
 </listitem>
 </list>
-</section>
+
 <paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="4">When you click a connector and move your mouse pointer over a filled object, or the edge of an unfilled object, gluepoints appear. A gluepoint is a fixed point where you can attach a connector line. You can add custom <link href="text/simpress/02/10030200.xhp" name="glue point">gluepoints</link> to an object.</paragraph>
 <paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="5">To draw a connector line, click a gluepoint on an object, drag to a gluepoint on another object, and then release. You can also drag to an empty part of you document and click. The unattached end of the connector is locked in place, until you drag the end to a different location. To detach a connector, drag either end of the connector line to a different location.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_TOOL_CONNECTOR" id="bm_id9771135" localize="false"/>
@@ -85,7 +83,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150743" xml-lang="en-US" l10n="E">
-<image id="img_id3153037" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153037" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153037" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153037" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -102,7 +100,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155930" xml-lang="en-US" l10n="E">
-<image id="img_id3150021" src="res/commandimagelist/sc_connectorarrowstart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150021" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150021" src="res/commandimagelist/sc_connectorarrowstart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150021" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -119,7 +117,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_connectorarrowend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150936" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150936" src="res/commandimagelist/sc_connectorarrowend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -136,7 +134,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="E">
-<image id="img_id3153720" src="res/commandimagelist/sc_connectorarrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153720" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153720" src="res/commandimagelist/sc_connectorarrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153720" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -153,7 +151,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147565" xml-lang="en-US" l10n="E">
-<image id="img_id3147572" src="res/commandimagelist/sc_connectorcirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147572" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147572" src="res/commandimagelist/sc_connectorcirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147572" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -170,7 +168,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3143234" xml-lang="en-US" l10n="E">
-<image id="img_id3149289" src="res/commandimagelist/sc_connectorcircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149289" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149289" src="res/commandimagelist/sc_connectorcircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149289" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -187,7 +185,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3158400" xml-lang="en-US" l10n="E">
-<image id="img_id3154203" src="res/commandimagelist/sc_connectortoolbox.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154203" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154203" src="res/commandimagelist/sc_connectortoolbox.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154203" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -204,7 +202,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150705" xml-lang="en-US" l10n="E">
-<image id="img_id3153679" src="res/commandimagelist/sc_connectorlines.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153679" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153679" src="res/commandimagelist/sc_connectorlines.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -221,7 +219,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="E">
-<image id="img_id3150629" src="res/commandimagelist/sc_connectorlinesarrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150629" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150629" src="res/commandimagelist/sc_connectorlinesarrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150629" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -238,7 +236,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150347" xml-lang="en-US" l10n="E">
-<image id="img_id3150357" src="res/commandimagelist/sc_connectorlinesarrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150357" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150357" src="res/commandimagelist/sc_connectorlinesarrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150357" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -255,7 +253,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="E">
-<image id="img_id3150982" src="res/commandimagelist/sc_connectorlinesarrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150982" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150982" src="res/commandimagelist/sc_connectorlinesarrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150982" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -272,7 +270,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151274" xml-lang="en-US" l10n="E">
-<image id="img_id3151284" src="res/commandimagelist/sc_connectorlinescirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151284" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151284" src="res/commandimagelist/sc_connectorlinescirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151284" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -289,7 +287,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="E">
-<image id="img_id3151326" src="res/commandimagelist/sc_connectorlinescircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151326" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151326" src="res/commandimagelist/sc_connectorlinescircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151326" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -306,7 +304,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="E">
-<image id="img_id3154834" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154834" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154834" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154834" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -323,7 +321,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="E">
-<image id="img_id3154223" src="res/commandimagelist/sc_connectorline.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154223" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154223" src="res/commandimagelist/sc_connectorline.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154223" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -340,7 +338,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152775" xml-lang="en-US" l10n="E">
-<image id="img_id3156188" src="res/commandimagelist/sc_connectorlinearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156188" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156188" src="res/commandimagelist/sc_connectorlinearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156188" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -357,7 +355,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147072" xml-lang="en-US" l10n="E">
-<image id="img_id3147082" src="res/commandimagelist/sc_connectorlinearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147082" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147082" src="res/commandimagelist/sc_connectorlinearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147082" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -374,7 +372,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151027" xml-lang="en-US" l10n="E">
-<image id="img_id3151037" src="res/commandimagelist/sc_connectorlinearrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151037" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151037" src="res/commandimagelist/sc_connectorlinearrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151037" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -391,7 +389,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156370" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_connectorlinecirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156380" src="res/commandimagelist/sc_connectorlinecirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -408,7 +406,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="E">
-<image id="img_id3155922" src="res/commandimagelist/sc_connectorlinecircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155922" src="res/commandimagelist/sc_connectorlinecircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155922" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -425,7 +423,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="E">
-<image id="img_id3150122" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150122" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150122" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150122" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -442,7 +440,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146139" xml-lang="en-US" l10n="E">
-<image id="img_id3146149" src="res/commandimagelist/sc_connectorcurve.png" width="0.566cm" height="0.566cm"><alt id="alt_id3146149" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146149" src="res/commandimagelist/sc_connectorcurve.png" width="0.566cm" height="0.566cm"><alt id="alt_id3146149" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -459,7 +457,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146914" xml-lang="en-US" l10n="E">
-<image id="img_id3154807" src="res/commandimagelist/sc_connectorcurvearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154807" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154807" src="res/commandimagelist/sc_connectorcurvearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154807" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -476,7 +474,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145215" xml-lang="en-US" l10n="E">
-<image id="img_id3145225" src="res/commandimagelist/sc_connectorcurvearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3145225" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145225" src="res/commandimagelist/sc_connectorcurvearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3145225" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -493,7 +491,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148438" xml-lang="en-US" l10n="E">
-<image id="img_id3148448" src="res/commandimagelist/sc_connectorcurvearrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148448" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148448" src="res/commandimagelist/sc_connectorcurvearrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148448" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -510,7 +508,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153291" xml-lang="en-US" l10n="E">
-<image id="img_id3153301" src="res/commandimagelist/sc_connectorcurvecirclestart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153301" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153301" src="res/commandimagelist/sc_connectorcurvecirclestart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153301" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -527,7 +525,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="E">
-<image id="img_id3156097" src="res/commandimagelist/sc_connectorcurvecircleend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156097" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156097" src="res/commandimagelist/sc_connectorcurvecircleend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156097" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -544,7 +542,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155588" xml-lang="en-US" l10n="E">
-<image id="img_id3155598" src="res/commandimagelist/sc_connectorcurvecircles.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155598" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155598" src="res/commandimagelist/sc_connectorcurvecircles.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155598" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/10110000.xhp b/helpcontent2/source/text/simpress/02/10110000.xhp
index db17af4ee7..f694b36389 100644
--- a/helpcontent2/source/text/simpress/02/10110000.xhp
+++ b/helpcontent2/source/text/simpress/02/10110000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10110000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/10120000.xhp b/helpcontent2/source/text/simpress/02/10120000.xhp
index a0eaf1ee41..fc4869a6cb 100644
--- a/helpcontent2/source/text/simpress/02/10120000.xhp
+++ b/helpcontent2/source/text/simpress/02/10120000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10120000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,8 +31,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0210120000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Arrows</title>
@@ -177,7 +173,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_DRAW_MEASURELINE" id="bm_id8363048" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MeasureLine" id="bm_id3153777" localize="false"/><paragraph role="heading" id="hd_id3154477" xml-lang="en-US" level="2" l10n="U" oldref="35">Dimension Line</paragraph>
 <paragraph role="paragraph" id="par_id3146124" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid=".uno:MeasureLine">Draws a line that displays the dimension length bounded by guides.</ahelp> Dimension lines automatically calculate and display linear dimensions. To draw a dimension line, open the <emph>Arrows</emph> toolbar, and click the <emph>Dimension Line</emph> icon. Move your pointer to where you want the line to start and drag to draw the dimension line. Release when finished.</paragraph>
-<paragraph role="tip" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="37">If you want the dimension line to be the same length as the side of a nearby object, hold down the <switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tip" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="37">If you want the dimension line to be the same length as the side of a nearby object, hold down the <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging. To constrain the dimension line to 45 degrees, hold down the Shift key while dragging.</paragraph>
 <paragraph role="paragraph" id="par_id3148986" xml-lang="en-US" l10n="CHG" oldref="53">In %PRODUCTNAME Draw, a dimension line is always inserted on the <link href="text/simpress/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any dimension line in your drawing.</paragraph>
 <section id="symasslinie">
diff --git a/helpcontent2/source/text/simpress/02/10130000.xhp b/helpcontent2/source/text/simpress/02/10130000.xhp
index 3330b4e622..765ad0188d 100644
--- a/helpcontent2/source/text/simpress/02/10130000.xhp
+++ b/helpcontent2/source/text/simpress/02/10130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10130000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11060000.xhp b/helpcontent2/source/text/simpress/02/11060000.xhp
index 90f627dd08..0c1234b9ab 100644
--- a/helpcontent2/source/text/simpress/02/11060000.xhp
+++ b/helpcontent2/source/text/simpress/02/11060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11060000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11070000.xhp b/helpcontent2/source/text/simpress/02/11070000.xhp
index 5b16650dce..d4bfb06eaa 100644
--- a/helpcontent2/source/text/simpress/02/11070000.xhp
+++ b/helpcontent2/source/text/simpress/02/11070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11070000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11080000.xhp b/helpcontent2/source/text/simpress/02/11080000.xhp
index e1d93de2ef..ddc6f73ece 100644
--- a/helpcontent2/source/text/simpress/02/11080000.xhp
+++ b/helpcontent2/source/text/simpress/02/11080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11080000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11090000.xhp b/helpcontent2/source/text/simpress/02/11090000.xhp
index 9b9e33479d..5eb7127009 100644
--- a/helpcontent2/source/text/simpress/02/11090000.xhp
+++ b/helpcontent2/source/text/simpress/02/11090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11090000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11100000.xhp b/helpcontent2/source/text/simpress/02/11100000.xhp
index 974f0d2462..db14ed1a2d 100644
--- a/helpcontent2/source/text/simpress/02/11100000.xhp
+++ b/helpcontent2/source/text/simpress/02/11100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11100000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/11110000.xhp b/helpcontent2/source/text/simpress/02/11110000.xhp
index a23af389e2..8d0b68693c 100644
--- a/helpcontent2/source/text/simpress/02/11110000.xhp
+++ b/helpcontent2/source/text/simpress/02/11110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 11110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13010000.xhp b/helpcontent2/source/text/simpress/02/13010000.xhp
index fef2048541..ee120d0f73 100644
--- a/helpcontent2/source/text/simpress/02/13010000.xhp
+++ b/helpcontent2/source/text/simpress/02/13010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13020000.xhp b/helpcontent2/source/text/simpress/02/13020000.xhp
index 0e78f685dc..dc44736b4d 100644
--- a/helpcontent2/source/text/simpress/02/13020000.xhp
+++ b/helpcontent2/source/text/simpress/02/13020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13030000.xhp b/helpcontent2/source/text/simpress/02/13030000.xhp
index ffa9ed0d7f..a5982ed0eb 100644
--- a/helpcontent2/source/text/simpress/02/13030000.xhp
+++ b/helpcontent2/source/text/simpress/02/13030000.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 13030000.xhp,v $
- * $Revision: 1.5.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0213030000xml" indexer="include" status="PUBLISH">
@@ -49,7 +46,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:AnimationMode" id="bm_id3146121" localize="false"/>
 <paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/13030000.xhp" name="Allow Effects">Allow Effects</link></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AnimationMode">Plays a preview of an animation effect that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AnimationMode">Plays a preview of an animation effect that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
 </section>
 <section id="syeffekt">
 <table id="tbl_id3154756">
diff --git a/helpcontent2/source/text/simpress/02/13040000.xhp b/helpcontent2/source/text/simpress/02/13040000.xhp
index 5f36d877fb..ddd585392e 100644
--- a/helpcontent2/source/text/simpress/02/13040000.xhp
+++ b/helpcontent2/source/text/simpress/02/13040000.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 13040000.xhp,v $
- * $Revision: 1.6.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0213040000xml" indexer="include" status="PUBLISH">
@@ -47,10 +44,10 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148386"><bookmark_value>interactions; preview</bookmark_value>
 <bookmark_value>allowing; interaction</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_ACTIONMODE" id="bm_id3693928" localize="false"/><!-- HID added by script -->
+<!-- removed HID SID_ACTIONMODE --><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ActionMode" id="bm_id3145297" localize="false"/>
 <paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/13040000.xhp" name="Allow Interaction">Allow Interaction</link></paragraph>
-<paragraph role="paragraph" id="par_id3150266" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ActionMode">Runs a preview of the interaction that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150266" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ActionMode">Runs a preview of the interaction that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
 </section>
 <section id="syinter">
 <table id="tbl_id3155817">
diff --git a/helpcontent2/source/text/simpress/02/13050000.xhp b/helpcontent2/source/text/simpress/02/13050000.xhp
index 30b86af81d..54ccd6763c 100644
--- a/helpcontent2/source/text/simpress/02/13050000.xhp
+++ b/helpcontent2/source/text/simpress/02/13050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13060000.xhp b/helpcontent2/source/text/simpress/02/13060000.xhp
index 202c1a62b6..78f8530c4e 100644
--- a/helpcontent2/source/text/simpress/02/13060000.xhp
+++ b/helpcontent2/source/text/simpress/02/13060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13060000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13070000.xhp b/helpcontent2/source/text/simpress/02/13070000.xhp
index 0908bfaf57..94e633ef7a 100644
--- a/helpcontent2/source/text/simpress/02/13070000.xhp
+++ b/helpcontent2/source/text/simpress/02/13070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13070000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13080000.xhp b/helpcontent2/source/text/simpress/02/13080000.xhp
index c50b6f4cec..3ad2d1bb13 100644
--- a/helpcontent2/source/text/simpress/02/13080000.xhp
+++ b/helpcontent2/source/text/simpress/02/13080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13080000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13090000.xhp b/helpcontent2/source/text/simpress/02/13090000.xhp
index 501d5f4387..1bfc854abb 100644
--- a/helpcontent2/source/text/simpress/02/13090000.xhp
+++ b/helpcontent2/source/text/simpress/02/13090000.xhp
@@ -4,36 +4,28 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, 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.
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *    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.
- *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
@@ -61,7 +53,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="E">
-<image id="img_id3155962" src="res/commandimagelist/sc_solidcreate.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155962">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155962" src="res/commandimagelist/sc_solidcreate.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155962">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/13100000.xhp b/helpcontent2/source/text/simpress/02/13100000.xhp
index 7e4b0c88a2..40a9a36091 100644
--- a/helpcontent2/source/text/simpress/02/13100000.xhp
+++ b/helpcontent2/source/text/simpress/02/13100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13100000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13140000.xhp b/helpcontent2/source/text/simpress/02/13140000.xhp
index 3bdfe0e751..941a7047dd 100644
--- a/helpcontent2/source/text/simpress/02/13140000.xhp
+++ b/helpcontent2/source/text/simpress/02/13140000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13140000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13150000.xhp b/helpcontent2/source/text/simpress/02/13150000.xhp
index b57f1399a2..1647f9d17a 100644
--- a/helpcontent2/source/text/simpress/02/13150000.xhp
+++ b/helpcontent2/source/text/simpress/02/13150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13150000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13160000.xhp b/helpcontent2/source/text/simpress/02/13160000.xhp
index ab7c6723e3..32a49ed658 100644
--- a/helpcontent2/source/text/simpress/02/13160000.xhp
+++ b/helpcontent2/source/text/simpress/02/13160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13160000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13170000.xhp b/helpcontent2/source/text/simpress/02/13170000.xhp
index f7ce598b98..a9db7cda63 100644
--- a/helpcontent2/source/text/simpress/02/13170000.xhp
+++ b/helpcontent2/source/text/simpress/02/13170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13170000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13180000.xhp b/helpcontent2/source/text/simpress/02/13180000.xhp
index b989f5d2a2..ac751985a4 100644
--- a/helpcontent2/source/text/simpress/02/13180000.xhp
+++ b/helpcontent2/source/text/simpress/02/13180000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13180000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/13190000.xhp b/helpcontent2/source/text/simpress/02/13190000.xhp
index ab7f836637..98081c1c4e 100644
--- a/helpcontent2/source/text/simpress/02/13190000.xhp
+++ b/helpcontent2/source/text/simpress/02/13190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 13190000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/02/makefile.mk b/helpcontent2/source/text/simpress/02/makefile.mk
index aeaaa92ef5..d18a003039 100644
--- a/helpcontent2/source/text/simpress/02/makefile.mk
+++ b/helpcontent2/source/text/simpress/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -94,4 +90,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/simpress/04/01020000.xhp b/helpcontent2/source/text/simpress/04/01020000.xhp
index 5d9230ca60..41e47ee8ea 100755
--- a/helpcontent2/source/text/simpress/04/01020000.xhp
+++ b/helpcontent2/source/text/simpress/04/01020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -159,7 +156,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29">F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="30">Styles and Formatting</paragraph>
diff --git a/helpcontent2/source/text/simpress/04/makefile.mk b/helpcontent2/source/text/simpress/04/makefile.mk
index 80f3816836..7558cc6fc8 100644
--- a/helpcontent2/source/text/simpress/04/makefile.mk
+++ b/helpcontent2/source/text/simpress/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/simpress/guide/3d_create.xhp b/helpcontent2/source/text/simpress/guide/3d_create.xhp
index a04219d019..4e5e295947 100755
--- a/helpcontent2/source/text/simpress/guide/3d_create.xhp
+++ b/helpcontent2/source/text/simpress/guide/3d_create.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 3d_create.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,24 +27,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpressguide3d_createxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Converting 2D Objects to Curves, Polygons, and 3D Objects</title>
 <filename>/text/simpress/guide/3d_create.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-07T09:41:50">FPE: Deleted screenshots</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150207"><bookmark_value>3D rotation objects; generating</bookmark_value>
 <bookmark_value>3D objects; generating</bookmark_value>
+<bookmark_value>3D scenes; creating</bookmark_value>
 <bookmark_value>converting; to curves, polygons, 3D</bookmark_value>
 <bookmark_value>extrusion objects</bookmark_value>
-</bookmark>
+</bookmark><comment>added 3D scenes, issue 109330</comment>
 <paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="1" l10n="U" oldref="32"><variable id="3d_create"><link href="text/simpress/guide/3d_create.xhp" name="Converting 2D Objects to Curves, Polygons, and 3D Objects">Converting 2D Objects to Curves, Polygons, and 3D Objects</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="33">You can convert two dimensional (2D) objects to create different shapes. $[officename] can convert 2D objects to the following object types:</paragraph>
@@ -65,6 +59,18 @@
 <paragraph role="listitem" id="par_id3149873" xml-lang="en-US" l10n="U" oldref="52">3D rotation object with shading and a light source</paragraph>
 </listitem>
 </list>
+
+<paragraph role="heading" id="hd_id31490481" xml-lang="en-US" level="3" l10n="NEW">Two types of 3D objects</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id31472951" xml-lang="en-US" l10n="NEW">The Status bar displays "3D scene selected". The 3D scenes are built from objects which have dimensions in x, y, and z coordinates. Examples are the objects inserted by the 3D Objects toolbar, and rectangles, ellipses, or text that got created by the Rectangle, Ellipse, or Text icons left on the Drawing toolbar, or any Custom Shapes, and that got converted to 3D by using the context menu "Convert - To 3D". These 3D scenes can be entered (for example, by pressing F3), and the objects can be rotated in 3D. Microsoft Office doesn't know these real 3D objects. When exporting these 3D scenes to Microsoft Office formats, a snapshot of the current view will be exported as a bitmap. 3D bars in charts are of this type, too.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id31506541" xml-lang="en-US" l10n="NEW">The Status bar displays "Shape selected". The Custom Shapes can be viewed in a 2D mode or in a 3D mode. At any time, you can switch the view between the two modes. You use the Basic Shapes, Symbol Shapes, and the following icons on the Drawing toolbar to create Custom Shapes. The Custom Shapes can be changed using the 3D Settings toolbar. They do not form a 3D scene, they cannot be illuminated by more than one light source, they show no reflections, and there are some more limitations. You can convert them to a 3D scene, but then they are no longer Custom Shapes. Custom Shapes in 2D or 3D mode can be exported to and imported from Microsoft Office formats.</paragraph>
+</listitem>
+</list>
+
+
 <paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="3" l10n="U" oldref="34">To convert an object to a curved shape:</paragraph>
 <list type="ordered">
 <listitem>
@@ -74,7 +80,7 @@
 <paragraph role="listitem" id="par_id3150654" xml-lang="en-US" l10n="CHG" oldref="54">Right-click the object and choose <emph>Convert - To Curve</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="55">To modify the shape of the object, click the <emph>Points</emph> icon 
+<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="55">To modify the shape of the object, click the <emph>Points</emph> icon
 <image id="img_id1027558" src="svx/res/cd015.png" width="0.222inch" height="0.222inch"><alt id="alt_id1027558" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> toolbar, and drag the handles of the object. You can also drag the control points of a handle to modify the shape of the curve.</paragraph>
 <paragraph role="heading" id="hd_id3153738" xml-lang="en-US" level="3" l10n="U" oldref="56">To convert a 2D object to a polygon:</paragraph>
@@ -87,7 +93,7 @@
 </paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="39">To modify the shape of the object, click the <emph>Points</emph> icon 
+<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="39">To modify the shape of the object, click the <emph>Points</emph> icon
 <image id="img_id7219458" src="svx/res/cd015.png" width="0.2201inch" height="0.2201inch"><alt id="alt_id7219458" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> toolbar, and drag the handles of the object.</paragraph>
 <paragraph role="heading" id="hd_id3153919" xml-lang="en-US" level="3" l10n="U" oldref="60">To convert a 2D object to a 3D object:</paragraph>
@@ -96,13 +102,13 @@
 <paragraph role="listitem" id="par_id3147172" xml-lang="en-US" l10n="CHG" oldref="62">Select a 2D object on the slide or page.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_idN1088B" xml-lang="en-US" l10n="NEW">Click the <emph>Extrusion On/Off</emph> icon 
+<paragraph role="listitem" id="par_idN1088B" xml-lang="en-US" l10n="NEW">Click the <emph>Extrusion On/Off</emph> icon
 <image id="img_id2490920" src="res/commandimagelist/sc_extrusiontoggle.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2490920" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> bar, or right-click the object and choose <emph>Convert - To 3D</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3148828" xml-lang="en-US" l10n="CHG" oldref="41">To edit the properties of the 3D object, use the <emph>Line and Filling</emph> toolbar and the <emph>3D Settings</emph> toolbar.</paragraph>
-<paragraph role="tip" id="par_idN108C5" xml-lang="en-US" l10n="NEW">To convert a text object to 3D, use the <emph>Fontwork</emph> icon 
+<paragraph role="tip" id="par_idN108C5" xml-lang="en-US" l10n="NEW">To convert a text object to 3D, use the <emph>Fontwork</emph> icon
 <image id="img_id3821222" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3821222" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> toolbar.</paragraph>
 <paragraph role="heading" id="hd_id3145410" xml-lang="en-US" level="3" l10n="U" oldref="65">To convert a 2D object to a 3D rotation object:</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/animated_gif_create.xhp b/helpcontent2/source/text/simpress/guide/animated_gif_create.xhp
index d08de9a038..e31bf0c686 100644
--- a/helpcontent2/source/text/simpress/guide/animated_gif_create.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_gif_create.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animated_gif_create.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp b/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
index a774e41858..89c215fd96 100755
--- a/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animated_gif_save.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/animated_objects.xhp b/helpcontent2/source/text/simpress/guide/animated_objects.xhp
index e05ec8fa67..b61a167660 100644
--- a/helpcontent2/source/text/simpress/guide/animated_objects.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_objects.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animated_objects.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp b/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
index dfa86db539..e8f9cf54af 100644
--- a/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animated_slidechange.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/arrange_slides.xhp b/helpcontent2/source/text/simpress/guide/arrange_slides.xhp
index e39accf844..8b09aa1a47 100644
--- a/helpcontent2/source/text/simpress/guide/arrange_slides.xhp
+++ b/helpcontent2/source/text/simpress/guide/arrange_slides.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arrange_slides.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/background.xhp b/helpcontent2/source/text/simpress/guide/background.xhp
index e57f989b5b..70c9af7518 100644
--- a/helpcontent2/source/text/simpress/guide/background.xhp
+++ b/helpcontent2/source/text/simpress/guide/background.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: background.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,80 +30,88 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
-<meta>
-<topic id="textsimpressguidebackgroundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Slide Background Fill</title>
-<filename>/text/simpress/guide/background.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150199"><bookmark_value>backgrounds; changing</bookmark_value>
-<bookmark_value>slide masters; changing backgrounds</bookmark_value>
-<bookmark_value>slides;changing backgrounds</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="background"><link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="34">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
-<paragraph role="paragraph" id="par_id3148701" xml-lang="en-US" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph><comment>insert help id when available</comment><paragraph role="paragraph" id="par_id624713" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp><comment>see http://specs.openoffice.org/impress/sd.insertbackground.odt</comment></paragraph><comment>removed a para, #63970</comment><paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3" l10n="U" oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149942" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148725" xml-lang="en-US" l10n="U" oldref="51">In the <emph>Fill </emph>area, do one of the following:</paragraph>
-<paragraph role="listitem" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="52">Select <emph>Color</emph>, and then click a color in the list.</paragraph>
-<paragraph role="listitem" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="53">Select <emph>Gradient</emph>, and then click a gradient style in the list.</paragraph>
-<paragraph role="listitem" id="par_id3150338" xml-lang="en-US" l10n="U" oldref="54">Select <emph>Hatching</emph>, and then click a hatching style in the list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="55">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145244" xml-lang="en-US" level="3" l10n="U" oldref="56">To use an image for the slide background</paragraph>
-<paragraph role="paragraph" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="57">You can display an entire image as a slide background, or you can tile the image to produce a patterned background.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145356" xml-lang="en-US" l10n="U" oldref="59">In the <emph>Fill </emph>area, select <emph>Bitmap</emph>, and then click an image in the list.</paragraph>
-<paragraph role="note" id="par_id3150757" xml-lang="en-US" l10n="U" oldref="60">If you want to use a custom image for the slide background, close the <emph>Page Setup </emph>dialog, and then choose <emph>Format - Area</emph>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <emph>Open</emph>. When you return to the <emph>Background </emph>tab, the image you imported will be in the <emph>Bitmap </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153151" xml-lang="en-US" l10n="U" oldref="61">Do one of the following:</paragraph>
-<paragraph role="paragraph" id="par_id3150263" xml-lang="en-US" l10n="U" oldref="62">To display the entire image as the background, clear the <emph>Tile </emph>check box in the <emph>Position </emph>area, and then select <emph>AutoFit</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="63">To tile the image on the background, select <emph>Tile</emph>, and set the <emph>Size</emph>, <emph>Position</emph>, and <emph>Offset</emph> options for the image.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="U" oldref="64">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3158403" xml-lang="en-US" l10n="U" oldref="47">This modification is only valid for the current presentation document.</paragraph>
-<paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3" l10n="NEW">To save a new slide master as a template</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10827" xml-lang="en-US" l10n="NEW">Choose <emph>View - Master - Slide Master</emph> to change to the slide master.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this slide master.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="NEW">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US" l10n="NEW">Choose <emph>File - Templates - Save</emph> to save the document as a template.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10847" xml-lang="en-US" l10n="NEW">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US" l10n="NEW">Now you can use the Presentation Wizard to open a new presentation based on your new template.</paragraph>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/footer.xhp#footer"/>
-</section>
-</body>
+    <meta>
+        <topic id="textsimpressguidebackgroundxml" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Changing the Slide Background Fill</title>
+            <filename>/text/simpress/guide/background.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+        <bookmark xml-lang="en-US" branch="index" id="bm_id3150199">
+            <bookmark_value>backgrounds; changing</bookmark_value>
+            <bookmark_value>slide masters; changing backgrounds</bookmark_value>
+            <bookmark_value>slides;changing backgrounds</bookmark_value>
+        </bookmark>
+        <paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1" l10n="U" oldref="33">
+            <variable id="background">
+                <link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link>
+            </variable>
+        </paragraph>
+        <paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="34">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
+        <paragraph role="paragraph" id="par_id3148701" xml-lang="en-US" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph>
+        <comment>insert help id when available</comment>
+        <paragraph role="paragraph" id="par_id624713" xml-lang="en-US" l10n="NEW">
+            <ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp>
+        </paragraph>
+        <comment>removed a para, #63970</comment>
+        <paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3" l10n="U" oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
+        <list type="ordered">
+            <listitem>
+                <paragraph role="listitem" id="par_id3149942" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="listitem" id="par_id3148725" xml-lang="en-US" l10n="U" oldref="51">In the <emph>Fill </emph>area, do one of the following:</paragraph>
+                <paragraph role="listitem" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="52">Select <emph>Color</emph>, and then click a color in the list.</paragraph>
+                <paragraph role="listitem" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="53">Select <emph>Gradient</emph>, and then click a gradient style in the list.</paragraph>
+                <paragraph role="listitem" id="par_id3150338" xml-lang="en-US" l10n="U" oldref="54">Select <emph>Hatching</emph>, and then click a hatching style in the list.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="listitem" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="55">Click <emph>OK</emph>.</paragraph>
+            </listitem>
+        </list>
+        <paragraph role="heading" id="hd_id3145244" xml-lang="en-US" level="3" l10n="U" oldref="56">To use an image for the slide background</paragraph>
+        <paragraph role="paragraph" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="57">You can display an entire image as a slide background, or you can tile the image to produce a patterned background.</paragraph>
+        <list type="ordered">
+            <listitem>
+                <paragraph role="listitem" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="listitem" id="par_id3145356" xml-lang="en-US" l10n="U" oldref="59">In the <emph>Fill </emph>area, select <emph>Bitmap</emph>, and then click an image in the list.</paragraph>
+                <paragraph role="note" id="par_id3150757" xml-lang="en-US" l10n="U" oldref="60">If you want to use a custom image for the slide background, close the <emph>Page Setup </emph>dialog, and then choose <emph>Format - Area</emph>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <emph>Open</emph>. When you return to the <emph>Background </emph>tab, the image you imported will be in the <emph>Bitmap </emph>list.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_id3153151" xml-lang="en-US" l10n="U" oldref="61">Do one of the following:</paragraph>
+                <paragraph role="paragraph" id="par_id3150263" xml-lang="en-US" l10n="U" oldref="62">To display the entire image as the background, clear the <emph>Tile </emph>check box in the <emph>Position </emph>area, and then select <emph>AutoFit</emph>.</paragraph>
+                <paragraph role="paragraph" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="63">To tile the image on the background, select <emph>Tile</emph>, and set the <emph>Size</emph>, <emph>Position</emph>, and <emph>Offset</emph> options for the image.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="U" oldref="64">Click <emph>OK</emph>.</paragraph>
+            </listitem>
+        </list>
+        <paragraph role="paragraph" id="par_id3158403" xml-lang="en-US" l10n="U" oldref="47">This modification is only valid for the current presentation document.</paragraph>
+        <paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3" l10n="NEW">To save a new slide master as a template</paragraph>
+        <list type="ordered">
+            <listitem>
+                <paragraph role="paragraph" id="par_idN10827" xml-lang="en-US" l10n="NEW">Choose <emph>View - Master - Slide Master</emph> to change to the slide master.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this slide master.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="NEW">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US" l10n="NEW">Choose <emph>File - Templates - Save</emph> to save the document as a template.</paragraph>
+            </listitem>
+            <listitem>
+                <paragraph role="paragraph" id="par_idN10847" xml-lang="en-US" l10n="NEW">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph>
+            </listitem>
+        </list>
+        <paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US" l10n="NEW">Now you can use the Presentation Wizard to open a new presentation based on your new template.</paragraph>
+        <section id="relatedtopics">
+            <embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
+            <embed href="text/simpress/guide/layers.xhp#layers"/>
+            <embed href="text/simpress/guide/footer.xhp#footer"/>
+        </section>
+    </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/guide/change_scale.xhp b/helpcontent2/source/text/simpress/guide/change_scale.xhp
index 44ba93a493..ebfe030fe5 100755
--- a/helpcontent2/source/text/simpress/guide/change_scale.xhp
+++ b/helpcontent2/source/text/simpress/guide/change_scale.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: change_scale.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/footer.xhp b/helpcontent2/source/text/simpress/guide/footer.xhp
index c5f3061fb0..82c8099265 100644
--- a/helpcontent2/source/text/simpress/guide/footer.xhp
+++ b/helpcontent2/source/text/simpress/guide/footer.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footer.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/gluepoints.xhp b/helpcontent2/source/text/simpress/guide/gluepoints.xhp
index 3ac8fba818..cd3a066386 100644
--- a/helpcontent2/source/text/simpress/guide/gluepoints.xhp
+++ b/helpcontent2/source/text/simpress/guide/gluepoints.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gluepoints.xhp,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/html_export.xhp b/helpcontent2/source/text/simpress/guide/html_export.xhp
index 685f578842..8dad212cb2 100755
--- a/helpcontent2/source/text/simpress/guide/html_export.xhp
+++ b/helpcontent2/source/text/simpress/guide/html_export.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: html_export.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/html_import.xhp b/helpcontent2/source/text/simpress/guide/html_import.xhp
index 4a59b79542..143fdcade5 100755
--- a/helpcontent2/source/text/simpress/guide/html_import.xhp
+++ b/helpcontent2/source/text/simpress/guide/html_import.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: html_import.xhp,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 8758f6fe5b..9b68a790ab 100755
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: individual.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -86,7 +83,7 @@
 <paragraph role="heading" id="hd_id3150335" xml-lang="en-US" level="3" l10n="U" oldref="65">To always start a slide show from the current slide:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155932" xml-lang="en-US" l10n="U" oldref="67">In the <emph>Start presentation</emph> area, select the <emph>Always with current page</emph> check box.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/keyboard.xhp b/helpcontent2/source/text/simpress/guide/keyboard.xhp
index 48d2b02ef7..65ec8c059b 100644
--- a/helpcontent2/source/text/simpress/guide/keyboard.xhp
+++ b/helpcontent2/source/text/simpress/guide/keyboard.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/layer_move.xhp b/helpcontent2/source/text/simpress/guide/layer_move.xhp
index 7a7babd0e4..78559e293f 100755
--- a/helpcontent2/source/text/simpress/guide/layer_move.xhp
+++ b/helpcontent2/source/text/simpress/guide/layer_move.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layer_move.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/layer_new.xhp b/helpcontent2/source/text/simpress/guide/layer_new.xhp
index cb265873ae..06e297c8c2 100644
--- a/helpcontent2/source/text/simpress/guide/layer_new.xhp
+++ b/helpcontent2/source/text/simpress/guide/layer_new.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layer_new.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/layer_tipps.xhp b/helpcontent2/source/text/simpress/guide/layer_tipps.xhp
index d1255adec0..463b5a1892 100644
--- a/helpcontent2/source/text/simpress/guide/layer_tipps.xhp
+++ b/helpcontent2/source/text/simpress/guide/layer_tipps.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layer_tipps.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/layers.xhp b/helpcontent2/source/text/simpress/guide/layers.xhp
index e65379a253..699b6920b8 100755
--- a/helpcontent2/source/text/simpress/guide/layers.xhp
+++ b/helpcontent2/source/text/simpress/guide/layers.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layers.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp b/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
index e790f2a74a..20b8e7c895 100755
--- a/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: line_arrow_styles.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,52 +29,55 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsimpressguideline_arrow_stylesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Loading Line and Arrow Styles</title>
-<filename>/text/simpress/guide/line_arrow_styles.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsimpressguideline_arrow_stylesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Loading Line and Arrow Styles</title>
+         <filename>/text/simpress/guide/line_arrow_styles.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145253"><bookmark_value>line styles;loading</bookmark_value>
-<bookmark_value>lines;about line ends</bookmark_value>
-<bookmark_value>arrows;loading arrow styles</bookmark_value>
-<bookmark_value>styles;arrow and line styles</bookmark_value>
-<bookmark_value>loading;arrow and line styles</bookmark_value>
-</bookmark><comment>mw changed "line ends;" to "lines;"</comment><paragraph role="heading" id="hd_id3145253" xml-lang="en-US" level="1" l10n="U" oldref="48"><variable id="line_arrow_styles"><link href="text/simpress/guide/line_arrow_styles.xhp" name="Loading Line and Arrow Styles">Loading Line and Arrow Styles</link>
+      <bookmark_value>lines;about line ends</bookmark_value>
+      <bookmark_value>arrows;loading arrow styles</bookmark_value>
+      <bookmark_value>styles;arrow and line styles</bookmark_value>
+      <bookmark_value>loading;arrow and line styles</bookmark_value>
+</bookmark><comment>mw changed "line ends;" to "lines;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145253" role="heading" level="1" l10n="U"
+                 oldref="48"><variable id="line_arrow_styles"><link href="text/simpress/guide/line_arrow_styles.xhp" name="Loading Line and Arrow Styles">Loading Line and Arrow Styles</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="CHG" oldref="49">You can use styles to organize similar line and arrow types. $[officename] provides a few standard style files that you can load and use in your document. If you want, you can add or delete elements from a style file, or even create a custom style file.</paragraph>
-<paragraph role="heading" id="hd_id3154485" xml-lang="en-US" level="3" l10n="U" oldref="50">To load a line styles file:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US" l10n="CHG" oldref="58">Choose <emph>Format - Line</emph>, and then click the <emph>Line Styles</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154705" xml-lang="en-US" l10n="U" oldref="51">Click the <emph>Load Line Styles</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145588" xml-lang="en-US" l10n="U" oldref="52">Locate the file containing the line styles that you want to load, and then click <emph>OK</emph>. The file has the format [filename].sod.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US" l10n="U" oldref="53">To save a line styles file, click the <emph>Save Line Styles</emph> button, enter a filename, and then click <emph>OK</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="3" l10n="U" oldref="54">To load an arrow styles file:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153070" xml-lang="en-US" l10n="CHG" oldref="59">Choose <emph>Format - Line</emph>, and then click the <emph>Arrow Styles</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149054" xml-lang="en-US" l10n="U" oldref="55">Click the <emph>Load Arrow Styles</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150391" xml-lang="en-US" l10n="U" oldref="56">Locate the file containing the line styles that you want to load, and then click <emph>OK</emph>. The file has the format [filename].sod.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3166465" xml-lang="en-US" l10n="CHG" oldref="57">To save an arrow styles file, click the <emph>Save Arrow Styles</emph> button, enter a filename, and then click <emph>OK</emph>.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3145822" xml-lang="en-US" l10n="CHG"><link href="text/shared/01/05200000.xhp" name="Format - Line">Format - Line</link></paragraph>
-<embed href="text/simpress/guide/palette_files.xhp#palette_files"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154017" role="paragraph" l10n="CHG" oldref="49">You can use styles to organize similar line and arrow types. $[officename] provides a few standard style files that you can load and use in your document. If you want, you can add or delete elements from a style file, or even create a custom style file.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154485" role="heading" level="2" l10n="U"
+                 oldref="50">To load a line styles file:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156382" role="listitem" l10n="CHG" oldref="58">Choose <emph>Format - Line</emph>, and then click the <emph>Line Styles</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154705" role="listitem" l10n="U" oldref="51">Click the <emph>Load Line Styles</emph> button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145588" role="listitem" l10n="U" oldref="52">Locate the file containing the line styles that you want to load, and then click <emph>OK</emph>. The file has the format [filename].sod.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3151240" role="paragraph" l10n="U" oldref="53">To save a line styles file, click the <emph>Save Line Styles</emph> button, enter a filename, and then click <emph>OK</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154765" role="heading" level="2" l10n="U"
+                 oldref="54">To load an arrow styles file:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153070" role="listitem" l10n="CHG" oldref="59">Choose <emph>Format - Line</emph>, and then click the <emph>Arrow Styles</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149054" role="listitem" l10n="U" oldref="55">Click the <emph>Load Arrow Styles</emph> button.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150391" role="listitem" l10n="CHG" oldref="56">Locate the file containing the arrow styles that you want to load, and then click <emph>OK</emph>. The file has the format [filename].soe.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3166465" role="paragraph" l10n="CHG" oldref="57">To save an arrow styles file, click the <emph>Save Arrow Styles</emph> button, enter a filename, and then click <emph>OK</emph>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3145822" role="paragraph" l10n="CHG"><link href="text/shared/01/05200000.xhp" name="Format - Line">Format - Line</link></paragraph>
+      <embed href="text/simpress/guide/palette_files.xhp#palette_files"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/guide/line_draw.xhp b/helpcontent2/source/text/simpress/guide/line_draw.xhp
index 5053b0f8ce..65d4082ff0 100644
--- a/helpcontent2/source/text/simpress/guide/line_draw.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_draw.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: line_draw.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/line_edit.xhp b/helpcontent2/source/text/simpress/guide/line_edit.xhp
index 3261b51544..7de673fae1 100644
--- a/helpcontent2/source/text/simpress/guide/line_edit.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_edit.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: line_edit.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/main.xhp b/helpcontent2/source/text/simpress/guide/main.xhp
index a8af807585..c1dd2d6a9d 100755
--- a/helpcontent2/source/text/simpress/guide/main.xhp
+++ b/helpcontent2/source/text/simpress/guide/main.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/makefile.mk b/helpcontent2/source/text/simpress/guide/makefile.mk
index 0cd15d045b..5b68ee402f 100644
--- a/helpcontent2/source/text/simpress/guide/makefile.mk
+++ b/helpcontent2/source/text/simpress/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -87,4 +83,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/simpress/guide/masterpage.xhp b/helpcontent2/source/text/simpress/guide/masterpage.xhp
index 42aefdc061..8439972e85 100755
--- a/helpcontent2/source/text/simpress/guide/masterpage.xhp
+++ b/helpcontent2/source/text/simpress/guide/masterpage.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpage.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/move_object.xhp b/helpcontent2/source/text/simpress/guide/move_object.xhp
index 610c14a093..225fba6aa4 100755
--- a/helpcontent2/source/text/simpress/guide/move_object.xhp
+++ b/helpcontent2/source/text/simpress/guide/move_object.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: move_object.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/orgchart.xhp b/helpcontent2/source/text/simpress/guide/orgchart.xhp
index 8a8c083f5a..7fd8e25081 100755
--- a/helpcontent2/source/text/simpress/guide/orgchart.xhp
+++ b/helpcontent2/source/text/simpress/guide/orgchart.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orgchart.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/page_copy.xhp b/helpcontent2/source/text/simpress/guide/page_copy.xhp
index 9f938e02ce..9ea0d5b7c0 100755
--- a/helpcontent2/source/text/simpress/guide/page_copy.xhp
+++ b/helpcontent2/source/text/simpress/guide/page_copy.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: page_copy.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/palette_files.xhp b/helpcontent2/source/text/simpress/guide/palette_files.xhp
index d87b8a00c9..8a7e6a92b2 100755
--- a/helpcontent2/source/text/simpress/guide/palette_files.xhp
+++ b/helpcontent2/source/text/simpress/guide/palette_files.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: palette_files.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/print_tofit.xhp b/helpcontent2/source/text/simpress/guide/print_tofit.xhp
index cd00667c63..75748268f9 100755
--- a/helpcontent2/source/text/simpress/guide/print_tofit.xhp
+++ b/helpcontent2/source/text/simpress/guide/print_tofit.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_tofit.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/printing.xhp b/helpcontent2/source/text/simpress/guide/printing.xhp
index 7db7eb0a52..fd1b6bb6a3 100755
--- a/helpcontent2/source/text/simpress/guide/printing.xhp
+++ b/helpcontent2/source/text/simpress/guide/printing.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printing.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,108 +31,108 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textsimpressguideprintingxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Presentations</title>
-<filename>/text/simpress/guide/printing.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsimpressguideprintingxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing Presentations</title>
+         <filename>/text/simpress/guide/printing.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>printing; presentations</bookmark_value>
-<bookmark_value>slides; printing</bookmark_value>
-<bookmark_value>notes; printing in presentations</bookmark_value>
-<bookmark_value>outlines; printing</bookmark_value>
-<bookmark_value>presentations; printing</bookmark_value>
-<bookmark_value>tiled printing of slides</bookmark_value>
-<bookmark_value>changing;layout for handouts</bookmark_value>
-<bookmark_value>handout printing</bookmark_value>
-<bookmark_value>layout;printing handouts</bookmark_value>
-</bookmark><comment>MW made "handouts;.." a one level entry and added "layout;..."</comment><paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="printing"><link href="text/simpress/guide/printing.xhp" name="Printing Presentations">Printing Presentations</link>
+      <bookmark_value>slides; printing</bookmark_value>
+      <bookmark_value>notes; printing in presentations</bookmark_value>
+      <bookmark_value>outlines; printing</bookmark_value>
+      <bookmark_value>presentations; printing</bookmark_value>
+      <bookmark_value>tiled printing of slides</bookmark_value>
+      <bookmark_value>changing;layout for handouts</bookmark_value>
+      <bookmark_value>handout printing</bookmark_value>
+      <bookmark_value>layout;printing handouts</bookmark_value>
+</bookmark><comment>MW made "handouts;.." a one level entry and added "layout;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U" oldref="1"><variable id="printing"><link href="text/simpress/guide/printing.xhp" name="Printing Presentations">Printing Presentations</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3154486" xml-lang="en-US" level="2" l10n="U" oldref="2">Default printer settings</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="3">To set the default printing options for $[officename] Impress, choose <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153914" xml-lang="en-US" level="2" l10n="U" oldref="5">Setting printer options for the current presentation</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154651" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>File - Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149870" xml-lang="en-US" l10n="U" oldref="7">Click <emph>Options</emph>, and then select the printer options.</paragraph>
-<paragraph role="listitem" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="8">These settings override the default printer options in <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph> for the current print job only.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id4555192" xml-lang="en-US" level="2" l10n="NEW">Choosing a print layout for handouts</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7197790" xml-lang="en-US" l10n="CHG">Choose <item type="menuitem">File - Print</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1104159" xml-lang="en-US" l10n="CHG">On the Print dialog, select the "Handout" entry from the Content listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9354533" xml-lang="en-US" l10n="NEW">Select the number of slides to print per page of paper.</paragraph>
-<paragraph role="paragraph" id="par_id8286080" xml-lang="en-US" l10n="NEW">You see a preview of layouts of one to nine slides per page.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id6556596" xml-lang="en-US" level="2" l10n="NEW">Defining print options for handouts</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6744285" xml-lang="en-US" l10n="NEW">Click the Handout tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id996734" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Page Number</emph> to open the <emph>Header and Footer</emph> dialog box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6752220" xml-lang="en-US" l10n="NEW">Click <emph>Notes and Handouts</emph> to enter the header and footer text for handouts.</paragraph>
-<paragraph role="paragraph" id="par_id5703909" xml-lang="en-US" l10n="NEW">You see four areas on this dialog with check boxes for Header, Date and time, Footer, and Page number. These four areas correspond to the four areas in the corners of the handout master view.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4984282" xml-lang="en-US" l10n="NEW">Enter text for header, footer, and date. Check the <emph>Page number</emph> box, if you want to number the handout pages. Ensure the <emph>Header</emph> check box is enabled if you want your header text to be printed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id816064" xml-lang="en-US" l10n="NEW">Click <emph>Apply to All</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id863063" xml-lang="en-US" l10n="NEW">The fields in the handout master view on screen are not updated, but the text that you entered will be printed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id5036164" xml-lang="en-US" level="2" l10n="CHG">Printing handouts or notes</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2901394" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - Print</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5674611" xml-lang="en-US" l10n="CHG">Click the Contents listbox and select the type of contents to print.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1308023" xml-lang="en-US" l10n="CHG">Select <emph>Handouts</emph> or <emph>Notes</emph> and select the number of slides to print on each page of paper.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id6821192" xml-lang="en-US" l10n="NEW">If you want another layout of the slides on the printed paper pages, use the mouse to move the slides around on the Handout view.</paragraph>
-<paragraph role="heading" id="hd_id3151389" xml-lang="en-US" level="2" l10n="U" oldref="11">Printing a range of slides</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146318" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>View - Slide Sorter</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166465" xml-lang="en-US" l10n="U" oldref="13">Hold down Shift, and click the range of slides that you want to print.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>File - Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150746" xml-lang="en-US" l10n="U" oldref="16">In the <emph>Print range </emph>area, click <emph>Pages</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154561" xml-lang="en-US" l10n="CHG" oldref="17">Enter the slide numbers you want to print, and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
-<embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
-</section>
-</body>
+      <paragraph xml-lang="en-US" id="hd_id3154486" role="heading" level="1" l10n="U" oldref="2">Default printer settings</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156385" role="listitem" l10n="U" oldref="3">To set the default printing options for $[officename] Impress, choose <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153914" role="heading" level="1" l10n="U" oldref="5">Setting printer options for the current presentation</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154651" role="listitem" l10n="U" oldref="6">Choose <emph>File - Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149870" role="listitem" l10n="U" oldref="7">Click the <emph>%PRODUCTNAME Impress</emph> or the <emph>Options</emph> tab page, and then select the printer options.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150431" role="listitem" l10n="U" oldref="8">These settings override the default printer options in <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph> for the current print job only.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id4555192" role="heading" level="1" l10n="NEW">Choosing a print layout for handouts</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7197790" role="paragraph" l10n="CHG">Choose <item type="menuitem">File - Print</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1104159" role="paragraph" l10n="CHG">On the <emph>General</emph> tab page of the <emph>Print</emph> dialog, select the "Handouts" entry from the Document listbox.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9354533" role="paragraph" l10n="NEW">Select the number of slides to print per page of paper.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id6556596" role="heading" level="1" l10n="NEW">Defining print options for handouts</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6744285" role="paragraph" l10n="NEW">Click the Handout tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id996734" role="paragraph" l10n="NEW">Choose <emph>Insert - Page Number</emph> to open the <emph>Header and Footer</emph> dialog box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6752220" role="paragraph" l10n="NEW">Click <emph>Notes and Handouts</emph> to enter the header and footer text for handouts.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id5703909" role="paragraph" l10n="NEW">You see four areas on this dialog with check boxes for Header, Date and time, Footer, and Page number. These four areas correspond to the four areas in the corners of the handout master view.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4984282" role="paragraph" l10n="NEW">Enter text for header, footer, and date. Check the <emph>Page number</emph> box, if you want to number the handout pages. Ensure the <emph>Header</emph> check box is enabled if you want your header text to be printed.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id816064" role="paragraph" l10n="NEW">Click <emph>Apply to All</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id863063" role="paragraph" l10n="NEW">The fields in the handout master view on screen are not updated, but the text that you entered will be printed.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id5036164" role="heading" level="1" l10n="CHG">Printing handouts or notes</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2901394" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Print</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5674611" role="paragraph" l10n="CHG">Click the Document listbox and select the type of contents to print.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1308023" role="paragraph" l10n="CHG">Select <emph>Handouts</emph> or <emph>Notes</emph> and select the number of slides to print on each page of paper.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id6821192" role="tip" l10n="NEW">If you want another layout of the slides on the printed paper pages, use the mouse to move the slides around on the Handout view.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151389" role="heading" level="1" l10n="U"
+                 oldref="11">Printing a range of slides</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146318" role="listitem" l10n="U" oldref="12">Choose <emph>View - Slide Sorter</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3166465" role="listitem" l10n="U" oldref="13">Hold down Shift, and click the range of slides that you want to print.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3157875" role="listitem" l10n="U" oldref="14">Choose <emph>File - Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150746" role="listitem" l10n="U" oldref="16">In the <emph>Range and copies</emph> area, click <emph>Slides</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154561" role="listitem" l10n="CHG" oldref="17">Enter the slide numbers you want to print, and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
+         <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp b/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
index e12ee249a6..f1e045c192 100644
--- a/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
+++ b/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rehearse_timings.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/select_object.xhp b/helpcontent2/source/text/simpress/guide/select_object.xhp
index d7b45299a0..5bae78d335 100755
--- a/helpcontent2/source/text/simpress/guide/select_object.xhp
+++ b/helpcontent2/source/text/simpress/guide/select_object.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: select_object.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/show.xhp b/helpcontent2/source/text/simpress/guide/show.xhp
index ba2375bcbb..17ad9f9095 100644
--- a/helpcontent2/source/text/simpress/guide/show.xhp
+++ b/helpcontent2/source/text/simpress/guide/show.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: show.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
 <paragraph role="paragraph" id="par_id6860255" xml-lang="en-US" l10n="NEW">Choose <emph>Slide Show - Slide Show</emph> to run the show.</paragraph>
 </listitem>
 </list>
-<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
+<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
 <list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3209936" xml-lang="en-US" l10n="NEW">Click to advance to the next effect or to the next slide.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/table_insert.xhp b/helpcontent2/source/text/simpress/guide/table_insert.xhp
index dd6f1140ed..f368048d76 100644
--- a/helpcontent2/source/text/simpress/guide/table_insert.xhp
+++ b/helpcontent2/source/text/simpress/guide/table_insert.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_insert.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,9 +53,9 @@
 <paragraph role="paragraph" id="par_id3044526" xml-lang="en-US" l10n="NEW">Insert a new table as an OLE object or insert an existing file as an OLE object - you can specify the link to a file to be a live link to the latest data saved in a spreadsheet file.</paragraph>
 </listitem>
 </list><comment>Insert table dialog - Number of columns</comment>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_COLUMNS" id="bm_id0916200804233391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS" id="bm_id0916200804233391" localize="false"/>
 <paragraph role="paragraph" id="par_id137333" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of columns for the new table.</ahelp></paragraph><comment>Insert table dialog - Number of rows</comment>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_ROWS" id="bm_id0916200804240464" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS" id="bm_id0916200804240464" localize="false"/>
 <paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of rows for the new table.</ahelp></paragraph><comment>Contextmenu of a table in Impress and Draw</comment><comment>Cell</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:CellMenu" id="bm_id0916200803192795" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551581" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/text2curve.xhp b/helpcontent2/source/text/simpress/guide/text2curve.xhp
index 9a05207dad..5496d400d8 100755
--- a/helpcontent2/source/text/simpress/guide/text2curve.xhp
+++ b/helpcontent2/source/text/simpress/guide/text2curve.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text2curve.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/guide/vectorize.xhp b/helpcontent2/source/text/simpress/guide/vectorize.xhp
index b691871e32..6009018fe3 100755
--- a/helpcontent2/source/text/simpress/guide/vectorize.xhp
+++ b/helpcontent2/source/text/simpress/guide/vectorize.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vectorize.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0000.xhp b/helpcontent2/source/text/simpress/main0000.xhp
index 9485975c88..267b287c9d 100755
--- a/helpcontent2/source/text/simpress/main0000.xhp
+++ b/helpcontent2/source/text/simpress/main0000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0100.xhp b/helpcontent2/source/text/simpress/main0100.xhp
index bbc8e35ad1..48ad1eede8 100755
--- a/helpcontent2/source/text/simpress/main0100.xhp
+++ b/helpcontent2/source/text/simpress/main0100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0101.xhp b/helpcontent2/source/text/simpress/main0101.xhp
index cf6d32461d..6dc10ab748 100755
--- a/helpcontent2/source/text/simpress/main0101.xhp
+++ b/helpcontent2/source/text/simpress/main0101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0101.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0102.xhp b/helpcontent2/source/text/simpress/main0102.xhp
index 0d09d0c21c..435801d61a 100755
--- a/helpcontent2/source/text/simpress/main0102.xhp
+++ b/helpcontent2/source/text/simpress/main0102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0103.xhp b/helpcontent2/source/text/simpress/main0103.xhp
index be05aee654..4100f89ea8 100755
--- a/helpcontent2/source/text/simpress/main0103.xhp
+++ b/helpcontent2/source/text/simpress/main0103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0103.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0104.xhp b/helpcontent2/source/text/simpress/main0104.xhp
index 4f894cec2e..8ffbe17d17 100755
--- a/helpcontent2/source/text/simpress/main0104.xhp
+++ b/helpcontent2/source/text/simpress/main0104.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0104.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,46 +29,51 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsimpressmain0104xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert</title>
-<filename>/text/simpress/main0104.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einfuegen">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2743919" localize="false"/><paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/main0104.xhp" name="Insert">Insert</link></paragraph>
-<paragraph role="paragraph" id="par_id3146971" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains the commands that are used to insert new elements into the document, for example, graphics, objects, special characters and other files.</ahelp></paragraph>
-</section>
-<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/simpress/01/04010000.xhp" name="Slide">Slide</link></paragraph>
-<embed href="text/simpress/01/04010000.xhp#seitetext"/>
-<embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
-<embed href="text/simpress/01/04130000.xhp#seitegliederung"/>
-<embed href="text/simpress/01/04140000.xhp#uebersicht"/>
-<paragraph role="heading" id="par_idN105C7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/03152000.xhp">Page Number</link></paragraph>
-<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW">Adds the slide number or the page number.</paragraph>
-<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/03152000.xhp">Date and Time</link></paragraph>
-<paragraph role="paragraph" id="par_idN10624" xml-lang="en-US" l10n="NEW">Adds the date and time as a field.</paragraph>
-<embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
-<paragraph role="heading" id="hd_id3153964" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
-<embed href="text/shared/01/04100000.xhp#sonder"/>
-<embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
-<paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-<embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
-<paragraph role="heading" id="par_idN10651" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/06050000.xhp">Animated Image</link><comment>UFI: renamed and moved from main0114, spec "presentation engine for q"</comment></paragraph>
-<embed href="text/simpress/01/06050000.xhp#animtext"/>
-<paragraph role="heading" id="hd_id3145768" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
-<embed href="text/simpress/01/04080100.xhp#tabelletext"/>
-<embed href="text/shared/01/04990000.xhp#grafik"/>
-<embed href="text/shared/01/moviesound.xhp#moviesound"/>
-<embed href="text/shared/01/04150000.xhp#objekt"/>
-<paragraph role="heading" id="hd_id3143232" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
-<paragraph role="heading" id="hd_id3153812" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
-<embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
-<paragraph role="heading" id="hd_id3149050" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-<embed href="text/simpress/01/04110000.xhp#dateitext"/>
-</body>
-</helpdocument>
+      <topic id="textsimpressmain0104xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Insert</title>
+         <filename>/text/simpress/main0104.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einfuegen">
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2743919" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1" l10n="U" oldref="1"><link href="text/simpress/main0104.xhp" name="Insert">Insert</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3146971" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">This menu contains the commands that are used to insert new elements into the document, for example, graphics, objects, special characters and other files.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3145801" role="heading" level="2" l10n="U" oldref="3"><link href="text/simpress/01/04010000.xhp" name="Slide">Slide</link></paragraph>
+      <embed href="text/simpress/01/04010000.xhp#seitetext"/>
+      <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
+      <embed href="text/simpress/01/04130000.xhp#seitegliederung"/>
+      <embed href="text/simpress/01/04140000.xhp#uebersicht"/>
+      <paragraph xml-lang="en-US" id="par_idN105C7" role="heading" level="2" l10n="NEW"><link href="text/simpress/01/03152000.xhp">Page Number</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10609" role="paragraph" l10n="NEW">Adds the slide number or the page number.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105D7" role="heading" level="2" l10n="NEW"><link href="text/simpress/01/03152000.xhp">Date and Time</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10624" role="paragraph" l10n="NEW">Adds the date and time as a field.</paragraph>
+      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+      <paragraph xml-lang="en-US" id="hd_id0915200910362363" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3153964" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
+      <embed href="text/shared/01/04100000.xhp#sonder"/>
+      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
+      <paragraph xml-lang="en-US" id="hd_id3145790" role="heading" level="2" l10n="U"
+                 oldref="10"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
+      <paragraph xml-lang="en-US" id="par_idN10651" role="heading" level="2" l10n="NEW"><link href="text/simpress/01/06050000.xhp">Animated Image</link><comment>UFI: renamed and moved from main0114, spec "presentation engine for q"</comment></paragraph>
+      <embed href="text/simpress/01/06050000.xhp#animtext"/>
+      <paragraph xml-lang="en-US" id="hd_id3145768" role="heading" level="2" l10n="CHG"
+                 oldref="5"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
+      <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
+      <embed href="text/shared/01/04990000.xhp#grafik"/>
+      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
+      <embed href="text/shared/01/04150000.xhp#objekt"/>
+      <paragraph xml-lang="en-US" id="hd_id3143232" role="heading" level="2" l10n="U" oldref="7"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200904013251" role="paragraph" l10n="NEW">Inserts a chart.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153812" role="heading" level="2" l10n="U" oldref="8"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+      <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3149050" role="heading" level="2" l10n="U" oldref="9"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
+      <embed href="text/simpress/01/04110000.xhp#dateitext"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/main0105.xhp b/helpcontent2/source/text/simpress/main0105.xhp
index 98c93d49a8..873985aa4a 100755
--- a/helpcontent2/source/text/simpress/main0105.xhp
+++ b/helpcontent2/source/text/simpress/main0105.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0105.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0106.xhp b/helpcontent2/source/text/simpress/main0106.xhp
index 893a021172..37b31e16ca 100755
--- a/helpcontent2/source/text/simpress/main0106.xhp
+++ b/helpcontent2/source/text/simpress/main0106.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0107.xhp b/helpcontent2/source/text/simpress/main0107.xhp
index c07a234dc1..dfc276ae24 100755
--- a/helpcontent2/source/text/simpress/main0107.xhp
+++ b/helpcontent2/source/text/simpress/main0107.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0107.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0113.xhp b/helpcontent2/source/text/simpress/main0113.xhp
index aeded5bdcd..c2faf7b1e6 100755
--- a/helpcontent2/source/text/simpress/main0113.xhp
+++ b/helpcontent2/source/text/simpress/main0113.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0113.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0114.xhp b/helpcontent2/source/text/simpress/main0114.xhp
index 1c82312fb6..8a205ac6e3 100755
--- a/helpcontent2/source/text/simpress/main0114.xhp
+++ b/helpcontent2/source/text/simpress/main0114.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0114.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp
index dc14962c12..7f35cd873a 100755
--- a/helpcontent2/source/text/simpress/main0200.xhp
+++ b/helpcontent2/source/text/simpress/main0200.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0200.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpressmain0200xml" indexer="include" status="PUBLISH">
@@ -54,6 +51,9 @@
 <section id="Section1">
 <embed href="text/shared/main0201.xhp#funktionsleiste"/>
 </section>
+<section id="present">
+<embed href="text/simpress/01/03070000.xhp#praesentation"/>
+</section>
 <section id="Section2">
 <embed href="text/simpress/main0210.xhp#werkzeugleiste"/>
 </section>
@@ -95,6 +95,7 @@
 </section>
 <section id="Section15">
 <embed href="text/simpress/02/10110000.xhp#einfuegen"/>
+<paragraph role="paragraph" id="par_id31474099" xml-lang="en-US" l10n="NEW">Add objects, including charts, spreadsheets, and images, to your document.</paragraph>
 </section>
 </sort>
 </body>
diff --git a/helpcontent2/source/text/simpress/main0202.xhp b/helpcontent2/source/text/simpress/main0202.xhp
index de04525498..9358908c17 100755
--- a/helpcontent2/source/text/simpress/main0202.xhp
+++ b/helpcontent2/source/text/simpress/main0202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0202.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0203.xhp b/helpcontent2/source/text/simpress/main0203.xhp
index 199a80a264..26d59b6a8c 100644
--- a/helpcontent2/source/text/simpress/main0203.xhp
+++ b/helpcontent2/source/text/simpress/main0203.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0203.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,49 +27,47 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsimpressmain0203xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Text Formatting Bar</title>
-<filename>/text/simpress/main0203.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T12:03:06">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="objektleistetext">
-<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/main0203.xhp" name="Text Formatting Bar">Text Formatting Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3152597" xml-lang="en-US" l10n="CHG" oldref="2">To display the <emph>Text Formatting</emph> Bar, place the cursor inside a text object.</paragraph>
-</section>
-<embed href="text/shared/02/02020000.xhp#schriftart"/>
-<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
-<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<embed href="text/shared/01/05110100.xhp#fett"/>
-<embed href="text/shared/00/00040502.xhp#syfett"/>
-<embed href="text/shared/01/05110200.xhp#kursiv"/>
-<embed href="text/shared/00/00040502.xhp#sykursiv"/>
-<embed href="text/shared/01/05110300.xhp#unter"/>
-<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<paragraph role="heading" id="hd_id3151391" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/05020200.xhp" name="Font Color">Font Color</link></paragraph>
-<embed href="text/shared/01/05020200.xhp#textfarbe"/>
-<embed href="text/shared/00/00000004.xhp#sytextfarbe"/>
-<embed href="text/shared/01/05080100.xhp#links"/>
-<embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
-<embed href="text/shared/01/05080300.xhp#zentriert"/>
-<embed href="text/shared/00/00040502.xhp#syzentriert"/>
-<embed href="text/shared/01/05080200.xhp#rechts"/>
-<embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
-<embed href="text/shared/01/05080400.xhp#block"/>
-<embed href="text/shared/00/00040502.xhp#syblocksatz"/>
-<embed href="text/shared/02/03110000.xhp#abstanderhoehen"/>
-<embed href="text/shared/02/03110000.xhp#syabstanderhoehen"/>
-<embed href="text/shared/02/03120000.xhp#abstandvermindern"/>
-<embed href="text/shared/02/03120000.xhp#syabstandvermindern"/>
+      <topic id="textsimpressmain0203xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Text Formatting Bar</title>
+         <filename>/text/simpress/main0203.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="objektleistetext">
+         <paragraph xml-lang="en-US" id="hd_id3150010" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/simpress/main0203.xhp" name="Text Formatting Bar">Text Formatting Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152597" role="paragraph" l10n="CHG" oldref="2">To display the <emph>Text Formatting</emph> Bar, place the cursor inside a text object.</paragraph>
+      </section>
+      <embed href="text/shared/02/02020000.xhp#schriftart"/>
+      <embed href="text/shared/02/02020000.xhp#syschriftart"/>
+      <embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
+      <embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
+      <embed href="text/shared/01/05110100.xhp#fett"/>
+      <embed href="text/shared/00/00040502.xhp#syfett"/>
+      <embed href="text/shared/01/05110200.xhp#kursiv"/>
+      <embed href="text/shared/00/00040502.xhp#sykursiv"/>
+      <embed href="text/shared/01/05110300.xhp#unter"/>
+      <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+      <paragraph xml-lang="en-US" id="hd_id3151391" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/05020200.xhp" name="Font Color">Font Color</link></paragraph>
+      <embed href="text/shared/01/05020200.xhp#textfarbe"/>
+      <embed href="text/shared/00/00000004.xhp#sytextfarbe"/>
+      <embed href="text/shared/01/05080100.xhp#links"/>
+      <embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
+      <embed href="text/shared/01/05080300.xhp#zentriert"/>
+      <embed href="text/shared/00/00040502.xhp#syzentriert"/>
+      <embed href="text/shared/01/05080200.xhp#rechts"/>
+      <embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
+      <embed href="text/shared/01/05080400.xhp#block"/>
+      <embed href="text/shared/00/00040502.xhp#syblocksatz"/>
+      <embed href="text/shared/02/03110000.xhp#abstanderhoehen"/>
+      <embed href="text/shared/02/03110000.xhp#syabstanderhoehen"/>
+      <embed href="text/shared/02/03120000.xhp#abstandvermindern"/>
+      <embed href="text/shared/02/03120000.xhp#syabstandvermindern"/>
 <switch select="appl">
 <case select="DRAW"><embed href="text/shared/01/05120100.xhp#zeilen1"/>
 </case>
@@ -95,9 +91,8 @@
 <switch select="appl">
 <case select="DRAW"><embed href="text/shared/00/00000004.xhp#syzweizeilig"/>
 </case>
-</switch>
-<embed href="text/shared/02/06120000.xhp#aufzaehlung"/>
-<embed href="text/shared/02/06120000.xhp#syaufzaehlung"/>
+</switch><embed href="text/shared/02/06120000.xhp#aufzaehlung"/>
+      <embed href="text/shared/02/06120000.xhp#syaufzaehlung"/>
 <switch select="appl">
 <case select="IMPRESS"><embed href="text/shared/02/06060000.xhp#hochstufen"/>
 </case>
@@ -130,13 +125,13 @@
 <case select="IMPRESS"><embed href="text/shared/02/06110000.xhp#syhinunterschieben"/>
 </case>
 </switch>
-<paragraph role="heading" id="hd_id3154645" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></paragraph>
-<embed href="text/shared/01/05020000.xhp#zeichentext"/>
-<embed href="text/shared/00/00040500.xhp#syzeich"/>
-<paragraph role="heading" id="hd_id3149984" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05030000.xhp" name="Paragraph">Paragraph</link></paragraph>
-<embed href="text/shared/01/05030000.xhp#absatztext"/>
-<embed href="text/shared/00/00040500.xhp#syabsatz"/>
-<paragraph role="heading" id="hd_id3153619" xml-lang="en-US" level="2" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="IMPRESS"><link href="text/shared/01/06050000.xhp" name="Numbering Symbols">Numbering Symbols</link>
+<paragraph xml-lang="en-US" id="hd_id3154645" role="heading" level="2" l10n="U" oldref="5"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></paragraph>
+      <embed href="text/shared/01/05020000.xhp#zeichentext"/>
+      <embed href="text/shared/00/00040500.xhp#syzeich"/>
+      <paragraph xml-lang="en-US" id="hd_id3149984" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/05030000.xhp" name="Paragraph">Paragraph</link></paragraph>
+      <embed href="text/shared/01/05030000.xhp#absatztext"/>
+      <embed href="text/shared/00/00040500.xhp#syabsatz"/>
+      <paragraph xml-lang="en-US" id="hd_id3153619" role="heading" level="2" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="IMPRESS"><link href="text/shared/01/06050000.xhp" name="Numbering Symbols">Numbering Symbols</link>
 </caseinline></switchinline></paragraph>
 <switch select="appl">
 <case select="IMPRESS"><embed href="text/shared/01/06050000.xhp#numauftext"/>
@@ -145,11 +140,16 @@
 <switch select="appl">
 <case select="IMPRESS"><embed href="text/shared/00/00040500.xhp#synumauf"/>
 </case>
-</switch>
-<embed href="text/shared/00/00000007.xhp#asia"/>
-<embed href="text/shared/02/02040000.xhp#textlire"/>
-<embed href="text/shared/02/02040000.xhp#sytextlire"/>
-<embed href="text/shared/02/02050000.xhp#textobun"/>
-<embed href="text/shared/02/02050000.xhp#sytextobun"/>
-</body>
-</helpdocument>
+</switch><embed href="text/shared/00/00000007.xhp#asia"/>
+      <embed href="text/shared/02/02040000.xhp#textlire"/>
+      <embed href="text/shared/02/02040000.xhp#sytextlire"/>
+      <embed href="text/shared/02/02050000.xhp#textobun"/>
+      <embed href="text/shared/02/02050000.xhp#sytextobun"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Grow" id="bm_id0122200902451213" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0122200903104143" role="heading" level="2" l10n="NEW">Increase Font</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0122200903104255" role="paragraph" l10n="NEW"><ahelp hid=".">Increases the font size of the selected text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Shrink" id="bm_id0122200902452932" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0122200903104228" role="heading" level="2" l10n="NEW">Reduce Font</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0122200903104247" role="paragraph" l10n="NEW"><ahelp hid=".">Reduces the font size of the selected text.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/main0204.xhp b/helpcontent2/source/text/simpress/main0204.xhp
index 988b4bacea..83510f28f1 100755
--- a/helpcontent2/source/text/simpress/main0204.xhp
+++ b/helpcontent2/source/text/simpress/main0204.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0204.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0206.xhp b/helpcontent2/source/text/simpress/main0206.xhp
index 9d992cb5e8..1a4554622a 100755
--- a/helpcontent2/source/text/simpress/main0206.xhp
+++ b/helpcontent2/source/text/simpress/main0206.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0206.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0209.xhp b/helpcontent2/source/text/simpress/main0209.xhp
index 4b8ab0441f..858ec84a44 100644
--- a/helpcontent2/source/text/simpress/main0209.xhp
+++ b/helpcontent2/source/text/simpress/main0209.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0209.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0210.xhp b/helpcontent2/source/text/simpress/main0210.xhp
index ca35e20a8b..86de5a1b46 100755
--- a/helpcontent2/source/text/simpress/main0210.xhp
+++ b/helpcontent2/source/text/simpress/main0210.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0210.xhp,v $
- * $Revision: 1.8.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,24 +27,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpressmain0210xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Drawing Bar</title>
 <filename>/text/simpress/main0210.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-08T12:41:24">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="werkzeugleiste">
-<bookmark xml-lang="en-US" branch="hid/RID_DRAW_TOOLBOX" id="bm_id3154492" localize="false"/>
+<!-- removed HID RID_DRAW_TOOLBOX -->
 <paragraph role="heading" id="hd_id3150342" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/main0210.xhp" name="Drawing Bar">Drawing Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="RID_DRAW_TOOLBOX">The <emph>Drawing</emph> bar contains frequently used editing tools. Click the arrow next to an icon to open a toolbar that contains additional commands.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The <emph>Drawing</emph> bar contains frequently used editing tools. Click the arrow next to an icon to open a toolbar that contains additional commands.</ahelp></paragraph>
+
 </section>
+<paragraph role="paragraph" id="par_id31502029" xml-lang="en-US" l10n="NEW">You can view the Drawing bar also from a text document or spreadsheet. The set of visible icons can be slightly different according to the current document type.</paragraph>
 <section id="markieren">
 <paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="3" l10n="U" oldref="3">Select</paragraph>
 <paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="4">To select an object on the current slide, click the <emph>Select</emph> tool (white arrow) on the Drawing bar, and then click the object.</paragraph>
@@ -71,6 +66,8 @@
 <embed href="text/simpress/02/10080000.xhp#kurve"/>
 <embed href="text/simpress/00/00000004.xhp#sykurve"/>
 <embed href="text/simpress/02/10100000.xhp#verbinder"/>
+<paragraph role="heading" id="par_idN107C8" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/02/10120000.xhp" name="Lines and Arrows">Lines and Arrows</link></paragraph>
+<paragraph role="paragraph" id="par_idN126D7" xml-lang="en-US" l10n="NEW">Opens the Arrows toolbar to insert lines and arrows.</paragraph>
 <embed href="text/simpress/02/10090000.xhp#objekte"/>
 <embed href="text/simpress/02/10090000.xhp#syobjekte"/>
 <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/simpress/main0211.xhp b/helpcontent2/source/text/simpress/main0211.xhp
index 0c730c1900..9b30d2a386 100755
--- a/helpcontent2/source/text/simpress/main0211.xhp
+++ b/helpcontent2/source/text/simpress/main0211.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0211.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0212.xhp b/helpcontent2/source/text/simpress/main0212.xhp
index 5d7ad35c76..6a9b8b4a40 100755
--- a/helpcontent2/source/text/simpress/main0212.xhp
+++ b/helpcontent2/source/text/simpress/main0212.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0212.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0213.xhp b/helpcontent2/source/text/simpress/main0213.xhp
index c9825ef8a5..b267487725 100755
--- a/helpcontent2/source/text/simpress/main0213.xhp
+++ b/helpcontent2/source/text/simpress/main0213.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0213.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0214.xhp b/helpcontent2/source/text/simpress/main0214.xhp
index 013764f9da..8b6d450324 100755
--- a/helpcontent2/source/text/simpress/main0214.xhp
+++ b/helpcontent2/source/text/simpress/main0214.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0214.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/main0503.xhp b/helpcontent2/source/text/simpress/main0503.xhp
index 061b8f2d83..50bbee1d17 100755
--- a/helpcontent2/source/text/simpress/main0503.xhp
+++ b/helpcontent2/source/text/simpress/main0503.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/simpress/makefile.mk b/helpcontent2/source/text/simpress/makefile.mk
index aa079f444a..ec94bb31bf 100644
--- a/helpcontent2/source/text/simpress/makefile.mk
+++ b/helpcontent2/source/text/simpress/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,4 +71,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/00/00000004.xhp b/helpcontent2/source/text/smath/00/00000004.xhp
index 3fa4ecad64..d15d1ea55a 100644
--- a/helpcontent2/source/text/smath/00/00000004.xhp
+++ b/helpcontent2/source/text/smath/00/00000004.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -159,12 +156,12 @@
 </section>
 <paragraph role="paragraph" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="83"><variable id="neuzeichnen">Choose <emph>View - AutoUpdate Display</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="69"><variable id="astopa">Choose <emph>View - Selection</emph>
+<paragraph role="paragraph" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="69"><variable id="astopa">Choose <emph>View - Formula Elements</emph>
 </variable></paragraph>
 <section id="astuop">
 <paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="CHG" oldref="70">Open the context menu in the Commands window - choose <emph>Unary/Binary Operators</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154106" xml-lang="en-US" l10n="U" oldref="71">Choose <emph>View - Selection -</emph> symbol in the Selection window:</paragraph>
+<paragraph role="paragraph" id="par_id3154106" xml-lang="en-US" l10n="U" oldref="71">Choose <emph>View - Formula Elements -</emph> symbol in the Formula Elements window:</paragraph>
 <table id="tbl_id3154602">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -181,7 +178,7 @@
 <section id="astbio">
 <paragraph role="paragraph" id="par_id3150360" xml-lang="en-US" l10n="U" oldref="73">Open the context menu in the Commands window - choose <emph>Relations</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="74">Choose <emph>View - Selection </emph>- in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="74">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
 <table id="tbl_id3152962">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -198,7 +195,7 @@
 <section id="astopop">
 <paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="37">Open the context menu in the Commands window - choose <emph>Operators</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3149342" xml-lang="en-US" l10n="U" oldref="76">Choose <emph>View - Selection </emph>- in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3149342" xml-lang="en-US" l10n="U" oldref="76">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
 <table id="tbl_id3154188">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -215,7 +212,7 @@
 <section id="astofu">
 <paragraph role="paragraph" id="par_id3149297" xml-lang="en-US" l10n="U" oldref="40">Open the context menu in the Commands window - choose <emph>Functions</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="77">Choose <emph>View - Selection</emph> - in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="77">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
 <table id="tbl_id3149490">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -232,7 +229,7 @@
 <section id="astofm">
 <paragraph role="paragraph" id="par_id3147092" xml-lang="en-US" l10n="U" oldref="43">Open the context menu in the Commands window - choose <emph>Brackets</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>View - Selection</emph> - in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
 <table id="tbl_id3154908">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -249,7 +246,7 @@
 <section id="astatb">
 <paragraph role="paragraph" id="par_id3153510" xml-lang="en-US" l10n="U" oldref="46">Open the context menu in the Commands window - choose <emph>Attributes</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>View - Selection </emph>- in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>View - Formula Elements </emph>- in the Formula Elements window, click</paragraph>
 <table id="tbl_id3147076">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -266,7 +263,7 @@
 <section id="astasr">
 <paragraph role="paragraph" id="par_id3154114" xml-lang="en-US" l10n="U" oldref="49">Open the context menu in the Commands window - choose <emph>Formats</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150581" xml-lang="en-US" l10n="U" oldref="80">Choose <emph>View - Selection</emph> - in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3150581" xml-lang="en-US" l10n="U" oldref="80">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
 <table id="tbl_id3156276">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -283,7 +280,7 @@
 <section id="astfab">
 <paragraph role="paragraph" id="par_id3149008" xml-lang="en-US" l10n="U" oldref="52">Open the context menu in the Commands window - choose <emph>Set Operations</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3147313" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>View - Selection</emph> - in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3147313" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
 <table id="tbl_id3156377">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -337,7 +334,7 @@
 <section id="sonst">
 <paragraph role="paragraph" id="par_id3153291" xml-lang="en-US" l10n="U" oldref="90">Open the context menu in the Commands window - choose <emph>Others</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="91">Choose <emph>View - Selection</emph> - in the Selection window, click</paragraph>
+<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="91">Choose <emph>View - Formula Elements</emph> - in the Formula Elements window, click</paragraph>
 <table id="tbl_id3153988">
 <tablerow>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/smath/00/makefile.mk b/helpcontent2/source/text/smath/00/makefile.mk
index 9e3797e301..a538f1219e 100644
--- a/helpcontent2/source/text/smath/00/makefile.mk
+++ b/helpcontent2/source/text/smath/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/01/02080000.xhp b/helpcontent2/source/text/smath/01/02080000.xhp
index 4d9631e866..72d75588e1 100644
--- a/helpcontent2/source/text/smath/01/02080000.xhp
+++ b/helpcontent2/source/text/smath/01/02080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/02090000.xhp b/helpcontent2/source/text/smath/01/02090000.xhp
index b3beee8239..c988675d13 100644
--- a/helpcontent2/source/text/smath/01/02090000.xhp
+++ b/helpcontent2/source/text/smath/01/02090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02090000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/02100000.xhp b/helpcontent2/source/text/smath/01/02100000.xhp
index 58745db4bd..256d412a76 100755
--- a/helpcontent2/source/text/smath/01/02100000.xhp
+++ b/helpcontent2/source/text/smath/01/02100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02100000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/02110000.xhp b/helpcontent2/source/text/smath/01/02110000.xhp
index d1a4c1de79..13771f495d 100755
--- a/helpcontent2/source/text/smath/01/02110000.xhp
+++ b/helpcontent2/source/text/smath/01/02110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02110000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03040000.xhp b/helpcontent2/source/text/smath/01/03040000.xhp
index 41bc680782..e478998182 100755
--- a/helpcontent2/source/text/smath/01/03040000.xhp
+++ b/helpcontent2/source/text/smath/01/03040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03050000.xhp b/helpcontent2/source/text/smath/01/03050000.xhp
index 3cdd65c6e1..3ec0ad470a 100755
--- a/helpcontent2/source/text/smath/01/03050000.xhp
+++ b/helpcontent2/source/text/smath/01/03050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03060000.xhp b/helpcontent2/source/text/smath/01/03060000.xhp
index c33fa1e631..b4f0c70410 100755
--- a/helpcontent2/source/text/smath/01/03060000.xhp
+++ b/helpcontent2/source/text/smath/01/03060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03060000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03070000.xhp b/helpcontent2/source/text/smath/01/03070000.xhp
index 973e8d7b81..cc9c62bf07 100755
--- a/helpcontent2/source/text/smath/01/03070000.xhp
+++ b/helpcontent2/source/text/smath/01/03070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03080000.xhp b/helpcontent2/source/text/smath/01/03080000.xhp
index 875f8851b6..54aaacf7f4 100755
--- a/helpcontent2/source/text/smath/01/03080000.xhp
+++ b/helpcontent2/source/text/smath/01/03080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090000.xhp b/helpcontent2/source/text/smath/01/03090000.xhp
index 142e71bd35..65dc1e8413 100755
--- a/helpcontent2/source/text/smath/01/03090000.xhp
+++ b/helpcontent2/source/text/smath/01/03090000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,44 +29,44 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsmath0103090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selection</title>
-<filename>/text/smath/01/03090000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="auswahl">
+      <topic id="textsmath0103090000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formula Elements</title>
+         <filename>/text/smath/01/03090000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="auswahl">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155963"><bookmark_value>selection options in formulas</bookmark_value>
-<bookmark_value>formulas; selections</bookmark_value>
+         <bookmark_value>formulas; selections</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_TOOLBOX" id="bm_id3145789" localize="false"/><paragraph role="heading" id="hd_id3155963" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="func_win"><link href="text/smath/01/03090000.xhp" name="Selection">Selection</link>
+<bookmark xml-lang="en-US" branch="hid/SID_TOOLBOX" id="bm_id3145789" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155963" role="heading" level="1" l10n="U" oldref="1"><variable id="func_win"><link href="text/smath/01/03090000.xhp" name="Formula Elements">Formula Elements</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149500" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SID_TOOLBOX">This is a list of operators, functions, symbols and format options that can be inserted into the formula.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations. You can find more examples in the <emph>Samples - Formulas</emph> folder.</paragraph>
-<paragraph role="paragraph" id="par_id3151244" xml-lang="en-US" l10n="U" oldref="6">The selection window is divided into two parts. Clicking a symbol at the top of the window displays its subordinate symbols in the lower half of the window.</paragraph>
-<paragraph role="paragraph" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="7">You can access the same functions in submenus through the context menu of the <emph>Commands</emph> window.</paragraph>
-<section id="howtoget">
-  <embed href="text/smath/00/00000004.xhp#astopa"/>
-</section>
-<embed href="text/smath/01/03090100.xhp#unaerbinaer"/>
-<embed href="text/smath/01/03090200.xhp#relationen"/>
-<embed href="text/smath/01/03090800.xhp#mengenop"/>
-<embed href="text/smath/01/03090400.xhp#funktionen"/>
-<embed href="text/smath/01/03090300.xhp#operatoren"/>
-<embed href="text/smath/01/03090600.xhp#attribute"/>
-<embed href="text/smath/01/03090500.xhp#klammern"/>
-<embed href="text/smath/01/03090700.xhp#formatierungen"/>
-<embed href="text/smath/01/03091600.xhp#sonstige"/>
-<embed href="text/smath/01/03090900.xhp#beispiele"/>
-<embed href="text/smath/01/03091500.xhp#reference"/>
-<embed href="text/smath/01/03091500.xhp#ref"/>
-<section id="relatedtopics">
-<embed href="text/smath/01/03091500.xhp#reference"/>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><ahelp hid="SID_TOOLBOX">This is a list of operators, functions, symbols and format options that can be inserted into the formula.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3148699" role="paragraph" l10n="CHG" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151244" role="paragraph" l10n="U" oldref="6">The selection window is divided into two parts. Clicking a symbol at the top of the window displays its subordinate symbols in the lower half of the window.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153250" role="paragraph" l10n="U" oldref="7">You can access the same functions in submenus through the context menu of the <emph>Commands</emph> window.</paragraph>
+      <section id="howtoget">
+         <embed href="text/smath/00/00000004.xhp#astopa"/>
+      </section>
+      <embed href="text/smath/01/03090100.xhp#unaerbinaer"/>
+      <embed href="text/smath/01/03090200.xhp#relationen"/>
+      <embed href="text/smath/01/03090800.xhp#mengenop"/>
+      <embed href="text/smath/01/03090400.xhp#funktionen"/>
+      <embed href="text/smath/01/03090300.xhp#operatoren"/>
+      <embed href="text/smath/01/03090600.xhp#attribute"/>
+      <embed href="text/smath/01/03090500.xhp#klammern"/>
+      <embed href="text/smath/01/03090700.xhp#formatierungen"/>
+      <embed href="text/smath/01/03091600.xhp#sonstige"/>
+      <embed href="text/smath/01/03090900.xhp#beispiele"/>
+      <embed href="text/smath/01/03091500.xhp#reference"/>
+      <embed href="text/smath/01/03091500.xhp#ref"/>
+      <section id="relatedtopics">
+         <embed href="text/smath/01/03091500.xhp#reference"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/smath/01/03090100.xhp b/helpcontent2/source/text/smath/01/03090100.xhp
index a0ce865f5c..3b3068617f 100644
--- a/helpcontent2/source/text/smath/01/03090100.xhp
+++ b/helpcontent2/source/text/smath/01/03090100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090100.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,12 +70,12 @@ dedr: fixed #i30769#</lastedited>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_UNBINOPS_TBX" id="bm_id3150200" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_UNBINOPS_CAT" id="bm_id3149499" localize="false"/>
 <paragraph role="heading" id="hd_id3150342" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090100.xhp" name="Unary/Binary Operators">Unary/Binary Operators</link></paragraph>
-<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_UNBINOPS_CAT">You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Selection window displays the individual operators.</ahelp> The <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Selection window, use the context menu or type it directly in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_UNBINOPS_CAT">You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Formula Elements window displays the individual operators.</ahelp> The <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Formula Elements window, use the context menu or type it directly in the <emph>Commands</emph> window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astuop"/>
 </section>
-<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the unary and binary operators. The symbol next to the operator indicates that it can be accessed through the Selection window (choose <emph>View - Selection</emph>) or through the context menu of the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3146963" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the unary and binary operators. The symbol next to the operator indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the Commands window.</paragraph>
 <paragraph role="heading" id="hd_id3147405" xml-lang="en-US" level="3" l10n="U" oldref="4">Unary and Binary Operators</paragraph>
 <table id="tbl_id3150392" class="topalign">
 <tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090200.xhp b/helpcontent2/source/text/smath/01/03090200.xhp
index 1ca7649450..29ae79d0c6 100644
--- a/helpcontent2/source/text/smath/01/03090200.xhp
+++ b/helpcontent2/source/text/smath/01/03090200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090200.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,12 +77,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_RELATIONS_TBX" id="bm_id3145204" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_RELATIONS_CAT" id="bm_id3145207" localize="false"/>
 <paragraph role="heading" id="hd_id3156316" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090200.xhp" name="Relations">Relations</link></paragraph>
-<paragraph role="paragraph" id="par_id3153152" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_RELATIONS_CAT">You can choose among various relations to structure your <emph>$[officename] Math</emph> formula. The relation functions are displayed in the lower part of the Selection window.</ahelp> The list is also in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All relations that are not contained in the Selection window or in the context menu can be typed manually in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3153152" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_RELATIONS_CAT">You can choose among various relations to structure your <emph>$[officename] Math</emph> formula. The relation functions are displayed in the lower part of the Formula Elements window.</ahelp> The list is also in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All relations that are not contained in the Formula Elements window or in the context menu can be typed manually in the Commands window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astbio"/>
 </section>
-<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the relations. The symbol next to the name of the relation indicates that it can be accessed through the Selection window (choose <emph>View - Selection</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of the relations. The symbol next to the name of the relation indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
 <paragraph role="heading" id="hd_id3148827" xml-lang="en-US" level="3" l10n="U" oldref="4">Relations:</paragraph>
 <table id="tbl_id3145414">
 <tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090300.xhp b/helpcontent2/source/text/smath/01/03090300.xhp
index 2c595b75a8..f202426a8a 100644
--- a/helpcontent2/source/text/smath/01/03090300.xhp
+++ b/helpcontent2/source/text/smath/01/03090300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090300.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,12 +57,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_OPERATORS_TBX" id="bm_id3153623" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_OPERATORS_CAT" id="bm_id3153626" localize="false"/>
 <paragraph role="heading" id="hd_id3153150" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090300.xhp" name="Operators">Operators</link></paragraph>
-<paragraph role="paragraph" id="par_id3149755" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SMA_OPERATORS_CAT">You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Selection window.</ahelp> They are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Selection window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3149755" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SMA_OPERATORS_CAT">You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Formula Elements window.</ahelp> They are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Formula Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astopop"/>
 </section>
-<paragraph role="paragraph" id="par_id3153576" xml-lang="en-US" l10n="U" oldref="36">The following is a list of the available operators. An icon next to the operator name indicates that it can be accessed through the Selection window (choose <emph>View - Selection</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3153576" xml-lang="en-US" l10n="U" oldref="36">The following is a list of the available operators. An icon next to the operator name indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
 <paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="3" l10n="U" oldref="37">Operator Functions</paragraph>
 <table id="tbl_id3154282">
 <tablerow>
@@ -242,7 +239,7 @@
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3150161" xml-lang="en-US" l10n="U" oldref="25">Triple Curve Integral</paragraph>
-<paragraph role="paragraph" id="par_id3150175" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_SMA_LLLINTX">Inserts a <emph>triple curve integral</emph> sign with one placeholder.</ahelp> You can also type <emph>lllint &lt;?&gt;</emph> directly in the <emph>Commands</emph> window window.</paragraph>
+<paragraph role="paragraph" id="par_id3150175" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="HID_SMA_LLLINTX">Inserts a <emph>triple curve integral</emph> sign with one placeholder.</ahelp> You can also type <emph>lllint &lt;?&gt;</emph> directly in the <emph>Commands</emph> window.</paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/smath/01/03090400.xhp b/helpcontent2/source/text/smath/01/03090400.xhp
index 0f1a3f95a5..827b36fe58 100644
--- a/helpcontent2/source/text/smath/01/03090400.xhp
+++ b/helpcontent2/source/text/smath/01/03090400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090400.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -77,12 +74,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_FUNCTIONS_TBX" id="bm_id3150571" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_FUNCTIONS_CAT" id="bm_id3149024" localize="false"/>
 <paragraph role="heading" id="hd_id3150932" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090400.xhp" name="Functions">Functions</link></paragraph>
-<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FUNCTIONS_CAT">Choose a function in the lower part of the window.</ahelp> These functions are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Selection window need to be typed manually in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FUNCTIONS_CAT">Choose a function in the lower part of the window.</ahelp> These functions are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Formula Elements window need to be typed manually in the Commands window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astofu"/>
 </section>
-<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="3">The following is a list of all functions that appear in the <emph>Selection</emph> window. The icon next to the function indicates that it can be accessed through the Selection window (menu View - Selection) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="3">The following is a list of all functions that appear in the <emph>Formula Elements</emph> window. The icon next to the function indicates that it can be accessed through the Formula Elements window (menu View - Formula Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
 <paragraph role="heading" id="hd_id3156319" xml-lang="en-US" level="3" l10n="U" oldref="4">List of functions</paragraph>
 <table id="tbl_id3145209">
 <tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090500.xhp b/helpcontent2/source/text/smath/01/03090500.xhp
index 728fb74cdf..4a0f9b22ac 100644
--- a/helpcontent2/source/text/smath/01/03090500.xhp
+++ b/helpcontent2/source/text/smath/01/03090500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,12 +76,12 @@ dedr: reviewed</lastedited>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BRACKETS_TBX" id="bm_id3149294" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BRACKETS_CAT" id="bm_id3149751" localize="false"/>
 <paragraph role="heading" id="hd_id3153153" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090500.xhp" name="Brackets">Brackets</link></paragraph>
-<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_BRACKETS_CAT">You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Selection window.</ahelp> These brackets are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Selection window or in the context menu can be typed manually in the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3147258" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_BRACKETS_CAT">You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Formula Elements window.</ahelp> These brackets are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Formula Elements window or in the context menu can be typed manually in the <emph>Commands</emph> window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astofm"/>
 </section>
-<paragraph role="paragraph" id="par_id3154264" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available bracket types. The icon next to the bracket type indicates that it can be accessed through the Selection window (menu View - Selection) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3154264" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available bracket types. The icon next to the bracket type indicates that it can be accessed through the Formula Elements window (menu View - Formula Elements) or through the context menu of the <emph>Commands</emph> window.</paragraph>
 <paragraph role="heading" id="hd_id3154277" xml-lang="en-US" level="3" l10n="U" oldref="4">Bracket types</paragraph>
 <table id="tbl_id3150710">
 <tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090600.xhp b/helpcontent2/source/text/smath/01/03090600.xhp
index bcd83976a8..31a241d37c 100644
--- a/helpcontent2/source/text/smath/01/03090600.xhp
+++ b/helpcontent2/source/text/smath/01/03090600.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090600.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,414 +29,412 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsmath0103090600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Attributes</title>
-<filename>/text/smath/01/03090600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-01T11:29:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="attribute">
+      <topic id="textsmath0103090600xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Attributes</title>
+         <filename>/text/smath/01/03090600.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="attribute">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154011"><bookmark_value>attributes; in %PRODUCTNAME Math</bookmark_value>
-<bookmark_value>formulas; attributes in</bookmark_value>
-<bookmark_value>accents; in %PRODUCTNAME Math</bookmark_value>
-<bookmark_value>attributes; accents</bookmark_value>
-<bookmark_value>vector arrows as attributes</bookmark_value>
-<bookmark_value>tilde as attribute</bookmark_value>
-<bookmark_value>circumflex attribute</bookmark_value>
-<bookmark_value>bold attribute</bookmark_value>
-<bookmark_value>italic attribute in %PRODUCTNAME Math</bookmark_value>
-<bookmark_value>resizing;fonts</bookmark_value>
-<bookmark_value>scaling;fonts</bookmark_value>
-<bookmark_value>attributes; changing fonts</bookmark_value>
-<bookmark_value>changing; fonts</bookmark_value>
-<bookmark_value>attributes; colored characters</bookmark_value>
-<bookmark_value>colored characters</bookmark_value>
-<bookmark_value>attributes; changing defaults</bookmark_value>
-<bookmark_value>circle attribute</bookmark_value>
-<bookmark_value>double dot attribute</bookmark_value>
-<bookmark_value>dot attribute</bookmark_value>
-<bookmark_value>line through attribute</bookmark_value>
-<bookmark_value>line above attribute</bookmark_value>
-<bookmark_value>reversed circumflex attribute</bookmark_value>
-<bookmark_value>overline attribute</bookmark_value>
-<bookmark_value>wide vector arrow attribute</bookmark_value>
-<bookmark_value>wide tilde attribute</bookmark_value>
-<bookmark_value>wide circumflex attribute</bookmark_value>
-<bookmark_value>underline attribute</bookmark_value>
-<bookmark_value>triple dot attribute</bookmark_value>
-<bookmark_value>transparent character as attribute</bookmark_value>
+         <bookmark_value>formulas; attributes in</bookmark_value>
+         <bookmark_value>accents; in %PRODUCTNAME Math</bookmark_value>
+         <bookmark_value>attributes; accents</bookmark_value>
+         <bookmark_value>vector arrows as attributes</bookmark_value>
+         <bookmark_value>tilde as attribute</bookmark_value>
+         <bookmark_value>circumflex attribute</bookmark_value>
+         <bookmark_value>bold attribute</bookmark_value>
+         <bookmark_value>italic attribute in %PRODUCTNAME Math</bookmark_value>
+         <bookmark_value>resizing;fonts</bookmark_value>
+         <bookmark_value>scaling;fonts</bookmark_value>
+         <bookmark_value>attributes; changing fonts</bookmark_value>
+         <bookmark_value>changing; fonts</bookmark_value>
+         <bookmark_value>attributes; colored characters</bookmark_value>
+         <bookmark_value>colored characters</bookmark_value>
+         <bookmark_value>attributes; changing defaults</bookmark_value>
+         <bookmark_value>circle attribute</bookmark_value>
+         <bookmark_value>double dot attribute</bookmark_value>
+         <bookmark_value>dot attribute</bookmark_value>
+         <bookmark_value>line through attribute</bookmark_value>
+         <bookmark_value>line above attribute</bookmark_value>
+         <bookmark_value>reversed circumflex attribute</bookmark_value>
+         <bookmark_value>overline attribute</bookmark_value>
+         <bookmark_value>wide vector arrow attribute</bookmark_value>
+         <bookmark_value>wide tilde attribute</bookmark_value>
+         <bookmark_value>wide circumflex attribute</bookmark_value>
+         <bookmark_value>underline attribute</bookmark_value>
+         <bookmark_value>triple dot attribute</bookmark_value>
+         <bookmark_value>transparent character as attribute</bookmark_value>
 </bookmark><comment>mw added "scaling;fonts"</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_ATTRIBUTES_TBX" id="bm_id3153142" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_ATTRIBUTES_CAT" id="bm_id3147434" localize="false"/>
-<paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090600.xhp" name="Attributes">Attributes</link></paragraph>
-<paragraph role="paragraph" id="par_id3145802" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_ATTRIBUTES_CAT">You can choose from various attributes for <emph>%PRODUCTNAME</emph>
-<emph>Math</emph> formulas. Some attributes are displayed in the lower part of the Selection window.</ahelp> These attributes are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Selection window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/smath/00/00000004.xhp#astatb"/>
-</section>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all attributes available in <item type="productname">%PRODUCTNAME</item> Math. The symbol next to the attribute indicates that it can be accessed through the Selection window (choose <emph>View - Selection</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
-<paragraph role="note" id="par_id3149604" xml-lang="en-US" l10n="U" oldref="4">In describing the following attribute functions, the letter "a" in the icon refers to the placeholder that you would like to assign to the respective attribute. You can substitute this character with any other character that you choose.</paragraph>
-<paragraph role="heading" id="hd_id3154650" xml-lang="en-US" level="3" l10n="U" oldref="5">Attribute Functions</paragraph>
-<table id="tbl_id3153810">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10098" xml-lang="en-US" l10n="F">
-<image id="img_id3150391" src="starmath/res/at21701.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3150391" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3154011" role="heading" level="1" l10n="U" oldref="1"><variable id="attributes"><link href="text/smath/01/03090600.xhp" name="Attributes">Attributes</link>
+</variable></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145802" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SMA_ATTRIBUTES_CAT">You can choose from various attributes for <emph>%PRODUCTNAME</emph>
+            <emph>Math</emph> formulas. Some attributes are displayed in the lower part of the Formula Elements window.</ahelp> These attributes are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Formula Elements window or in the context menu must be typed manually in the <emph>Commands</emph> window.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/smath/00/00000004.xhp#astatb"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155962" role="paragraph" l10n="U" oldref="3">The following is a complete list of all attributes available in <item type="productname">%PRODUCTNAME</item> Math. The symbol next to the attribute indicates that it can be accessed through the Formula Elements window (choose <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149604" role="note" l10n="U" oldref="4">In describing the following attribute functions, the letter "a" in the icon refers to the placeholder that you would like to assign to the respective attribute. You can substitute this character with any other character that you choose.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154650" role="heading" level="3" l10n="U" oldref="5">Attribute Functions</paragraph>
+      <table id="tbl_id3153810">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10098" role="paragraph" l10n="F">
+<image id="img_id3150391" src="starmath/res/at21701.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150391">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_ACUTEX" id="bm_id3149054" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3146322" xml-lang="en-US" l10n="U" oldref="6">Acute accent</paragraph>
-<paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_SMA_ACUTEX">Inserts a placeholder with an acute accent.</ahelp> You can also type <emph>acute &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146322" role="tablehead" l10n="U" oldref="6">Acute accent</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150533" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_SMA_ACUTEX">Inserts a placeholder with an acute accent.</ahelp> You can also type <emph>acute &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3145594">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN100D5" xml-lang="en-US" l10n="F">
-<image id="img_id3154504" src="starmath/res/at21702.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3154504" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3145594">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN100D5" role="paragraph" l10n="F">
+<image id="img_id3154504" src="starmath/res/at21702.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154504">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_GRAVEX" id="bm_id3154501" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="22">Grave accent</paragraph>
-<paragraph role="paragraph" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_SMA_GRAVEX">Inserts a placeholder with a <emph>grave accent</emph> (grave).</ahelp> You can also type <emph>grave &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149877" role="tablehead" l10n="U" oldref="22">Grave accent</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150018" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_SMA_GRAVEX">Inserts a placeholder with a <emph>grave accent</emph> (grave).</ahelp> You can also type <emph>grave &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3156064">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10115" xml-lang="en-US" l10n="F">
-<image id="img_id3155370" src="starmath/res/at21703.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3155370" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3156064">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10115" role="paragraph" l10n="F">
+<image id="img_id3155370" src="starmath/res/at21703.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155370">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_CHECKX" id="bm_id3153927" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156263" xml-lang="en-US" l10n="U" oldref="47">Reverse Circumflex</paragraph>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SMA_CHECKX">Inserts a placeholder with a reverse circumflex ("checkmark") over it.</ahelp> You can also type <emph>check &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156263" role="tablehead" l10n="U" oldref="47">Reverse Circumflex</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_SMA_CHECKX">Inserts a placeholder with a reverse circumflex ("checkmark") over it.</ahelp> You can also type <emph>check &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3151186">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1014E" xml-lang="en-US" l10n="F">
-<image id="img_id3145202" src="starmath/res/at21704.png" width="0.25inch" height="0.25inch"><alt id="alt_id3145202" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3151186">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1014E" role="paragraph" l10n="F">
+<image id="img_id3145202" src="starmath/res/at21704.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145202">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BREVEX" id="bm_id3151271" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149976" xml-lang="en-US" l10n="U" oldref="10">Breve</paragraph>
-<paragraph role="paragraph" id="par_id3153619" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_SMA_BREVEX">Inserts a placeholder with an accent breve.</ahelp> You can also type <emph>breve &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149976" role="tablehead" l10n="U" oldref="10">Breve</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153619" role="paragraph" l10n="U" oldref="11"><ahelp hid="HID_SMA_BREVEX">Inserts a placeholder with an accent breve.</ahelp> You can also type <emph>breve &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3147255">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10187" xml-lang="en-US" l10n="F">
-<image id="img_id3159179" src="starmath/res/at21709.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3159179" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3147255">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10187" role="paragraph" l10n="F">
+<image id="img_id3159179" src="starmath/res/at21709.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3159179">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_CIRCLEX" id="bm_id3159175" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154258" xml-lang="en-US" l10n="U" oldref="14">Circle</paragraph>
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_SMA_CIRCLEX">Inserts a placeholder with a circle over it.</ahelp> You can also type <emph>circle &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154258" role="tablehead" l10n="U" oldref="14">Circle</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_SMA_CIRCLEX">Inserts a placeholder with a circle over it.</ahelp> You can also type <emph>circle &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3150712">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN101C0" xml-lang="en-US" l10n="F">
-<image id="img_id3149808" src="starmath/res/im21106.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3149808" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3150712">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN101C0" role="paragraph" l10n="F">
+<image id="img_id3149808" src="starmath/res/im21106.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149808">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_VECX" id="bm_id3149804" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="28">Vector arrow</paragraph>
-<paragraph role="paragraph" id="par_id3153539" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SMA_VECX">Inserts a placeholder with a vector arrow.</ahelp> You can also type <emph>vec &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153527" role="tablehead" l10n="U" oldref="28">Vector arrow</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153539" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_SMA_VECX">Inserts a placeholder with a vector arrow.</ahelp> You can also type <emph>vec &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3154479">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN101FB" xml-lang="en-US" l10n="F">
-<image id="img_id3153776" src="starmath/res/at21708.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3153776" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3154479">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN101FB" role="paragraph" l10n="F">
+<image id="img_id3153776" src="starmath/res/at21708.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153776">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_TILDEX" id="bm_id3153772" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3150356" xml-lang="en-US" l10n="U" oldref="26">Tilde</paragraph>
-<paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SMA_TILDEX">Inserts a placeholder with a tilde.</ahelp> You can also type <emph>tilde &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150356" role="tablehead" l10n="U" oldref="26">Tilde</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154570" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_SMA_TILDEX">Inserts a placeholder with a tilde.</ahelp> You can also type <emph>tilde &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3155896">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10236" xml-lang="en-US" l10n="F">
-<image id="img_id3149695" src="starmath/res/at21707.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3149695" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3155896">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10236" role="paragraph" l10n="F">
+<image id="img_id3149695" src="starmath/res/at21707.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149695">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_HATX" id="bm_id3154192" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154201" xml-lang="en-US" l10n="U" oldref="24">Circumflex</paragraph>
-<paragraph role="paragraph" id="par_id3159198" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_SMA_HATX">Inserts a placeholder with a circumflex ("hat").</ahelp> You can also directly enter <emph>hat &lt;?&gt;</emph> in the Commands window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154201" role="tablehead" l10n="U" oldref="24">Circumflex</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3159198" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_SMA_HATX">Inserts a placeholder with a circumflex ("hat").</ahelp> You can also directly enter <emph>hat &lt;?&gt;</emph> in the Commands window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3149308">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1026E" xml-lang="en-US" l10n="F">
-<image id="img_id3148986" src="starmath/res/at21705.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3148986" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3149308">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1026E" role="paragraph" l10n="F">
+<image id="img_id3148986" src="starmath/res/at21705.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148986">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BARX" id="bm_id3149692" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="8">Line above (bar)</paragraph>
-<paragraph role="paragraph" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_SMA_BARX">Inserts a line ("bar") above a placeholder .</ahelp> You can also type <emph>bar &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149486" role="tablehead" l10n="U" oldref="8">Line above (bar)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149815" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_SMA_BARX">Inserts a line ("bar") above a placeholder .</ahelp> You can also type <emph>bar &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3154828">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN102A7" xml-lang="en-US" l10n="F">
-<image id="img_id3147095" src="starmath/res/at21710.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3147095" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3154828">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN102A7" role="paragraph" l10n="F">
+<image id="img_id3147095" src="starmath/res/at21710.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147095">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_DOTX" id="bm_id3147092" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147221" xml-lang="en-US" l10n="U" oldref="16">Dot</paragraph>
-<paragraph role="paragraph" id="par_id3154900" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_SMA_DOTX">Inserts a placeholder with a dot over it.</ahelp> You can also type <emph>dot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147221" role="tablehead" l10n="U" oldref="16">Dot</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154900" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_SMA_DOTX">Inserts a placeholder with a dot over it.</ahelp> You can also type <emph>dot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3148736">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN102E0" xml-lang="en-US" l10n="F">
-<image id="img_id3147328" src="starmath/res/at21724.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3147328" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3148736">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN102E0" role="paragraph" l10n="F">
+<image id="img_id3147328" src="starmath/res/at21724.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147328">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_WIDEVECX" id="bm_id3147325" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3153516" xml-lang="en-US" l10n="U" oldref="54">Wide vector arrow</paragraph>
-<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_SMA_WIDEVECX">Inserts a wide vector arrow with a placeholder.</ahelp> You can also type <emph>widevec</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153516" role="tablehead" l10n="U" oldref="54">Wide vector arrow</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147126" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_SMA_WIDEVECX">Inserts a wide vector arrow with a placeholder.</ahelp> You can also type <emph>widevec</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3153285">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10319" xml-lang="en-US" l10n="F">
-<image id="img_id3153359" src="starmath/res/at21723.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3153359" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3153285">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10319" role="paragraph" l10n="F">
+<image id="img_id3153359" src="starmath/res/at21723.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153359">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_WIDETILDEX" id="bm_id3153356" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156278" xml-lang="en-US" l10n="U" oldref="56">Wide tilde</paragraph>
-<paragraph role="paragraph" id="par_id3154116" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_SMA_WIDETILDEX">Inserts a wide tilde with a placeholder. </ahelp> You can also type <emph>widetilde</emph> directly in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156278" role="tablehead" l10n="U" oldref="56">Wide tilde</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154116" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_SMA_WIDETILDEX">Inserts a wide tilde with a placeholder. </ahelp> You can also type <emph>widetilde</emph> directly in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3150574">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10352" xml-lang="en-US" l10n="F">
-<image id="img_id3155117" src="starmath/res/at21722.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3155117" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3150574">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10352" role="paragraph" l10n="F">
+<image id="img_id3155117" src="starmath/res/at21722.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155117">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_WIDEHATX" id="bm_id3149179" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148764" xml-lang="en-US" l10n="U" oldref="58">Wide circumflex</paragraph>
-<paragraph role="paragraph" id="par_id3147311" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_SMA_WIDEHATX">Inserts a wide circumflex ("hat") with a placeholder. </ahelp> You can also type <emph>widehat</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148764" role="tablehead" l10n="U" oldref="58">Wide circumflex</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147311" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_SMA_WIDEHATX">Inserts a wide circumflex ("hat") with a placeholder. </ahelp> You can also type <emph>widehat</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3156364">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1038B" xml-lang="en-US" l10n="F">
-<image id="img_id3148873" src="starmath/res/at21711.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3148873" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3156364">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1038B" role="paragraph" l10n="F">
+<image id="img_id3148873" src="starmath/res/at21711.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148873">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_DDOTX" id="bm_id3151383" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155921" xml-lang="en-US" l10n="U" oldref="18">Double dot</paragraph>
-<paragraph role="paragraph" id="par_id3149541" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_SMA_DDOTX">Inserts a placeholder with two dots over it.</ahelp> You can also directly enter <emph>ddot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155921" role="tablehead" l10n="U" oldref="18">Double dot</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149541" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_SMA_DDOTX">Inserts a placeholder with two dots over it.</ahelp> You can also directly enter <emph>ddot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3150124">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN103C4" xml-lang="en-US" l10n="F">
-<image id="img_id3147424" src="starmath/res/at21713.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3147424" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3150124">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN103C4" role="paragraph" l10n="F">
+<image id="img_id3147424" src="starmath/res/at21713.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147424">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_OVERLINEX" id="bm_id3147420" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147621" xml-lang="en-US" l10n="U" oldref="32">Line over</paragraph>
-<paragraph role="paragraph" id="par_id3147492" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_SMA_OVERLINEX">Inserts a line over a placeholder.</ahelp> You can also type <emph>overline &lt;?&gt;</emph> in the <emph>Commands</emph> window. The line adjusts itself to correct length.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147621" role="tablehead" l10n="U" oldref="32">Line over</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147492" role="paragraph" l10n="U" oldref="33"><ahelp hid="HID_SMA_OVERLINEX">Inserts a line over a placeholder.</ahelp> You can also type <emph>overline &lt;?</emph>
+                  <emph>&gt;</emph> in the <emph>Commands</emph> window. The line adjusts itself to correct length.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3145269">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN103FD" xml-lang="en-US" l10n="F">
-<image id="img_id3145130" src="starmath/res/at21714.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3145130" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3145269">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN103FD" role="paragraph" l10n="F">
+<image id="img_id3145130" src="starmath/res/at21714.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145130">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_UNDERLINEX" id="bm_id3145126" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3153258" xml-lang="en-US" l10n="U" oldref="30">Line below</paragraph>
-<paragraph role="paragraph" id="par_id3153269" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_SMA_UNDERLINEX">Inserts a line below a placeholder.</ahelp> You can also type <emph>underline &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153258" role="tablehead" l10n="U" oldref="30">Line below</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153269" role="paragraph" l10n="U" oldref="59"><ahelp hid="HID_SMA_UNDERLINEX">Inserts a line below a placeholder.</ahelp> You can also type <emph>underline &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3153786">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10436" xml-lang="en-US" l10n="F">
-<image id="img_id3145318" src="starmath/res/at21715.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3145318" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3153786">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10436" role="paragraph" l10n="F">
+<image id="img_id3145318" src="starmath/res/at21715.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145318">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_OVERSTRIKEX" id="bm_id3145315" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3153292" xml-lang="en-US" l10n="U" oldref="34">Line through (overstrike)</paragraph>
-<paragraph role="paragraph" id="par_id3153304" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SMA_OVERSTRIKEX">Inserts a placeholder with a line (or overstrike) through it.</ahelp> You can also type <emph>overstrike &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153292" role="tablehead" l10n="U" oldref="34">Line through (overstrike)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153304" role="paragraph" l10n="U" oldref="35"><ahelp hid="HID_SMA_OVERSTRIKEX">Inserts a placeholder with a line (or overstrike) through it.</ahelp> You can also type <emph>overstrike &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3153987">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1046F" xml-lang="en-US" l10n="F">
-<image id="img_id3156104" src="starmath/res/at21712.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3156104" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3153987">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1046F" role="paragraph" l10n="F">
+<image id="img_id3156104" src="starmath/res/at21712.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156104">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_DDDOTX" id="bm_id3156101" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="20">Triple dot</paragraph>
-<paragraph role="paragraph" id="par_id3154718" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_SMA_DDDOTX">Inserts three dots over a placeholder.</ahelp> You can also type <emph>dddot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154707" role="tablehead" l10n="U" oldref="20">Triple dot</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154718" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_SMA_DDDOTX">Inserts three dots over a placeholder.</ahelp> You can also type <emph>dddot &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3155591">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN104A8" xml-lang="en-US" l10n="F">
-<image id="img_id3145626" src="starmath/res/at21716.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3145626" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3155591">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN104A8" role="paragraph" l10n="F">
+<image id="img_id3145626" src="starmath/res/at21716.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145626">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_PHANTOMX" id="bm_id3145622" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149774" xml-lang="en-US" l10n="U" oldref="40">Transparent</paragraph>
-<paragraph role="paragraph" id="par_id3155074" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="HID_SMA_PHANTOMX">Inserts a placeholder for a transparent character. This character takes up the space of "a" but does not display it.</ahelp> You can also type <emph>phantom &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149774" role="tablehead" l10n="U" oldref="40">Transparent</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155074" role="paragraph" l10n="U" oldref="41"><ahelp hid="HID_SMA_PHANTOMX">Inserts a placeholder for a transparent character. This character takes up the space of "a" but does not display it.</ahelp> You can also type <emph>phantom &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3154329">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN104E1" xml-lang="en-US" l10n="F">
-<image id="img_id3153240" src="res/commandimagelist/sc_bold.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153240" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3154329">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN104E1" role="paragraph" l10n="F">
+<image id="img_id3153240" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153240">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BOLDX" id="bm_id3146954" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3150089" xml-lang="en-US" l10n="U" oldref="38">Bold font</paragraph>
-<paragraph role="paragraph" id="par_id3150101" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_SMA_BOLDX">Inserts a placeholder with bold formatting.</ahelp> You can also type <emph>bold &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150089" role="tablehead" l10n="U" oldref="38">Bold font</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150101" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_SMA_BOLDX">Inserts a placeholder with bold formatting.</ahelp> You can also type <emph>bold &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3155096">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1051C" xml-lang="en-US" l10n="F">
-<image id="img_id3150038" src="res/commandimagelist/sc_italic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150038" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3155096">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1051C" role="paragraph" l10n="F">
+<image id="img_id3150038" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150038">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_ITALX" id="bm_id3150034" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="36">Italic font</paragraph>
-<paragraph role="paragraph" id="par_id3147355" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_SMA_ITALX">Inserts a placeholder with italic formatting.</ahelp> You can also type <emph>ital &lt;?&gt;</emph> or <emph>italic &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147344" role="tablehead" l10n="U" oldref="36">Italic font</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147355" role="paragraph" l10n="U" oldref="37"><ahelp hid="HID_SMA_ITALX">Inserts a placeholder with italic formatting.</ahelp> You can also type <emph>ital &lt;?&gt;</emph> or <emph>italic &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3148410">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="F">
-<image id="img_id3155801" src="res/commandimagelist/sc_fontheight.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155801" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3148410">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN1055A" role="paragraph" l10n="F">
+<image id="img_id3155801" src="res/commandimagelist/sc_fontheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155801">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_SIZEXY" id="bm_id3155798" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145618" xml-lang="en-US" l10n="U" oldref="44">Resize</paragraph>
-<paragraph role="paragraph" id="par_id3153125" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_SMA_SIZEXY">Inserts a command for modifying the font size with two placeholders. The first placeholder refers to the font size (for example, 12) and the second one contains the text.</ahelp> For proper structure, insert a space between the values. You can also directly enter <emph>size &lt;?&gt; &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145618" role="tablehead" l10n="U" oldref="44">Resize</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153125" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_SMA_SIZEXY">Inserts a command for modifying the font size with two placeholders. The first placeholder refers to the font size (for example, 12) and the second one contains the text.</ahelp> For proper structure, insert a space between the values. You can also directly enter <emph>size &lt;?&gt; &lt;?&gt;</emph> in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<table id="tbl_id3156085">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="F">
-<image id="img_id3148804" src="res/commandimagelist/sc_charfontname.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148804" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3156085">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10595" role="paragraph" l10n="F">
+<image id="img_id3148804" src="res/commandimagelist/sc_charfontname.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148804">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_FONTXY" id="bm_id3154349" localize="false"/>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154359" xml-lang="en-US" l10n="U" oldref="42">Change font</paragraph>
-<paragraph role="paragraph" id="par_id3154371" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_SMA_FONTXY">Inserts a command for changing the font type, with two placeholders. Replace the first placeholder with the name of one of the <link href="text/smath/01/05010000.xhp" name="custom fonts">custom fonts</link>, <emph>Serif, Sans</emph> or <emph>Fixed</emph>. Replace the second placeholder with the text.</ahelp> You can also type <emph>font &lt;?&gt; &lt;?&gt;</emph> directly in the <emph>Commands</emph> window.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154359" role="tablehead" l10n="U" oldref="42">Change font</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154371" role="paragraph" l10n="U" oldref="43"><ahelp hid="HID_SMA_FONTXY">Inserts a command for changing the font type, with two placeholders. Replace the first placeholder with the name of one of the <link href="text/smath/01/05010000.xhp" name="custom fonts">custom fonts</link>, <emph>Serif, Sans</emph> or <emph>Fixed</emph>. Replace the second placeholder with the text.</ahelp> You can also type <emph>font &lt;?&gt; &lt;?&gt;</emph> directly in the <emph>Commands</emph> window.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3149626" xml-lang="en-US" l10n="U" oldref="48"> Use the <emph>color</emph> command to change the color of your formula. Type <emph>color</emph>, then type the color name (the available colors are white, black, cyan, magenta, red, blue, green and yellow), then the formula, character or character sequence. The input <emph>color green size 20 a</emph> results in a green letter "a" with a font size of 20.</paragraph>
-<paragraph role="paragraph" id="par_id3146071" xml-lang="en-US" l10n="U" oldref="51">The <emph>nbold</emph> and <emph>nitalic</emph> commands remove the bold or italic default fonts of formula components. For example, remove italics from the x in the formula 5 x + 3=28 by typing <emph>nitalic</emph> before the x as in <emph>5 nitalic x + 3=28</emph>.</paragraph>
-<paragraph role="note" id="par_id3150612" xml-lang="en-US" l10n="U" oldref="46">The <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link> "acute", "bar", "breve", "check", "circle", "dot", "ddot", "dddot", "grave", "hat", "tilde" and "vec" have fixed sizes. Their width or length cannot be adjusted when positioned over a long symbol.</paragraph>
-<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="U" oldref="52">For size changes you can use <emph>size n</emph>,<emph> +n</emph>,<emph> -n</emph>,<emph> *n</emph> and<emph> /n </emph>, where <emph>n</emph> is a placeholder. This method is useful when the base size of the formula is subject to change. The commands <emph>size +n</emph> and <emph>size -n</emph> change point size, and <emph>size *n</emph> and <emph>size /n</emph> change the size by a percentage. For example, the command <emph>size *1.17</emph> increases the size of a character by exactly 17%.</paragraph>
-<paragraph role="warning" id="par_id3148695" xml-lang="en-US" l10n="U" oldref="49">Note that some entries require spaces for the correct structure. This is especially true when you specify attributes with fixed values instead of placeholders.</paragraph>
-<paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="U" oldref="50">For more information about formatting in <emph>%PRODUCTNAME</emph>
-<emph>Math</emph>, see <link href="text/smath/01/03091100.xhp" name="Brackets and Grouping">Brackets and Grouping</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154221" xml-lang="en-US" l10n="U" oldref="31">Information on <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link>, <link href="text/smath/01/03091200.xhp" name="indexes and exponents">indexes and exponents</link>, and <link href="text/smath/01/03091400.xhp" name="scaling">scaling</link> can help you structure your documents more efficiently.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149626" role="paragraph" l10n="U" oldref="48"> Use the <emph>color</emph> command to change the color of your formula. Type <emph>color</emph>, then type the color name (the available colors are white, black, cyan, magenta, red, blue, green and yellow), then the formula, character or character sequence. The input <emph>color green size 20 a</emph> results in a green letter "a" with a font size of 20.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146071" role="paragraph" l10n="U" oldref="51">The <emph>nbold</emph> and <emph>nitalic</emph> commands remove the bold or italic default fonts of formula components. For example, remove italics from the x in the formula 5 x + 3=28 by typing <emph>nitalic</emph> before the x as in <emph>5 nitalic x + 3=28</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150612" role="note" l10n="U" oldref="46">The <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link> "acute", "bar", "breve", "check", "circle", "dot", "ddot", "dddot", "grave", "hat", "tilde" and "vec" have fixed sizes. Their width or length cannot be adjusted when positioned over a long symbol.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155621" role="paragraph" l10n="U" oldref="52">For size changes you can use <emph>size n</emph>,<emph> +n</emph>,<emph> -n</emph>,<emph> *n</emph> and<emph> /n </emph>, where <emph>n</emph> is a placeholder. This method is useful when the base size of the formula is subject to change. The commands <emph>size +n</emph> and <emph>size -n</emph> change point size, and <emph>size *n</emph> and <emph>size /n</emph> change the size by a percentage. For example, the command <emph>size *1.17</emph> increases the size of a character by exactly 17%.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148695" role="warning" l10n="U" oldref="49">Note that some entries require spaces for the correct structure. This is especially true when you specify attributes with fixed values instead of placeholders.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145230" role="paragraph" l10n="U" oldref="50">For more information about formatting in <emph>%PRODUCTNAME</emph>
+         <emph>Math</emph>, see <link href="text/smath/01/03091100.xhp" name="Brackets and Grouping">Brackets and Grouping</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154221" role="paragraph" l10n="U" oldref="31">Information on <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link>, <link href="text/smath/01/03091200.xhp" name="indexes and exponents">indexes and exponents</link>, and <link href="text/smath/01/03091400.xhp" name="scaling">scaling</link> can help you structure your documents more efficiently.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/smath/01/03090700.xhp b/helpcontent2/source/text/smath/01/03090700.xhp
index 84d23e359e..0bd7041a3c 100644
--- a/helpcontent2/source/text/smath/01/03090700.xhp
+++ b/helpcontent2/source/text/smath/01/03090700.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090700.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,12 +67,12 @@
 </bookmark><comment>mw added two index entries about formula alignement and made "formatting.." a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_FORMAT_TBX" id="bm_id3149290" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_FORMAT_CAT" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3153150" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090700.xhp" name="Format">Format</link></paragraph>
-<paragraph role="paragraph" id="par_id3147262" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FORMAT_CAT">You can choose among various options for formatting a $[officename] Math formula. The format options are displayed in the lower half of the Selection window.</ahelp> These options are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3147262" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_FORMAT_CAT">You can choose among various options for formatting a $[officename] Math formula. The format options are displayed in the lower half of the Formula Elements window.</ahelp> These options are also listed in the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> of the <emph>Commands</emph> window.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astasr"/>
 </section>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available formatting options in $[officename] Math. The icon next to the formatting option indicates that it can be accessed through the Selection window (menu <emph>View - Selection</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
+<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="3">The following is a complete list of all available formatting options in $[officename] Math. The icon next to the formatting option indicates that it can be accessed through the Formula Elements window (menu <emph>View - Formula Elements</emph>) or through the context menu of the <emph>Commands</emph> window.</paragraph>
 <paragraph role="note" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="17">The letter "a" refers to the placeholder in your formula which you would like to assign to the respective formatting. You can substitute this character for any other you like.</paragraph>
 <paragraph role="heading" id="hd_id3151104" xml-lang="en-US" level="3" l10n="U" oldref="4">Formatting options</paragraph>
 <table id="tbl_id3154569">
@@ -276,7 +273,7 @@
 <paragraph role="paragraph" id="par_id3155394" xml-lang="en-US" l10n="U" oldref="48">For alignment, the <emph>alignl, alignc</emph> and <emph>alignr</emph> commands are especially effective, if you are </paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="paragraph" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="49">aligning numbers and denominators, for example <emph>{alignl a}over{b+c}</emph>
+<paragraph role="paragraph" id="par_id3151009" xml-lang="en-US" l10n="CHG" oldref="49">aligning numerators and denominators, for example <emph>{alignl a}over{b+c}</emph>
 </paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/smath/01/03090800.xhp b/helpcontent2/source/text/smath/01/03090800.xhp
index a7903602da..40c9dc3547 100644
--- a/helpcontent2/source/text/smath/01/03090800.xhp
+++ b/helpcontent2/source/text/smath/01/03090800.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090800.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,12 +66,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_SETOPERATIONS_TBX" id="bm_id3145205" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_SETOPERATIONS_CAT" id="bm_id3145208" localize="false"/>
 <paragraph role="heading" id="hd_id3156318" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/03090800.xhp" name="Set Operations">Set Operations</link></paragraph>
-<paragraph role="paragraph" id="par_id3154641" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_SETOPERATIONS_CAT">Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Selection window</ahelp>. Call the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Selection window have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them.</paragraph>
+<paragraph role="paragraph" id="par_id3154641" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SMA_SETOPERATIONS_CAT">Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Formula Elements window</ahelp>. Call the <link href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Formula Elements window have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#astfab"/>
 </section>
-<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="3">After clicking the <emph>Set Operations</emph> icon in the Selection window additional icons will be shown in the lower part of this window. Simply click a symbol to incorporate the operator in the formula being edited in the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="3">After clicking the <emph>Set Operations</emph> icon in the Formula Elements window additional icons will be shown in the lower part of this window. Simply click a symbol to incorporate the operator in the formula being edited in the Commands window.</paragraph>
 <paragraph role="heading" id="hd_id3147258" xml-lang="en-US" level="3" l10n="U" oldref="4">The set operations in detail:</paragraph>
 <table id="tbl_id3151177">
 <tablerow>
diff --git a/helpcontent2/source/text/smath/01/03090900.xhp b/helpcontent2/source/text/smath/01/03090900.xhp
index 812911c1db..359a635eb9 100755
--- a/helpcontent2/source/text/smath/01/03090900.xhp
+++ b/helpcontent2/source/text/smath/01/03090900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090901.xhp b/helpcontent2/source/text/smath/01/03090901.xhp
index a1adefce49..6ee76b2fba 100644
--- a/helpcontent2/source/text/smath/01/03090901.xhp
+++ b/helpcontent2/source/text/smath/01/03090901.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090901.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090902.xhp b/helpcontent2/source/text/smath/01/03090902.xhp
index 0cb3044461..7fdd2ccbf4 100644
--- a/helpcontent2/source/text/smath/01/03090902.xhp
+++ b/helpcontent2/source/text/smath/01/03090902.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090902.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090903.xhp b/helpcontent2/source/text/smath/01/03090903.xhp
index e3f32a81b3..2e9dcec100 100644
--- a/helpcontent2/source/text/smath/01/03090903.xhp
+++ b/helpcontent2/source/text/smath/01/03090903.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090903.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090904.xhp b/helpcontent2/source/text/smath/01/03090904.xhp
index 6e98c8760c..bfcd891dc4 100644
--- a/helpcontent2/source/text/smath/01/03090904.xhp
+++ b/helpcontent2/source/text/smath/01/03090904.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090904.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090905.xhp b/helpcontent2/source/text/smath/01/03090905.xhp
index f72bcc764a..c335ffa500 100644
--- a/helpcontent2/source/text/smath/01/03090905.xhp
+++ b/helpcontent2/source/text/smath/01/03090905.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090905.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090906.xhp b/helpcontent2/source/text/smath/01/03090906.xhp
index 80b705cbc5..383256852d 100644
--- a/helpcontent2/source/text/smath/01/03090906.xhp
+++ b/helpcontent2/source/text/smath/01/03090906.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090906.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090907.xhp b/helpcontent2/source/text/smath/01/03090907.xhp
index a7b335ee1e..ab487e98c7 100644
--- a/helpcontent2/source/text/smath/01/03090907.xhp
+++ b/helpcontent2/source/text/smath/01/03090907.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090907.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090908.xhp b/helpcontent2/source/text/smath/01/03090908.xhp
index 2f4347bf64..191214b89f 100644
--- a/helpcontent2/source/text/smath/01/03090908.xhp
+++ b/helpcontent2/source/text/smath/01/03090908.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090908.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090909.xhp b/helpcontent2/source/text/smath/01/03090909.xhp
index 6cdfaefbe5..1729601df9 100644
--- a/helpcontent2/source/text/smath/01/03090909.xhp
+++ b/helpcontent2/source/text/smath/01/03090909.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090909.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03090910.xhp b/helpcontent2/source/text/smath/01/03090910.xhp
index 0dd803e3b1..3d4506632b 100644
--- a/helpcontent2/source/text/smath/01/03090910.xhp
+++ b/helpcontent2/source/text/smath/01/03090910.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090910.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03091100.xhp b/helpcontent2/source/text/smath/01/03091100.xhp
index 7b5a808a83..ed63c73cd2 100644
--- a/helpcontent2/source/text/smath/01/03091100.xhp
+++ b/helpcontent2/source/text/smath/01/03091100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,13 +47,13 @@
 <paragraph role="paragraph" id="par_id3150342" xml-lang="en-US" l10n="U" oldref="2">Note: the quotation marks in the examples are used to emphasize text and do not belong to the content of the formulas and commands.</paragraph>
 <paragraph role="warning" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="3">When typing example formulas into the <emph>Commands</emph> window, note that spaces are often required for correct structure.</paragraph>
 <paragraph role="paragraph" id="par_id3149054" xml-lang="en-US" l10n="U" oldref="4">Braces "{}" are used to group expressions together to form one new expression. For example, "sqrt {x * y}" is the square root of the entire product x*y, while "sqrt x * y" is the square root of x multiplied by y. Braces do not require an extra space.</paragraph>
-<paragraph role="paragraph" id="par_id3151392" xml-lang="en-US" l10n="U" oldref="5">Set brackets were previously inserted in the Selection window or directly in the Commands window as "left lbrace &lt;?&gt; right rbrace". Now, a left and a right set bracket can also be inserted using "lbrace" and "rbrace", without or without wildcards.</paragraph>
+<paragraph role="paragraph" id="par_id3151392" xml-lang="en-US" l10n="CHG" oldref="5">Set brackets were previously inserted in the Formula Elements window or directly in the Commands window as "left lbrace &lt;?&gt; right rbrace". Now, a left and a right set bracket can also be inserted using "lbrace" and "rbrace", with or without wildcards.</paragraph>
 <paragraph role="paragraph" id="par_id3147403" xml-lang="en-US" l10n="U" oldref="6">There are a total of eight (8) different types of brackets available. The "ceil" and "floor" brackets are often used for rounding up or down the argument to the next integer: "lceil -3.7 rceil = -3" or "lfloor -3.7 rfloor = -4".</paragraph>
 <paragraph role="paragraph" id="par_id3146320" xml-lang="en-US" l10n="U" oldref="63">Operator brackets, also known as Bra-kets (angle brackets with a vertical line in between), are common in Physics notation: "langle a mline b rangle" or "langle a mline b mline c over d mline e rangle." The height and positioning of the vertical lines always corresponds exactly to the enclosing brackets.</paragraph>
 <paragraph role="paragraph" id="par_id3157870" xml-lang="en-US" l10n="U" oldref="7">All brackets may only be used in pairs. The brackets have some common characteristics:</paragraph>
-<paragraph role="paragraph" id="par_id3155761" xml-lang="en-US" l10n="U" oldref="8">All types of brackets have the same grouping function as described for "{}"<emph>-</emph> brackets.</paragraph>
+<paragraph role="paragraph" id="par_id3155761" xml-lang="en-US" l10n="CHG" oldref="8">All types of brackets have the same grouping function as described for "{}" brackets.</paragraph>
 <paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="U" oldref="9">All types of brackets, including those that are visible, permit empty group definition. The enclosed expression may therefore be empty.</paragraph>
-<paragraph role="paragraph" id="par_id3154562" xml-lang="en-US" l10n="U" oldref="10">Brackets do not adjust their size to the enclosed expression. For example, if you want "( a over b )" with a bracket size adjusted to a and b you must insert "left" and "right". Entering "left(a over b right)" produces appropriate sizing. If, however, the brackets themselves are part of the expression whose size is changed, they are included the size change: "size 3(a over b)" and "size 12(a over b)". The sizing of the bracket-to-bracket expression ratio does not change in any way.</paragraph>
+<paragraph role="paragraph" id="par_id3154562" xml-lang="en-US" l10n="U" oldref="10">Brackets do not adjust their size to the enclosed expression. For example, if you want "( a over b )" with a bracket size adjusted to a and b you must insert "left" and "right". Entering "left(a over b right)" produces appropriate sizing. If, however, the brackets themselves are part of the expression whose size is changed, they are included the size change: "size 3(a over b)" and "size 12(a over b)". The sizing of the bracket-to-expression ratio does not change in any way.</paragraph>
 <paragraph role="paragraph" id="par_id3153002" xml-lang="en-US" l10n="U" oldref="11">Since "left" and "right" ensure unique assignment of the brackets, every single bracket can be used as an argument for these two commands, even placing right brackets on the left side, or left brackets on the right. Instead of a bracket you can use the "none" qualifier, which means that there is no bracket shown and that there is no space reserved for a bracket. Using this, you can create the following expressions:</paragraph>
 <list type="unordered">
 <listitem>
diff --git a/helpcontent2/source/text/smath/01/03091200.xhp b/helpcontent2/source/text/smath/01/03091200.xhp
index fae39a36ef..b1fd04bdde 100644
--- a/helpcontent2/source/text/smath/01/03091200.xhp
+++ b/helpcontent2/source/text/smath/01/03091200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03091300.xhp b/helpcontent2/source/text/smath/01/03091300.xhp
index 9368dffeb3..185dec463c 100644
--- a/helpcontent2/source/text/smath/01/03091300.xhp
+++ b/helpcontent2/source/text/smath/01/03091300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091300.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03091400.xhp b/helpcontent2/source/text/smath/01/03091400.xhp
index 1e487a759d..7b63344c08 100644
--- a/helpcontent2/source/text/smath/01/03091400.xhp
+++ b/helpcontent2/source/text/smath/01/03091400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091400.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/03091500.xhp b/helpcontent2/source/text/smath/01/03091500.xhp
index e1bc03d17e..54680b8f07 100644
--- a/helpcontent2/source/text/smath/01/03091500.xhp
+++ b/helpcontent2/source/text/smath/01/03091500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091500.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3155961" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="reference"><link href="text/smath/01/03091500.xhp" name="Formula Reference Tables">Formula Reference Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149502" xml-lang="en-US" l10n="CHG" oldref="350"><variable id="ref">This reference section contains lists of many operators, functions, symbols and formatting features available in <emph>$[officename] Math</emph>. Many of the commands displayed can be inserted using the icons in the <emph>Selection</emph> window or the context menu of the <emph>Commands</emph> window. 
+<paragraph role="paragraph" id="par_id3149502" xml-lang="en-US" l10n="CHG" oldref="350"><variable id="ref">This reference section contains lists of many operators, functions, symbols and formatting features available in <emph>$[officename] Math</emph>. Many of the commands displayed can be inserted using the icons in the <emph>Formula Elements</emph> window or the context menu of the <emph>Commands</emph> window. 
 </variable></paragraph>
 <embed href="text/smath/01/03091501.xhp#unary"/>
 <embed href="text/smath/01/03091502.xhp#relations"/>
diff --git a/helpcontent2/source/text/smath/01/03091501.xhp b/helpcontent2/source/text/smath/01/03091501.xhp
index 09ff59bb2f..65b64d5213 100644
--- a/helpcontent2/source/text/smath/01/03091501.xhp
+++ b/helpcontent2/source/text/smath/01/03091501.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091501.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <paragraph role="tablehead" id="par_idN106F7" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3151388" xml-lang="en-US" l10n="U" oldref="472">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3151388" xml-lang="en-US" l10n="U" oldref="472">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="474">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091502.xhp b/helpcontent2/source/text/smath/01/03091502.xhp
index b8cf2aadee..e4c49f30ac 100644
--- a/helpcontent2/source/text/smath/01/03091502.xhp
+++ b/helpcontent2/source/text/smath/01/03091502.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091502.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN10C98" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154032" xml-lang="en-US" l10n="U" oldref="475">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3154032" xml-lang="en-US" l10n="U" oldref="475">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3147272" xml-lang="en-US" l10n="U" oldref="477">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091503.xhp b/helpcontent2/source/text/smath/01/03091503.xhp
index d1a083aac0..2ba449b5fb 100644
--- a/helpcontent2/source/text/smath/01/03091503.xhp
+++ b/helpcontent2/source/text/smath/01/03091503.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091503.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN1130F" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145724" xml-lang="en-US" l10n="U" oldref="478">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3145724" xml-lang="en-US" l10n="U" oldref="478">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3158137" xml-lang="en-US" l10n="U" oldref="480">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091504.xhp b/helpcontent2/source/text/smath/01/03091504.xhp
index b4e7a8bc5d..baf604cd0c 100644
--- a/helpcontent2/source/text/smath/01/03091504.xhp
+++ b/helpcontent2/source/text/smath/01/03091504.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091504.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN11838" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156681" xml-lang="en-US" l10n="U" oldref="481">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3156681" xml-lang="en-US" l10n="U" oldref="481">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3156750" xml-lang="en-US" l10n="U" oldref="483">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091505.xhp b/helpcontent2/source/text/smath/01/03091505.xhp
index 5db9ab7a71..6534b3a20f 100644
--- a/helpcontent2/source/text/smath/01/03091505.xhp
+++ b/helpcontent2/source/text/smath/01/03091505.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091505.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN11DE4" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3143994" xml-lang="en-US" l10n="U" oldref="484">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3143994" xml-lang="en-US" l10n="U" oldref="484">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3144064" xml-lang="en-US" l10n="U" oldref="486">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091506.xhp b/helpcontent2/source/text/smath/01/03091506.xhp
index 089b97494d..b7d5fce23d 100644
--- a/helpcontent2/source/text/smath/01/03091506.xhp
+++ b/helpcontent2/source/text/smath/01/03091506.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091506.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN12175" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3167610" xml-lang="en-US" l10n="U" oldref="487">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3167610" xml-lang="en-US" l10n="U" oldref="487">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3167680" xml-lang="en-US" l10n="U" oldref="489">Meaning</paragraph>
@@ -157,7 +154,7 @@
 </tablecell>
 <tablecell colspan="" rowspan=""/>
 <tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3161843"><bookmark_value>formulas;in color</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3161843"><bookmark_value>formulas;in color</bookmark_value><bookmark_value>colors;in formulas</bookmark_value>
 </bookmark>
 <paragraph role="tablecontent" id="par_id3161843" xml-lang="en-US" l10n="U" oldref="349">The <emph>color</emph> command changes the character color; first enter the <emph>color</emph> command directly in the <emph>Commands</emph> window. Then enter the color name (black, white, cyan, magenta, red, blue, green, or yellow). Then enter the characters to be changed.</paragraph>
 </tablecell>
@@ -411,7 +408,7 @@
 </tablerow>
 </table>
 <section id="relatedtopics">
-<embed href="text/smath/01/03090600.xhp#attribute"/>
+<embed href="text/smath/01/03090600.xhp#attributes"/>
 <embed href="text/smath/01/03091500.xhp#reference"/>
 </section>
 </body>
diff --git a/helpcontent2/source/text/smath/01/03091507.xhp b/helpcontent2/source/text/smath/01/03091507.xhp
index 789c0e75ab..2c846d59fd 100644
--- a/helpcontent2/source/text/smath/01/03091507.xhp
+++ b/helpcontent2/source/text/smath/01/03091507.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091507.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN126E6" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3162086" xml-lang="en-US" l10n="U" oldref="490">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3162086" xml-lang="en-US" l10n="U" oldref="490">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3162156" xml-lang="en-US" l10n="U" oldref="492">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091508.xhp b/helpcontent2/source/text/smath/01/03091508.xhp
index d08deac2b8..c4c4669dbb 100644
--- a/helpcontent2/source/text/smath/01/03091508.xhp
+++ b/helpcontent2/source/text/smath/01/03091508.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091508.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 <paragraph role="tablehead" id="par_idN12B53" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3180684" xml-lang="en-US" l10n="U" oldref="493">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3180684" xml-lang="en-US" l10n="U" oldref="493">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3180753" xml-lang="en-US" l10n="U" oldref="495">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091509.xhp b/helpcontent2/source/text/smath/01/03091509.xhp
index 54c20ba817..0da2b9e197 100644
--- a/helpcontent2/source/text/smath/01/03091509.xhp
+++ b/helpcontent2/source/text/smath/01/03091509.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091509.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <paragraph role="tablehead" id="par_idN1308F" xml-lang="en-US" l10n="NEW">Typed command(s)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3184320" xml-lang="en-US" l10n="U" oldref="496">Symbol in Selection Window</paragraph>
+<paragraph role="tablehead" id="par_id3184320" xml-lang="en-US" l10n="U" oldref="496">Symbol in Formula Elements Window</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3184389" xml-lang="en-US" l10n="U" oldref="498">Meaning</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03091600.xhp b/helpcontent2/source/text/smath/01/03091600.xhp
index d6706e7d5c..f723b6bee9 100644
--- a/helpcontent2/source/text/smath/01/03091600.xhp
+++ b/helpcontent2/source/text/smath/01/03091600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03091600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/05010000.xhp b/helpcontent2/source/text/smath/01/05010000.xhp
index 5f88f7740d..8250b869db 100644
--- a/helpcontent2/source/text/smath/01/05010000.xhp
+++ b/helpcontent2/source/text/smath/01/05010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,34 +56,34 @@ dedr: fixed #i30893#</lastedited>
 <paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="4">You can define fonts for the variables, functions, numbers and inserted text that form the elements of your formula.</paragraph>
 <paragraph role="paragraph" id="par_id3156318" xml-lang="en-US" l10n="U" oldref="5">The list boxes in the <emph>Fonts</emph> dialog display a default font for all elements. To change to a different font, click <emph>Modify</emph>, then select the element type. A new dialog box appears. Select the desired font and check any desired attributes, then click <emph>OK</emph>. To set the changes as the default fonts, click the <emph>Default</emph> button.</paragraph>
 <paragraph role="note" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="6">If you want to mark individual text segments with a font other than that used for the whole text, then enter the <link href="text/smath/01/05010000.xhp" name="FONT">Font</link> command in the <emph>Commands</emph> window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_LISTBOX_RID_FONTTYPEDIALOG_1" id="bm_id3147509" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:1" id="bm_id3147509" localize="false"/>
 <paragraph role="heading" id="hd_id3154262" xml-lang="en-US" level="3" l10n="U" oldref="7">Variables</paragraph>
 <paragraph role="paragraph" id="par_id3147516" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="STARMATH_LISTBOX_RID_FONTTYPEDIALOG_1">You can select the fonts for the variables in your formula.</ahelp> For example, in the formula x=SIN(y), x and y are variables, and will reflect the assigned font.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:2" id="bm_id3152943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:2" id="bm_id3152943" localize="false"/>
 <paragraph role="heading" id="hd_id3150708" xml-lang="en-US" level="3" l10n="U" oldref="9">Functions</paragraph>
 <paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:2">Select the fonts for names and properties of functions.</ahelp> For example, the functions in the formula x=SIN(y) are =SIN( ).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:3" id="bm_id3154603" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:3" id="bm_id3154603" localize="false"/>
 <paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="3" l10n="U" oldref="11">Numbers</paragraph>
 <paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:3">You can select the fonts for the numbers in your formula.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:4" id="bm_id3153773" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:4" id="bm_id3153773" localize="false"/>
 <paragraph role="heading" id="hd_id3153529" xml-lang="en-US" level="3" l10n="U" oldref="13">Text</paragraph>
 <paragraph role="paragraph" id="par_id3153780" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:4">Define the fonts for the text in your formula here.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152963" xml-lang="en-US" level="2" l10n="U" oldref="15">Custom Fonts</paragraph>
 <paragraph role="paragraph" id="par_id3154566" xml-lang="en-US" l10n="U" oldref="16">In this section of the <emph>Fonts</emph> dialog you can define fonts, with which you can format other text components in the formula. The three basic fonts <emph>Serif, Sans</emph> and <emph>Fixed</emph> are available. You can add any other font to each standard installed basic font. Every font installed on your system is available for you to use. Select the <emph>Modify</emph> button to expand the selection offered in the list box.</paragraph>
 <paragraph role="paragraph" id="par_id3151315" xml-lang="en-US" l10n="U" oldref="17">These custom fonts are used if you set a different font with the FONT command in the <emph>Commands</emph> window. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:5" id="bm_id3151101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:5" id="bm_id3151101" localize="false"/>
 <paragraph role="heading" id="hd_id3153670" xml-lang="en-US" level="3" l10n="U" oldref="22">Serif</paragraph>
 <paragraph role="paragraph" id="par_id3151108" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:5">You can specify the font to be used for the <emph>font serif</emph> format.</ahelp> Serifs are the small "guides" that can be seen, for example, at the bottom of a capital A when the Times serif font is used. Using serifs is quite helpful since it guides a reader's eye in a straight line and can speed up reading.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:6" id="bm_id3155893" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:6" id="bm_id3155893" localize="false"/>
 <paragraph role="heading" id="hd_id3150836" xml-lang="en-US" level="3" l10n="U" oldref="24">Sans</paragraph>
 <paragraph role="paragraph" id="par_id3155900" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:6">You can specify the font to be used for <emph>sans</emph> font formatting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:LISTBOX:RID_FONTTYPEDIALOG:7" id="bm_id3154192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_FONTTYPEDIALOG:7" id="bm_id3154192" localize="false"/>
 <paragraph role="heading" id="hd_id3149340" xml-lang="en-US" level="3" l10n="U" oldref="26">Fixed</paragraph>
 <paragraph role="paragraph" id="par_id3154198" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="STARMATH:LISTBOX:RID_FONTTYPEDIALOG:7">You can specify the font to be used for <emph>fixed</emph> font formatting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:MENUBUTTON:RID_FONTTYPEDIALOG:1" id="bm_id3146925" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:MenuButton:RID_FONTTYPEDIALOG:1" id="bm_id3146925" localize="false"/>
 <paragraph role="heading" id="hd_id3159194" xml-lang="en-US" level="2" l10n="U" oldref="28">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3146932" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="STARMATH:MENUBUTTON:RID_FONTTYPEDIALOG:1">Click one of the choices from this pop-up menu to access the <link href="text/smath/01/05010100.xhp" name="Fonts">Fonts</link> dialog, where you can define the font and attributes for the respective formula and for custom fonts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:PUSHBUTTON:RID_FONTTYPEDIALOG:2" id="bm_id3155180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_FONTTYPEDIALOG:2" id="bm_id3155180" localize="false"/>
 <paragraph role="heading" id="hd_id3149304" xml-lang="en-US" level="2" l10n="U" oldref="30">Default</paragraph>
 <paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="STARMATH:PUSHBUTTON:RID_FONTTYPEDIALOG:2">Click this button to save your changes as the default for all new formulas.</ahelp> After confirming the changes, click the <emph>Yes</emph> button.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/smath/01/05010100.xhp b/helpcontent2/source/text/smath/01/05010100.xhp
index 5ab52a0eeb..ce7ed3dafa 100755
--- a/helpcontent2/source/text/smath/01/05010100.xhp
+++ b/helpcontent2/source/text/smath/01/05010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05010100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,20 +41,20 @@
   
   
   
-  <bookmark branch="hid/STARMATH_MODALDIALOG_RID_FONTDIALOG" xml-lang="en-US" id="bm_id3153144"/><paragraph role="heading" level="1" id="hd_id3153188" l10n="U" xml-lang="en-US" oldref="1">Fonts</paragraph>
+  <bookmark branch="hid/starmath:ModalDialog:RID_FONTDIALOG" xml-lang="en-US" id="bm_id3153144"/><paragraph role="heading" level="1" id="hd_id3153188" l10n="U" xml-lang="en-US" oldref="1">Fonts</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3152598" xml-lang="en-US" oldref="2"><ahelp visibility="visible" hid="STARMATH_MODALDIALOG_RID_FONTDIALOG">Use this dialog to select the font for the respective category in the <emph>Fonts</emph> dialog.</ahelp></paragraph>
   <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#fmtssa"/>
 </section>
-  <bookmark branch="hid/STARMATH_COMBOBOX_RID_FONTDIALOG_1" xml-lang="en-US" id="bm_id3155064"/><paragraph role="heading" level="2" id="hd_id3149124" l10n="U" xml-lang="en-US" oldref="3">Font</paragraph>
+  <bookmark branch="hid/starmath:ComboBox:RID_FONTDIALOG:1" xml-lang="en-US" id="bm_id3155064"/><paragraph role="heading" level="2" id="hd_id3149124" l10n="U" xml-lang="en-US" oldref="3">Font</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153713" xml-lang="en-US" oldref="4"><ahelp hid="STARMATH_COMBOBOX_RID_FONTDIALOG_1" visibility="visible">Select a font from the list.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3154702" l10n="U" xml-lang="en-US" oldref="5">Example</paragraph>
   <paragraph role="paragraph" id="par_id3154020" l10n="U" xml-lang="en-US" oldref="6">You can see a preview of the selected font with its attributes.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3154656" l10n="U" xml-lang="en-US" oldref="7">Attributes</paragraph>
   <paragraph role="paragraph" id="par_id3150208" l10n="U" xml-lang="en-US" oldref="8">You can assign additional attributes to the selected font.</paragraph>
-  <bookmark branch="hid/STARMATH_CHECKBOX_RID_FONTDIALOG_1" xml-lang="en-US" id="bm_id3148700"/><paragraph role="heading" level="3" id="hd_id3154486" l10n="U" xml-lang="en-US" oldref="9">Bold</paragraph>
+  <bookmark branch="hid/starmath:CheckBox:RID_FONTDIALOG:1" xml-lang="en-US" id="bm_id3148700"/><paragraph role="heading" level="3" id="hd_id3154486" l10n="U" xml-lang="en-US" oldref="9">Bold</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3148839" xml-lang="en-US" oldref="10"><ahelp hid="STARMATH_CHECKBOX_RID_FONTDIALOG_1" visibility="visible">Check this box to assign the bold attribute to the font.</ahelp></paragraph>
-  <bookmark branch="hid/STARMATH_CHECKBOX_RID_FONTDIALOG_2" xml-lang="en-US" id="bm_id3150210"/><paragraph role="heading" level="3" id="hd_id3148868" l10n="U" xml-lang="en-US" oldref="11">Italic</paragraph>
+  <bookmark branch="hid/starmath:CheckBox:RID_FONTDIALOG:2" xml-lang="en-US" id="bm_id3150210"/><paragraph role="heading" level="3" id="hd_id3148868" l10n="U" xml-lang="en-US" oldref="11">Italic</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149126" xml-lang="en-US" oldref="12"><ahelp hid="STARMATH_CHECKBOX_RID_FONTDIALOG_2" visibility="visible">Check this box to assign the italic attribute to the font.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/smath/01/05020000.xhp b/helpcontent2/source/text/smath/01/05020000.xhp
index 944a498de8..0600348544 100644
--- a/helpcontent2/source/text/smath/01/05020000.xhp
+++ b/helpcontent2/source/text/smath/01/05020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,22 +49,22 @@
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#fmtsgr"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1" id="bm_id3149873" localize="false"/><paragraph role="heading" id="hd_id3146968" xml-lang="en-US" level="2" l10n="U" oldref="3">Base size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:1" id="bm_id3149873" localize="false"/><paragraph role="heading" id="hd_id3146968" xml-lang="en-US" level="2" l10n="U" oldref="3">Base size</paragraph>
 <paragraph role="paragraph" id="par_id3145115" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1">All elements of a formula are proportionally scaled to the base size. To change the base size, select or type in the desired point (pt) size. You can also use other units of measure or other <link href="text/shared/00/00000001.xhp#metrik" name="metrics">metrics</link>, which are then automatically converted to points.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3153005" xml-lang="en-US" l10n="CHG" oldref="19">To permanently change the default size (12 pt) used in $[officename] Math, you must first set the size (for example, 11 pt) and then click the <emph>Default</emph> button.</paragraph>
 <paragraph role="heading" id="hd_id3153735" xml-lang="en-US" level="2" l10n="U" oldref="5">Relative Sizes</paragraph>
 <paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="6">In this section, you can determine the relative sizes for each type of element with reference to the base size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:4" id="bm_id3148768" localize="false"/><paragraph role="heading" id="hd_id3150935" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:4" id="bm_id3148768" localize="false"/><paragraph role="heading" id="hd_id3150935" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
 <paragraph role="paragraph" id="par_id3148774" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:4">Select the size for text in a formula relative to the base size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:5" id="bm_id3149022" localize="false"/><paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="3" l10n="U" oldref="9">Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:5" id="bm_id3149022" localize="false"/><paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="3" l10n="U" oldref="9">Indexes</paragraph>
 <paragraph role="paragraph" id="par_id3149029" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:5">Select the relative size for the indexes in a formula in proportion to the base size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:6" id="bm_id3156263" localize="false"/><paragraph role="heading" id="hd_id3155371" xml-lang="en-US" level="3" l10n="U" oldref="11">Functions</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:6" id="bm_id3156263" localize="false"/><paragraph role="heading" id="hd_id3155371" xml-lang="en-US" level="3" l10n="U" oldref="11">Functions</paragraph>
 <paragraph role="paragraph" id="par_id3153923" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:6">Select the relative size for names and other function elements in a formula in proportion to the base size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:7" id="bm_id3153722" localize="false"/><paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="13">Operators</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:7" id="bm_id3153722" localize="false"/><paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="13">Operators</paragraph>
 <paragraph role="paragraph" id="par_id3083280" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:7">Select the relative size of the mathematical operators in a formula in proportion to the base size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:8" id="bm_id3151182" localize="false"/><paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="3" l10n="U" oldref="15">Limits</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_FONTSIZEDIALOG:8" id="bm_id3151182" localize="false"/><paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="3" l10n="U" oldref="15">Limits</paragraph>
 <paragraph role="paragraph" id="par_id3151189" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:8">Select the relative size for the limits in a formula in proportion to the base size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:PUSHBUTTON:RID_FONTSIZEDIALOG:1" id="bm_id3151271" localize="false"/><paragraph role="heading" id="hd_id3156320" xml-lang="en-US" level="2" l10n="U" oldref="17">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_FONTSIZEDIALOG:1" id="bm_id3151271" localize="false"/><paragraph role="heading" id="hd_id3156320" xml-lang="en-US" level="2" l10n="U" oldref="17">Default</paragraph>
 <paragraph role="paragraph" id="par_id3145206" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="STARMATH:PUSHBUTTON:RID_FONTSIZEDIALOG:1">Click this button to save your changes as a default for all new formulas.</ahelp> A security response appears before saving any changes.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/smath/01/05030000.xhp b/helpcontent2/source/text/smath/01/05030000.xhp
index 587d14470e..f6bdbe4fcc 100755
--- a/helpcontent2/source/text/smath/01/05030000.xhp
+++ b/helpcontent2/source/text/smath/01/05030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
   <embed href="text/smath/00/00000004.xhp#fmtabs"/>
 </section>
 <paragraph role="paragraph" id="par_id3143228" xml-lang="en-US" l10n="U" oldref="3">Use the <emph>Category</emph> button to determine the formula element for which you would like to specify the spacing. The appearance of the dialog depends on the selected category. A preview window shows you which spacing is modified through the respective boxes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:MENUBUTTON:RID_DISTANCEDIALOG:1" id="bm_id3153811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:MenuButton:RID_DISTANCEDIALOG:1" id="bm_id3153811" localize="false"/>
 <paragraph role="heading" id="hd_id3154653" xml-lang="en-US" level="2" l10n="U" oldref="5">Category</paragraph>
 <paragraph role="paragraph" id="par_id3149873" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="STARMATH:MENUBUTTON:RID_DISTANCEDIALOG:1">This button allows you to select the category for which you would like to change the spacing.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150391" xml-lang="en-US" level="2" l10n="U" oldref="7">Spacing</paragraph>
@@ -110,7 +107,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BRACKET_DIST" id="bm_id3149804" localize="false"/>
 <paragraph role="heading" id="hd_id3109843" xml-lang="en-US" level="3" l10n="U" oldref="43">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_SMA_BRACKET_DIST">Determines the horizontal distance between the contents and the upper end of the brackets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:CHECKBOX:RID_DISTANCEDIALOG:1" id="bm_id3154792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_DISTANCEDIALOG:1" id="bm_id3154792" localize="false"/>
 <paragraph role="heading" id="hd_id3153531" xml-lang="en-US" level="3" l10n="U" oldref="77">Scale all brackets</paragraph>
 <paragraph role="paragraph" id="par_id3154799" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="STARMATH:CHECKBOX:RID_DISTANCEDIALOG:1">Scales all types of brackets.</ahelp> If you then enter <emph>( a over b)</emph> in the <emph>Commands</emph> window, the brackets will surround the whole height of the argument. You normally achieve this effect by entering <emph>left ( a over b right )</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SMA_BRACKET_EXCHEIGHT2" id="bm_id3151111" localize="false"/>
@@ -155,7 +152,7 @@
 <paragraph role="heading" id="hd_id3147584" xml-lang="en-US" level="3" l10n="U" oldref="74">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3148746" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="HID_SMA_LOWERBORDER_DIST">The bottom border is positioned between the formula and background.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD" id="bm_id3155136" localize="false"/>
 <paragraph role="heading" id="hd_id3147326" xml-lang="en-US" level="2" l10n="U" oldref="63">Default</paragraph>
 <paragraph role="paragraph" id="par_id3155143" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_ADD">Saves your changes as your default settings for all new formulas.</ahelp> A security response will appear before saving these changes.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/smath/01/05040000.xhp b/helpcontent2/source/text/smath/01/05040000.xhp
index c71a32ecc0..33bb3596a9 100644
--- a/helpcontent2/source/text/smath/01/05040000.xhp
+++ b/helpcontent2/source/text/smath/01/05040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,14 +48,14 @@
 </section>
   <paragraph role="heading" level="2" id="hd_id3153737" l10n="U" xml-lang="en-US" oldref="3">Horizontal</paragraph>
   <paragraph role="paragraph" id="par_id3148388" l10n="U" xml-lang="en-US" oldref="4">Specifies the type of horizontal alignment for multi-line formulas.</paragraph>
-  <bookmark branch="hid/STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:1" xml-lang="en-US" id="bm_id3156063"/><paragraph role="heading" level="3" id="hd_id3148768" l10n="U" xml-lang="en-US" oldref="5">Left</paragraph>
+  <bookmark branch="hid/starmath:RadioButton:RID_ALIGNDIALOG:1" xml-lang="en-US" id="bm_id3156063"/><paragraph role="heading" level="3" id="hd_id3148768" l10n="U" xml-lang="en-US" oldref="5">Left</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150566" xml-lang="en-US" oldref="6"><ahelp hid="STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:1" visibility="visible">Aligns the selected elements of a formula to the left.</ahelp></paragraph>
   <paragraph role="tip" id="par_id3149709" l10n="U" xml-lang="en-US" oldref="21">Text is always aligned left. </paragraph>
-  <bookmark branch="hid/STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:2" xml-lang="en-US" id="bm_id3151189"/><paragraph role="heading" level="3" id="hd_id3154646" l10n="U" xml-lang="en-US" oldref="7">Centered</paragraph>
+  <bookmark branch="hid/starmath:RadioButton:RID_ALIGNDIALOG:2" xml-lang="en-US" id="bm_id3151189"/><paragraph role="heading" level="3" id="hd_id3154646" l10n="U" xml-lang="en-US" oldref="7">Centered</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150762" xml-lang="en-US" oldref="8"><ahelp hid="STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:2" visibility="visible">Aligns the elements of a formula to the center.</ahelp></paragraph>
-  <bookmark branch="hid/STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:3" xml-lang="en-US" id="bm_id3147565"/><paragraph role="heading" level="3" id="hd_id3145204" l10n="U" xml-lang="en-US" oldref="9">Right</paragraph>
+  <bookmark branch="hid/starmath:RadioButton:RID_ALIGNDIALOG:3" xml-lang="en-US" id="bm_id3147565"/><paragraph role="heading" level="3" id="hd_id3145204" l10n="U" xml-lang="en-US" oldref="9">Right</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3151264" xml-lang="en-US" oldref="10"><ahelp hid="STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:3" visibility="visible">Aligns the elements of a formula to the right.</ahelp></paragraph>
-  <bookmark branch="hid/STARMATH:PUSHBUTTON:RID_ALIGNDIALOG:1" xml-lang="en-US" id="bm_id3153153"/><paragraph role="heading" level="2" id="hd_id3150261" l10n="U" xml-lang="en-US" oldref="19">Default</paragraph>
+  <bookmark branch="hid/starmath:PushButton:RID_ALIGNDIALOG:1" xml-lang="en-US" id="bm_id3153153"/><paragraph role="heading" level="2" id="hd_id3150261" l10n="U" xml-lang="en-US" oldref="19">Default</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153622" xml-lang="en-US" oldref="20"><ahelp hid="STARMATH:PUSHBUTTON:RID_ALIGNDIALOG:1" visibility="visible">Click here to save your changes as the default settings for new formulas.</ahelp> A security response will appear before saving.</paragraph>
   
  </body>
diff --git a/helpcontent2/source/text/smath/01/05050000.xhp b/helpcontent2/source/text/smath/01/05050000.xhp
index 7e172ed161..8f44572e36 100755
--- a/helpcontent2/source/text/smath/01/05050000.xhp
+++ b/helpcontent2/source/text/smath/01/05050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05050000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/06010000.xhp b/helpcontent2/source/text/smath/01/06010000.xhp
index ed0f9df679..438ff5cd18 100755
--- a/helpcontent2/source/text/smath/01/06010000.xhp
+++ b/helpcontent2/source/text/smath/01/06010000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <bookmark_value>Greek symbols in formulas</bookmark_value>
 <bookmark_value>formulas; entering symbols in</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_MODALDIALOG_RID_SYMBOLDIALOG" id="bm_id3147339" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ModalDialog:RID_SYMBOLDIALOG" id="bm_id3147339" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_SYMBOLS" id="bm_id3154254" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_SYMBOLS_CATALOGUE" id="bm_id3155959" localize="false"/>
 <paragraph role="heading" id="hd_id3153715" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/01/06010000.xhp" name="Catalog">Catalog</link></paragraph>
@@ -59,12 +56,12 @@
 <section id="howtoget">
 <embed href="text/smath/00/00000004.xhp#etssbl"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_LISTBOX_RID_SYMBOLDIALOG_1" id="bm_id3145388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_SYMBOLDIALOG:1" id="bm_id3145388" localize="false"/>
 <paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="2" l10n="U" oldref="4">Symbol Set</paragraph>
 <paragraph role="paragraph" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="STARMATH_LISTBOX_RID_SYMBOLDIALOG_1">All symbols are organized into symbol sets. Select the desired symbol set from the list box. The corresponding group of symbols appear in the field below.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153917" xml-lang="en-US" l10n="U" oldref="7">When a symbol is selected, its command name appears below the symbol list and a magnified version appears in a box to the right. Note that the name must be typed in the <emph>Commands</emph> window exactly as displayed here (case-sensitive).</paragraph>
 <paragraph role="paragraph" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="3">To insert a symbol, select it from the list and click <emph>Insert</emph>. The corresponding command name appears in the <emph>Commands</emph> window. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_1" id="bm_id3146964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMBOLDIALOG:1" id="bm_id3146964" localize="false"/>
 <paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="2" l10n="U" oldref="8">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_1">Click here to open the <link href="text/smath/01/06010100.xhp" name="Edit Symbols">Edit Symbols</link> dialog.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#uebernehmen"/>
diff --git a/helpcontent2/source/text/smath/01/06010100.xhp b/helpcontent2/source/text/smath/01/06010100.xhp
index 7ffdd61d95..577bd626e1 100644
--- a/helpcontent2/source/text/smath/01/06010100.xhp
+++ b/helpcontent2/source/text/smath/01/06010100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06010100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_MODALDIALOG_RID_SYMDEFINEDIALOG" id="bm_id3149379" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ModalDialog:RID_SYMDEFINEDIALOG" id="bm_id3149379" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2123477"><bookmark_value>new symbols in %PRODUCTNAME Math</bookmark_value>
 <bookmark_value>symbols; adding in %PRODUCTNAME Math</bookmark_value>
 </bookmark>
@@ -52,43 +49,42 @@
 <section id="howtoget">
   <embed href="text/smath/00/00000004.xhp#etssba"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_1" id="bm_id3154253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:1" id="bm_id3154253" localize="false"/>
 <paragraph role="heading" id="hd_id3146066" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Old Symbol</paragraph>
 <paragraph role="paragraph" id="par_id3153965" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_1">Select the name of the current symbol.</ahelp> The symbol, the name of the symbol, and the set that the symbol belongs to are displayed in the left preview pane at the bottom of the dialog box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_2" id="bm_id3145791" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:2" id="bm_id3145791" localize="false"/>
 <paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="2" l10n="CHG" oldref="7">Old Symbol Set</paragraph>
 <paragraph role="paragraph" id="par_id3150209" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_2">This list box contains the name of the current symbol set. If you want, you can also select a different symbol set.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_4" id="bm_id3153816" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:4" id="bm_id3153816" localize="false"/>
 <paragraph role="heading" id="hd_id3145386" xml-lang="en-US" level="2" l10n="U" oldref="23">Symbol</paragraph>
 <paragraph role="paragraph" id="par_id3148870" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_4">Lists the names for the symbols in the current symbol set. Select a name from the list or type a name for a newly added symbol.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150215" xml-lang="en-US" level="3" l10n="CHG" oldref="28">Adding a New Symbol</paragraph>
 <paragraph role="paragraph" id="par_id3143233" xml-lang="en-US" l10n="CHG" oldref="6">To add a symbol to a symbol set, select a font in the <emph>Font</emph> box, and then click a symbol in symbols pane. In the <emph>Symbol</emph> box, type a name for the symbol. In the <emph>Symbol set</emph> list box, select a symbol set, or type a new name to create a new symbol set. The right preview pane displays the symbol that you selected. Click <emph>Add</emph> and then <emph>OK</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3151389" xml-lang="en-US" level="3" l10n="U" oldref="29">Modifying the Name of a Symbol</paragraph>
 <paragraph role="paragraph" id="par_id3147296" xml-lang="en-US" l10n="CHG" oldref="21">To change the name of a symbol, select the old name in the <emph>Old symbol</emph> list box. Then enter the new name in the <emph>Symbol</emph> box. Check whether the desired character is in the preview window before you click the <emph>Modify</emph> button. Click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_5" id="bm_id3148729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:5" id="bm_id3148729" localize="false"/>
 <paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="2" l10n="U" oldref="24">Symbol Set</paragraph>
-<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_5">The <emph>Symbol s</emph>
-<emph>et</emph> list box contains the names of all existing symbol sets. You can modify a symbol set or create a new one.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_5">The <emph>Symbol set</emph> list box contains the names of all existing symbol sets. You can modify a symbol set or create a new one.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="3" l10n="U" oldref="30">Creating a New Symbol Set</paragraph>
 <paragraph role="paragraph" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="22">To create a new symbol set, type a name for it in the <emph>Symbol set</emph> list box and add at least one symbol. Click <emph>OK</emph> to close the dialog. The new symbol set is now available under the new name.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_LISTBOX_RID_SYMDEFINEDIALOG_1" id="bm_id3147367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_SYMDEFINEDIALOG:1" id="bm_id3147367" localize="false"/>
 <paragraph role="heading" id="hd_id3153736" xml-lang="en-US" level="2" l10n="U" oldref="10">Font</paragraph>
 <paragraph role="paragraph" id="par_id3147374" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="STARMATH_LISTBOX_RID_SYMDEFINEDIALOG_1">Displays the name of the current font and enables you to select a different font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_LISTBOX_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET" id="bm_id3148769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET" id="bm_id3148769" localize="false"/>
 <paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2" l10n="U" oldref="32">Subset</paragraph>
 <paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="STARMATH_LISTBOX_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET">If you selected a non-symbol font in the <emph>Font</emph> list box, you can select a Unicode subset in which to place your new or edited symbol. When a subset has been selected, all symbols belonging to this subset of the current symbol set are displayed in the symbols list above.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_3" id="bm_id3149026" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:3" id="bm_id3149026" localize="false"/>
 <paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="2" l10n="U" oldref="19">Typeface</paragraph>
 <paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_3">The current typeface is displayed. You can change the typeface by selecting one from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_1" id="bm_id3155989" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMDEFINEDIALOG:1" id="bm_id3155989" localize="false"/>
 <paragraph role="heading" id="hd_id3156262" xml-lang="en-US" level="2" l10n="U" oldref="12">Add</paragraph>
 <paragraph role="paragraph" id="par_id3153922" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_1">Click this button to add the symbol shown in the right preview window to the current symbol set.</ahelp> It will be saved under the name displayed in the <emph>Symbol</emph> list box. You must specify a name under <emph>Symbol</emph> or <emph>Symbol Set</emph> to be able to use this button. Names cannot be used more than once.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_2" id="bm_id3147563" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMDEFINEDIALOG:2" id="bm_id3147563" localize="false"/>
 <paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="2" l10n="U" oldref="14">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_2">Click this button to replace the name of the symbol shown in the left preview window (the old name is displayed in the <emph>Old symbol</emph> list box) with the new name you have entered in the <emph>Symbol</emph> list box.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154640" xml-lang="en-US" level="3" l10n="U" oldref="31">Moving a Symbol to Another Symbol Set</paragraph>
 <paragraph role="tip" id="par_id3151174" xml-lang="en-US" l10n="U" oldref="27">As an example, to transfer the large ALPHA from the "Greek" set to the "Special" set, select the old set (Greek) and then the ALPHA symbol using the two top list boxes. The symbol appears in the left preview window. In the <emph>Symbol set</emph> list box, select the "Special" set. Click <emph>Modify</emph> and then <emph>OK</emph>. The ALPHA symbol is now only in the "Special" symbol set.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_3" id="bm_id3153578" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMDEFINEDIALOG:3" id="bm_id3153578" localize="false"/>
 <paragraph role="heading" id="hd_id3145414" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3154258" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="STARMATH_PUSHBUTTON_RID_SYMDEFINEDIALOG_3">Click to remove the symbol shown in the left preview window from the current symbol set.</ahelp> There will be no security query. Deleting the last remaining symbol of a symbol set also deletes the symbol set.</paragraph>
 <paragraph role="note" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="18">You can also click <emph>Cancel</emph> at any time to close the dialog without saving any of the changes.</paragraph>
diff --git a/helpcontent2/source/text/smath/01/06020000.xhp b/helpcontent2/source/text/smath/01/06020000.xhp
index 34d4cf63c9..4e13b2dedd 100755
--- a/helpcontent2/source/text/smath/01/06020000.xhp
+++ b/helpcontent2/source/text/smath/01/06020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06020000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/01/makefile.mk b/helpcontent2/source/text/smath/01/makefile.mk
index 0b48a36f61..c9b9f43bc8 100644
--- a/helpcontent2/source/text/smath/01/makefile.mk
+++ b/helpcontent2/source/text/smath/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -105,4 +101,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/02/03010000.xhp b/helpcontent2/source/text/smath/02/03010000.xhp
index 90c686e730..bc058d5b27 100755
--- a/helpcontent2/source/text/smath/02/03010000.xhp
+++ b/helpcontent2/source/text/smath/02/03010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03010000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/02/makefile.mk b/helpcontent2/source/text/smath/02/makefile.mk
index 877cfbf794..d3ebdd18e4 100644
--- a/helpcontent2/source/text/smath/02/makefile.mk
+++ b/helpcontent2/source/text/smath/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/04/01020000.xhp b/helpcontent2/source/text/smath/04/01020000.xhp
index 3d96e40dd5..8b215b35e3 100755
--- a/helpcontent2/source/text/smath/04/01020000.xhp
+++ b/helpcontent2/source/text/smath/04/01020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,7 +68,7 @@
 <paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="3" l10n="U" oldref="17">F9</paragraph>
 <paragraph role="paragraph" id="par_id3153003" xml-lang="en-US" l10n="U" oldref="18">Update</paragraph>
 </section>
-<paragraph role="heading" id="hd_id3153732" xml-lang="en-US" level="2" l10n="U" oldref="21">Navigation in the Selection Window</paragraph>
+<paragraph role="heading" id="hd_id3153732" xml-lang="en-US" level="2" l10n="U" oldref="21">Navigation in the Formula Elements Window</paragraph>
 <section id="Cu">
 <paragraph role="heading" id="hd_id3155927" xml-lang="en-US" level="3" l10n="U" oldref="23">Left or right arrow</paragraph>
 <paragraph role="paragraph" id="par_id3145249" xml-lang="en-US" l10n="U" oldref="24">Move left or right to the next category or function.</paragraph>
diff --git a/helpcontent2/source/text/smath/04/makefile.mk b/helpcontent2/source/text/smath/04/makefile.mk
index ed8b1dd086..f58e675f75 100644
--- a/helpcontent2/source/text/smath/04/makefile.mk
+++ b/helpcontent2/source/text/smath/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/guide/align.xhp b/helpcontent2/source/text/smath/guide/align.xhp
index ef1b7c22cf..10387acf1a 100755
--- a/helpcontent2/source/text/smath/guide/align.xhp
+++ b/helpcontent2/source/text/smath/guide/align.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: align.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/attributes.xhp b/helpcontent2/source/text/smath/guide/attributes.xhp
index 20a9b722e2..512bbf9131 100755
--- a/helpcontent2/source/text/smath/guide/attributes.xhp
+++ b/helpcontent2/source/text/smath/guide/attributes.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attributes.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/brackets.xhp b/helpcontent2/source/text/smath/guide/brackets.xhp
index 7690fabef8..e3723f7c8d 100755
--- a/helpcontent2/source/text/smath/guide/brackets.xhp
+++ b/helpcontent2/source/text/smath/guide/brackets.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brackets.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/comment.xhp b/helpcontent2/source/text/smath/guide/comment.xhp
index 02878e0ca5..8bc3789f34 100755
--- a/helpcontent2/source/text/smath/guide/comment.xhp
+++ b/helpcontent2/source/text/smath/guide/comment.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: comment.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/keyboard.xhp b/helpcontent2/source/text/smath/guide/keyboard.xhp
index ee06980afa..a842272f91 100755
--- a/helpcontent2/source/text/smath/guide/keyboard.xhp
+++ b/helpcontent2/source/text/smath/guide/keyboard.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,13 +69,13 @@
 <paragraph role="listitem" id="par_id3150391" xml-lang="en-US" l10n="U" oldref="9">The cursor waits in the Commands window and you can type the formula.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="13">You can compose formulas using the Selection window. Open it with the menu <emph>View - Selection</emph> if it is not already open.</paragraph>
+<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="13">You can compose formulas using the Formula Elements window. Open it with the menu <emph>View - Formula Elements</emph> if it is not already open.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3155625" xml-lang="en-US" l10n="U" oldref="10">If the Selection window is open, use F6 to switch from the Commands window to the Selection window and back.</paragraph>
+<paragraph role="listitem" id="par_id3155625" xml-lang="en-US" l10n="U" oldref="10">If the Formula Elements window is open, use F6 to switch from the Commands window to the Formula Elements window and back.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="2" l10n="U" oldref="11">Selection window</paragraph>
+<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="2" l10n="U" oldref="11">Formula Elements window</paragraph>
 <embed href="text/smath/04/01020000.xhp#Cu"/>
 <embed href="text/smath/04/01020000.xhp#CR"/>
 <embed href="text/smath/04/01020000.xhp#Tab"/>
diff --git a/helpcontent2/source/text/smath/guide/limits.xhp b/helpcontent2/source/text/smath/guide/limits.xhp
index 44e1ad67fe..dffd6b592e 100644
--- a/helpcontent2/source/text/smath/guide/limits.xhp
+++ b/helpcontent2/source/text/smath/guide/limits.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: limits.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id8811304" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Insert - Object - Formula</item>.</paragraph>
-<paragraph role="paragraph" id="par_id1276589" xml-lang="en-US" l10n="NEW">You see the Math input window and the Selection window. If you don't see the Selection window, you can enable it in the View menu.</paragraph>
+<paragraph role="paragraph" id="par_id1276589" xml-lang="en-US" l10n="NEW">You see the Math input window and the Formula Elements window. If you don't see the Formula Elements window, you can enable it in the View menu.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id3283791" xml-lang="en-US" l10n="NEW">In the upper part of the Selection window, click the <emph>Operators</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3283791" xml-lang="en-US" l10n="NEW">In the upper part of the Formula Elements window, click the <emph>Operators</emph> icon.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id9734794" xml-lang="en-US" l10n="NEW">In the lower part of the Selection window, click the <emph>Sum</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id9734794" xml-lang="en-US" l10n="NEW">In the lower part of the Formula Elements window, click the <emph>Sum</emph> icon.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id9641712" xml-lang="en-US" l10n="NEW">To enable lower and upper limits, click additionally the <emph>Upper and Lower Limits</emph> icon.</paragraph>
@@ -80,7 +77,7 @@
 <paragraph role="paragraph" id="par_id6756187" xml-lang="en-US" l10n="NEW">Now the formula is complete. Click into your text document outside the formula to leave the formula editor.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id9406414" xml-lang="en-US" l10n="NEW">In the same way, you can enter an Integral formula with limits. When you click an icon from the Selection window, the assigned text command is inserted in the input window. If you know the text commands, you can enter the commands directly in the input window.</paragraph>
+<paragraph role="paragraph" id="par_id9406414" xml-lang="en-US" l10n="NEW">In the same way, you can enter an Integral formula with limits. When you click an icon from the Formula Elements window, the assigned text command is inserted in the input window. If you know the text commands, you can enter the commands directly in the input window.</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id5866267" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Insert - Object - Formula</item>.</paragraph>
@@ -88,7 +85,7 @@
 <listitem>
 <paragraph role="paragraph" id="par_id1965697" xml-lang="en-US" l10n="NEW">Click in the input window and enter the following line:</paragraph>
 <paragraph role="code" id="par_id9004486" xml-lang="en-US" l10n="NEW">int from{a} to{b} f(x)`dx</paragraph>
-<paragraph role="paragraph" id="par_id4651020" xml-lang="en-US" l10n="NEW">A small gap exists between f(x) and dx, which you can also enter using the Selection window: click the <emph>Format</emph> icon, then the <emph>Small Gap</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id4651020" xml-lang="en-US" l10n="NEW">A small gap exists between f(x) and dx, which you can also enter using the Formula Elements window: click the <emph>Format</emph> icon, then the <emph>Small Gap</emph> icon.</paragraph>
 </listitem>
 </list>
 <paragraph role="note" id="par_id3877071" xml-lang="en-US" l10n="NEW">If you don't like the font of the letters f and x, choose <item type="menuitem">Format - Fonts</item> and select other fonts. Click the <emph>Default</emph> button to use the new fonts as default from now on.</paragraph>
diff --git a/helpcontent2/source/text/smath/guide/main.xhp b/helpcontent2/source/text/smath/guide/main.xhp
index 9bc8d7fd41..cd310067f0 100755
--- a/helpcontent2/source/text/smath/guide/main.xhp
+++ b/helpcontent2/source/text/smath/guide/main.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/makefile.mk b/helpcontent2/source/text/smath/guide/makefile.mk
index 681acddea4..ed76f2b992 100644
--- a/helpcontent2/source/text/smath/guide/makefile.mk
+++ b/helpcontent2/source/text/smath/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,4 +58,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/smath/guide/newline.xhp b/helpcontent2/source/text/smath/guide/newline.xhp
index 6e9b6296c9..50ffae97c3 100755
--- a/helpcontent2/source/text/smath/guide/newline.xhp
+++ b/helpcontent2/source/text/smath/guide/newline.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newline.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/parentheses.xhp b/helpcontent2/source/text/smath/guide/parentheses.xhp
index 55ba29efc3..94e2a47e09 100755
--- a/helpcontent2/source/text/smath/guide/parentheses.xhp
+++ b/helpcontent2/source/text/smath/guide/parentheses.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parentheses.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/guide/text.xhp b/helpcontent2/source/text/smath/guide/text.xhp
index e94c9df3eb..b8d573956c 100644
--- a/helpcontent2/source/text/smath/guide/text.xhp
+++ b/helpcontent2/source/text/smath/guide/text.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <paragraph role="paragraph" id="par_idN105D0" xml-lang="en-US" l10n="NEW">Examples:<comment>collected from several issues: i78812, i9167,  i21484, i25573</comment></paragraph>
 <paragraph role="paragraph" id="par_id521866" xml-lang="en-US" l10n="NEW">An imported MathType formula contains the following string</paragraph>
 <paragraph role="code" id="par_id9413739" xml-lang="en-US" l10n="NEW">W rSup { size 8{*} }</paragraph>
-<paragraph role="paragraph" id="par_id755943" xml-lang="en-US" l10n="NEW">If you have set up Math to convert imported MathType formulas (in Tools - Options - Load/Save - Microsoft Office), you see the formula with a placeholder instead of the asterisk.</paragraph>
+<paragraph role="paragraph" id="par_id755943" xml-lang="en-US" l10n="NEW">If you have set up Math to convert imported MathType formulas (in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - Microsoft Office), you see the formula with a placeholder instead of the asterisk.</paragraph>
 <paragraph role="paragraph" id="par_id5988952" xml-lang="en-US" l10n="NEW">Change {*} to {} * {} as in the following formula:</paragraph>
 <paragraph role="code" id="par_id3304544" xml-lang="en-US" l10n="NEW">W rSup { size 8{} * {} }</paragraph>
 <paragraph role="paragraph" id="par_id4941557" xml-lang="en-US" l10n="NEW">You can also use W^"*" to enter the character as direct text.</paragraph>
diff --git a/helpcontent2/source/text/smath/main0000.xhp b/helpcontent2/source/text/smath/main0000.xhp
index 5660ab57aa..54ffcfdf75 100755
--- a/helpcontent2/source/text/smath/main0000.xhp
+++ b/helpcontent2/source/text/smath/main0000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0100.xhp b/helpcontent2/source/text/smath/main0100.xhp
index 0010fde810..1bac982b0c 100755
--- a/helpcontent2/source/text/smath/main0100.xhp
+++ b/helpcontent2/source/text/smath/main0100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0100.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0101.xhp b/helpcontent2/source/text/smath/main0101.xhp
index 5f4651e62b..941c2e03df 100755
--- a/helpcontent2/source/text/smath/main0101.xhp
+++ b/helpcontent2/source/text/smath/main0101.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0101.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0102.xhp b/helpcontent2/source/text/smath/main0102.xhp
index 3618fbe8db..4950168673 100755
--- a/helpcontent2/source/text/smath/main0102.xhp
+++ b/helpcontent2/source/text/smath/main0102.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0102.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0103.xhp b/helpcontent2/source/text/smath/main0103.xhp
index 37fb0e4988..2ea3379f15 100755
--- a/helpcontent2/source/text/smath/main0103.xhp
+++ b/helpcontent2/source/text/smath/main0103.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0103.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <section id="ansicht">
 <paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/main0103.xhp" name="View">View</link></paragraph>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="2">Sets the display scale and defines which elements you want to be visible. Most of the commands that you can enter into the <emph>Commands</emph> window can also be accessed through a mouse click if you have already opened the Selection window with <link href="text/smath/01/03090000.xhp" name="View - Selection"><emph>View - Selection</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="2">Sets the display scale and defines which elements you want to be visible. Most of the commands that you can enter into the <emph>Commands</emph> window can also be accessed through a mouse click if you have already opened the Formula Elements window with <link href="text/smath/01/03090000.xhp" name="View - Formula Elements"><emph>View - Formula Elements</emph></link>.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3150205" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
 <embed href="text/shared/01/03010000.xhp#massstabtext"/>
diff --git a/helpcontent2/source/text/smath/main0105.xhp b/helpcontent2/source/text/smath/main0105.xhp
index dfd37ca2d8..70cba9a288 100755
--- a/helpcontent2/source/text/smath/main0105.xhp
+++ b/helpcontent2/source/text/smath/main0105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0105.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0106.xhp b/helpcontent2/source/text/smath/main0106.xhp
index afd249c66c..559a9aa9cd 100755
--- a/helpcontent2/source/text/smath/main0106.xhp
+++ b/helpcontent2/source/text/smath/main0106.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0106.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0107.xhp b/helpcontent2/source/text/smath/main0107.xhp
index 67ea57af34..4ca311955d 100755
--- a/helpcontent2/source/text/smath/main0107.xhp
+++ b/helpcontent2/source/text/smath/main0107.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0107.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0200.xhp b/helpcontent2/source/text/smath/main0200.xhp
index fdb5dfca3a..81e470b128 100755
--- a/helpcontent2/source/text/smath/main0200.xhp
+++ b/helpcontent2/source/text/smath/main0200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0200.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0202.xhp b/helpcontent2/source/text/smath/main0202.xhp
index bc1091c770..c22d57a0ba 100755
--- a/helpcontent2/source/text/smath/main0202.xhp
+++ b/helpcontent2/source/text/smath/main0202.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0202.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0203.xhp b/helpcontent2/source/text/smath/main0203.xhp
index 1f13d0f289..e3c7b88122 100755
--- a/helpcontent2/source/text/smath/main0203.xhp
+++ b/helpcontent2/source/text/smath/main0203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0203.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/smath/main0503.xhp b/helpcontent2/source/text/smath/main0503.xhp
index 299ee91254..c97072661e 100644
--- a/helpcontent2/source/text/smath/main0503.xhp
+++ b/helpcontent2/source/text/smath/main0503.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +57,6 @@
 <paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="2" l10n="U" oldref="17">Individual Symbols</paragraph>
 <paragraph role="paragraph" id="par_id3145246" xml-lang="en-US" l10n="U" oldref="6">You can create your own symbols and import characters from other fonts. You can add new symbols to the basic catalog of $[officename] Math symbols, or create your own special catalogs. Numerous special characters are also available.</paragraph>
 <paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="2" l10n="U" oldref="18">Formulas in Context</paragraph>
-<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US" l10n="U" oldref="8">To make working with formulas easier, use the context menus, which can be called up with a right mouse click. This applies especially to the Commands window. This context menu contains all the commands that are found in the Selection window, and also operators, and so on, which can be inserted into your formula by mouse-click without having to key them into the Commands window.</paragraph>
+<paragraph role="paragraph" id="par_id3148774" xml-lang="en-US" l10n="U" oldref="8">To make working with formulas easier, use the context menus, which can be called up with a right mouse click. This applies especially to the Commands window. This context menu contains all the commands that are found in the Formula Elements window, and also operators, and so on, which can be inserted into your formula by mouse-click without having to key them into the Commands window.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/smath/makefile.mk b/helpcontent2/source/text/smath/makefile.mk
index 4b12d5f87d..212fae1b3b 100644
--- a/helpcontent2/source/text/smath/makefile.mk
+++ b/helpcontent2/source/text/smath/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,4 +60,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/00/00000004.xhp b/helpcontent2/source/text/swriter/00/00000004.xhp
index 0f80685a07..bfe12de562 100644
--- a/helpcontent2/source/text/swriter/00/00000004.xhp
+++ b/helpcontent2/source/text/swriter/00/00000004.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/00/00000401.xhp b/helpcontent2/source/text/swriter/00/00000401.xhp
index 426cce3788..19da980be8 100644
--- a/helpcontent2/source/text/swriter/00/00000401.xhp
+++ b/helpcontent2/source/text/swriter/00/00000401.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000401.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/00/00000402.xhp b/helpcontent2/source/text/swriter/00/00000402.xhp
index 12585a543d..e107a9f5ea 100644
--- a/helpcontent2/source/text/swriter/00/00000402.xhp
+++ b/helpcontent2/source/text/swriter/00/00000402.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000402.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/00/00000403.xhp b/helpcontent2/source/text/swriter/00/00000403.xhp
index acc36495fa..d0fc9fe5ae 100644
--- a/helpcontent2/source/text/swriter/00/00000403.xhp
+++ b/helpcontent2/source/text/swriter/00/00000403.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000403.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,102 +27,80 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0000000403xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">View Menu</title>
-<filename>/text/swriter/00/00000403.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T14:40:23">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3154656" xml-lang="en-US" level="1" l10n="U" oldref="1">View Menu</paragraph>
-<paragraph role="paragraph" id="par_id3149502" xml-lang="en-US" l10n="U" oldref="2"><variable id="lineal">Choose <emph>View - Ruler</emph>
+      <topic id="textswriter0000000403xml" indexer="exclude" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">View Menu</title>
+         <filename>/text/swriter/00/00000403.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3154656" role="heading" level="1" l10n="U" oldref="1">View Menu</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149502" role="paragraph" l10n="U" oldref="2"><variable id="lineal">Choose <emph>View - Ruler</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148871" xml-lang="en-US" l10n="U" oldref="3"><variable id="textbegrenzungen">Choose <emph>View - Text Boundaries</emph>
+      <paragraph xml-lang="en-US" id="par_id3148871" role="paragraph" l10n="U" oldref="3"><variable id="textbegrenzungen">Choose <emph>View - Text Boundaries</emph>
 </variable></paragraph>
-<section id="markierungen">
-<paragraph role="paragraph" id="par_id3153248" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>View - Field Shadings</emph>
+      <section id="markierungen">
+         <paragraph xml-lang="en-US" id="par_id3153248" role="paragraph" l10n="U" oldref="4">Choose <emph>View - Field Shadings</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154763" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">Command 
+         <paragraph xml-lang="en-US" id="par_id3154763" role="paragraph" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
-</section>
-<section id="feldbefehle">
-<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>View - Field Names</emph>
+      </section>
+      <section id="feldbefehle">
+         <paragraph xml-lang="en-US" id="par_id3149052" role="paragraph" l10n="CHG" oldref="5">Choose <emph>View - Field Names</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3151387" xml-lang="en-US" l10n="U" oldref="17"><switchinline select="sys"><caseinline select="MAC">Command 
+         <paragraph xml-lang="en-US" id="par_id3151387" role="paragraph" l10n="U" oldref="17"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
-</section>
-<section id="steuerzeichen">
-<paragraph role="paragraph" id="par_id3155625" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>View - Nonprinting Characters</emph>
+      </section>
+      <section id="steuerzeichen">
+         <paragraph xml-lang="en-US" id="par_id3155625" role="paragraph" l10n="U" oldref="6">Choose <emph>View - Nonprinting Characters</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3145823" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">Command 
+         <paragraph xml-lang="en-US" id="par_id3145823" role="paragraph" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F10</paragraph>
-<paragraph role="paragraph" id="par_id3154508" xml-lang="en-US" l10n="CHG" oldref="7">On Standard bar, click</paragraph>
-<section id="systeuerzeichen">
-<table id="tbl_id3153732">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="E">
-<image id="img_id3150502" src="res/commandimagelist/sc_controlcodes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150502" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="8">Nonprinting Characters</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
-<section id="webbrowser">
-<paragraph role="paragraph" id="par_id3149712" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Web Layout</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="CHG" oldref="10">On Tools bar, enable</paragraph>
-<section id="sybrowser">
-<table id="tbl_id3151264">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150765" xml-lang="en-US" l10n="E">
-<image id="img_id3147572" src="res/commandimagelist/sc_browseview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147572" xml-lang="en-US">Icon</alt>
+         <paragraph xml-lang="en-US" id="par_id3154508" role="paragraph" l10n="CHG" oldref="7">On Standard bar, click</paragraph>
+         <section id="systeuerzeichen">
+            <table id="tbl_id3153732">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150932" role="paragraph" l10n="E">
+<image id="img_id3150502" src="res/commandimagelist/sc_controlcodes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150502">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="CHG" oldref="11">Web Layout</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">Nonprinting Characters</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="drucklayout">
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>View - Print Layout</emph>
+         </section>
+      </section>
+      <section id="webbrowser">
+         <paragraph xml-lang="en-US" id="par_id3149712" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Web Layout</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148827" xml-lang="en-US" l10n="CHG" oldref="13">On Tools bar, disable</paragraph>
-<section id="sydrucklayout">
-<table id="tbl_id3145419">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="E">
-<image id="img_id3153583" src="res/commandimagelist/sc_browseview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153583" xml-lang="en-US">Icon</alt>
+         <paragraph xml-lang="en-US" id="par_id3154640" role="paragraph" l10n="CHG" oldref="10">On Tools bar, enable</paragraph>
+         <section id="sybrowser">
+            <table id="tbl_id3151264">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150765" role="paragraph" l10n="E">
+<image id="img_id3147572" src="res/commandimagelist/sc_browseview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147572">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="CHG" oldref="14">Web Layout</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3149291" role="paragraph" l10n="CHG" oldref="11">Web Layout</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="15"><variable id="versteckteabs">Choose <emph>View - Hidden Paragraphs</emph>
+         </section>
+      </section>
+      <section id="drucklayout">
+         <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="12">Choose <emph>View - Print Layout</emph><comment>removed table with icon (was copy/paste error)</comment></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149808" role="paragraph" l10n="U" oldref="15"><variable id="versteckteabs">Choose <emph>View - Hidden Paragraphs</emph>
 </variable></paragraph>
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp
index b81496ce3f..8d876282fc 100644
--- a/helpcontent2/source/text/swriter/00/00000404.xhp
+++ b/helpcontent2/source/text/swriter/00/00000404.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -74,7 +71,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="E">
-<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -109,7 +106,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="E">
-<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -134,7 +131,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="E">
-<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -150,7 +147,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147579" xml-lang="en-US" l10n="E">
-<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -181,7 +178,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148884" xml-lang="en-US" l10n="E">
-<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151369" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151369" src="sw/imglst/nc20005.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151369" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -205,7 +202,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="E">
-<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -282,7 +279,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149372" xml-lang="en-US" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -304,7 +301,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154620" xml-lang="en-US" l10n="E">
-<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -315,7 +312,7 @@
 
 </section>
 </section>
-<paragraph role="paragraph" id="par_id3149627" xml-lang="en-US" l10n="U" oldref="40"><variable id="einfhorizlinie">Choose <emph>Insert - Horizontal Line</emph>
+<paragraph role="paragraph" id="par_id3149627" xml-lang="en-US" l10n="U" oldref="40"><variable id="einfhorizlinie">Choose <emph>Insert - Horizontal Rule</emph>
 </variable></paragraph>
 <section id="einfdatei">
 <paragraph role="paragraph" id="par_id3150661" xml-lang="en-US" l10n="U" oldref="41">Choose <emph>Insert - File</emph>
@@ -326,7 +323,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="E">
-<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index e44c305839..02108cc6af 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 00000405.xhp,v $
- * $Revision: 1.14.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,399 +29,399 @@
  *
  ************************************************************************
  -->
+ 
 	
 <meta>
-<topic id="textswriter0000000405xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Format Menu</title>
-<filename>/text/swriter/00/00000405.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3150758" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<section id="initialen">
-<paragraph role="paragraph" id="par_id3153618" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Format - Paragraph - Drop Caps</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Drop Caps</emph> tab</paragraph>
-</section>
-<section id="textfss">
-<paragraph role="paragraph" id="par_id3154697" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Format - Paragraph - Text Flow</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Text Flow</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154275" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Edit - Find &amp; Replace - Format - Text Flow</emph> tab</paragraph>
-</section>
-<section id="vorlagenbedingt">
-<paragraph role="paragraph" id="par_idN10715" xml-lang="en-US" l10n="NEW">Right-click a paragraph with style <item type="literal">Text body</item>. Choose <emph>Edit Paragraph Style - Condition</emph> tab</paragraph>
-</section>
-<section id="vorlagenladen">
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">Open <emph>Styles and Formatting</emph> window. Click the <emph>New Style from Selection</emph> icon and keep the mouse button pressed. Choose <emph>Load Styles</emph> from the submenu.</paragraph>
-</section>
-<section id="formatseite">
-<paragraph role="paragraph" id="par_id3152947" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Page</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="134">Choose <emph>Format - Styles and Formatting</emph> - open context menu <emph>New/Modify</emph> (for Page Styles)</paragraph>
-</section>
-<section id="abnumerierung">
-<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="131">Choose <emph>Format - Paragraph - Numbering</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147525" xml-lang="en-US" l10n="CHG" oldref="144">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Numbering</emph> tab (Paragraph Styles)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3152960" xml-lang="en-US" l10n="U" oldref="155"><variable id="spaltenber">Choose <emph>Format - Sections - Options</emph> button 
+      <topic id="textswriter0000000405xml" indexer="exclude">
+         <title xml-lang="en-US" id="tit">Format Menu</title>
+         <filename>/text/swriter/00/00000405.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <paragraph xml-lang="en-US" id="hd_id3150758" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
+      <section id="initialen">
+         <paragraph xml-lang="en-US" id="par_id3153618" role="paragraph" l10n="U" oldref="12">Choose <emph>Format - Paragraph - Drop Caps</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="U" oldref="14">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Drop Caps</emph> tab</paragraph>
+      </section>
+      <section id="textfss">
+         <paragraph xml-lang="en-US" id="par_id3154697" role="paragraph" l10n="U" oldref="15">Choose <emph>Format - Paragraph - Text Flow</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154260" role="paragraph" l10n="U" oldref="17">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Text Flow</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154275" role="paragraph" l10n="U" oldref="18">Choose <emph>Edit - Find &amp; Replace - Format - Text Flow</emph> tab</paragraph>
+      </section>
+      <section id="vorlagenbedingt">
+         <paragraph xml-lang="en-US" id="par_idN10715" role="paragraph" l10n="NEW">Right-click a paragraph with style <item type="literal">Text body</item>. Choose <emph>Edit Paragraph Style - Condition</emph> tab</paragraph>
+      </section>
+      <section id="vorlagenladen">
+         <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">Open <emph>Styles and Formatting</emph> window. Click the <emph>New Style from Selection</emph> icon and keep the mouse button pressed. Choose <emph>Load Styles</emph> from the submenu.</paragraph>
+      </section>
+      <section id="formatseite">
+         <paragraph xml-lang="en-US" id="par_id3152947" role="paragraph" l10n="U" oldref="19">Choose <emph>Format - Page</emph>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153536" role="paragraph" l10n="U" oldref="134">Choose <emph>Format - Styles and Formatting</emph> - open context menu <emph>New/Modify</emph> (for Page Styles)</paragraph>
+      </section>
+      <section id="abnumerierung">
+         <paragraph xml-lang="en-US" id="par_id3154470" role="paragraph" l10n="CHG" oldref="131">Choose <emph>Format - Paragraph - Outline &amp; Numbering</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147525" role="paragraph" l10n="CHG" oldref="144">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Outline &amp; Numbering</emph> tab (Paragraph Styles)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="155"><variable id="spaltenber">Choose <emph>Format - Sections - Options</emph> button 
 </variable></paragraph>
-<section id="spaltens">
-<paragraph role="paragraph" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3143276" xml-lang="en-US" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
-</section>
-<section id="fussnoteform">
-<paragraph role="paragraph" id="par_id3149817" xml-lang="en-US" l10n="U" oldref="27">Choose <emph>Format - Page - Footnote</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Footnote</emph> tab</paragraph>
-</section>
-<section id="fussendnoten">
-<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="157">Choose <emph>Insert - Section - Footnotes/Endnotes</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147094" xml-lang="en-US" l10n="U" oldref="159">Choose <emph>Format - Sections - Options</emph> button <emph>Footnotes/Endnotes</emph> tab</paragraph>
-</section>
-<section id="absatzvorlage">
-<paragraph role="paragraph" id="par_id3155140" xml-lang="en-US" l10n="U" oldref="136">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Paragraph Styles)</paragraph>
-</section>
-<section id="zeichenvorlage">
-<paragraph role="paragraph" id="par_id3153356" xml-lang="en-US" l10n="U" oldref="138">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Character Styles)</paragraph>
-</section>
-<section id="rahmenvorlage">
-<paragraph role="paragraph" id="par_id3149179" xml-lang="en-US" l10n="U" oldref="140">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Frame Styles)</paragraph>
-</section>
-<section id="numerierungsvorlage">
-<paragraph role="paragraph" id="par_id3156364" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Numbering Styles)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoCorrect - While Typing</emph>
+      <section id="spaltens">
+         <paragraph xml-lang="en-US" id="par_id3150836" role="paragraph" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149687" role="paragraph" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151336" role="paragraph" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143276" role="paragraph" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
+      </section>
+      <section id="fussnoteform">
+         <paragraph xml-lang="en-US" id="par_id3149817" role="paragraph" l10n="U" oldref="27">Choose <emph>Format - Page - Footnote</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph" l10n="U" oldref="29">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Footnote</emph> tab</paragraph>
+      </section>
+      <section id="fussendnoten">
+         <paragraph xml-lang="en-US" id="par_id3148970" role="paragraph" l10n="U" oldref="157">Choose <emph>Insert - Section - Footnotes/Endnotes</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147094" role="paragraph" l10n="U" oldref="159">Choose <emph>Format - Sections - Options</emph> button <emph>Footnotes/Endnotes</emph> tab</paragraph>
+      </section>
+      <section id="absatzvorlage">
+         <paragraph xml-lang="en-US" id="par_id3155140" role="paragraph" l10n="U" oldref="136">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Paragraph Styles)</paragraph>
+      </section>
+      <section id="zeichenvorlage">
+         <paragraph xml-lang="en-US" id="par_id3153356" role="paragraph" l10n="U" oldref="138">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Character Styles)</paragraph>
+      </section>
+      <section id="rahmenvorlage">
+         <paragraph xml-lang="en-US" id="par_id3149179" role="paragraph" l10n="U" oldref="140">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Frame Styles)</paragraph>
+      </section>
+      <section id="numerierungsvorlage">
+         <paragraph xml-lang="en-US" id="par_id3156364" role="paragraph" l10n="U" oldref="142">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Numbering Styles)</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3151370" role="paragraph" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoCorrect - While Typing</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoCorrect</emph>
+      <paragraph xml-lang="en-US" id="par_id3149538" role="paragraph" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoCorrect</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoCorrect - Apply</emph>
+      <paragraph xml-lang="en-US" id="par_id3150117" role="paragraph" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoCorrect - Apply</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
+      <paragraph xml-lang="en-US" id="par_id3155870" role="paragraph" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table) 
+      <paragraph xml-lang="en-US" id="par_id3147413" role="paragraph" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table) 
 </variable></paragraph>
-<section id="formatgrafik">
-<paragraph role="paragraph" id="par_id3147484" xml-lang="en-US" l10n="U" oldref="47">Choose <emph>Format - Picture</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3147504" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Insert - Picture - From File - Properties</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="151"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Insert - Picture - From File</emph> (when graphics are selected) 
+      <section id="formatgrafik">
+         <paragraph xml-lang="en-US" id="par_id3147484" role="paragraph" l10n="U" oldref="47">Choose <emph>Format - Picture</emph>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147504" role="paragraph" l10n="U" oldref="48">Choose <emph>Insert - Picture - From File - Properties</emph> button</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145256" role="paragraph" l10n="U" oldref="151"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Insert - Picture - From File</emph> (when graphics are selected) 
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="CHG" oldref="49">On the <emph>Picture</emph> Bar (when pictures are selected), click</paragraph>
-<section id="syeigenschaften">
-<table id="tbl_id3155964">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
-<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="CHG" oldref="49">On the <emph>Picture</emph> Bar (when pictures are selected), click</paragraph>
+         <section id="syeigenschaften">
+            <table id="tbl_id3155964">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150557" role="paragraph" l10n="E">
+<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149214">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="50">Graphics Properties</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147740" role="paragraph" l10n="U" oldref="50">Graphics Properties</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="grafiktyp">
-<paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Picture - Type</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
-<paragraph role="paragraph" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147067" xml-lang="en-US" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
-</section>
-<section id="grafikumlauf">
-<paragraph role="paragraph" id="par_id3151082" xml-lang="en-US" l10n="U" oldref="56">Choose <emph>Format - Picture - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3153299" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
+         </section>
+      </section>
+      <section id="grafiktyp">
+         <paragraph xml-lang="en-US" id="par_id3146337" role="paragraph" l10n="U" oldref="51">Choose <emph>Format - Picture - Type</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149841" role="paragraph" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
+<paragraph xml-lang="en-US" id="par_id3148856" role="paragraph" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147067" role="paragraph" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
+      </section>
+      <section id="grafikumlauf">
+         <paragraph xml-lang="en-US" id="par_id3151082" role="paragraph" l10n="U" oldref="56">Choose <emph>Format - Picture - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148437" role="paragraph" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150169" role="paragraph" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153299" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
 </paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150454" xml-lang="en-US" l10n="U" oldref="62"><variable id="kontureditor">Choose <emph>Format - Wrap - Edit Contour</emph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150454" role="paragraph" l10n="U" oldref="62"><variable id="kontureditor">Choose <emph>Format - Wrap - Edit Contour</emph>
 </variable></paragraph>
-<section id="grahyper">
-<paragraph role="paragraph" id="par_id3153984" xml-lang="en-US" l10n="U" oldref="63">Choose <emph>Format - Picture - Hyperlink</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145337" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
-</section>
-<section id="grazusaetze">
-<paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Picture - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149774" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3155088" xml-lang="en-US" l10n="U" oldref="70"><variable id="grafik1">Choose <emph>Format - Picture - Picture</emph> tab 
+      <section id="grahyper">
+         <paragraph xml-lang="en-US" id="par_id3153984" role="paragraph" l10n="U" oldref="63">Choose <emph>Format - Picture - Hyperlink</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156130" role="paragraph" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145337" role="paragraph" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
+      </section>
+      <section id="grazusaetze">
+         <paragraph xml-lang="en-US" id="par_id3154724" role="paragraph" l10n="U" oldref="65">Choose <emph>Format - Picture - Options</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145636" role="paragraph" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149774" role="paragraph" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150922" role="paragraph" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155088" role="paragraph" l10n="U" oldref="70"><variable id="grafik1">Choose <emph>Format - Picture - Picture</emph> tab 
 </variable></paragraph>
-<section id="makrografik">
-<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Insert/Format - Picture - Macro</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="73">Choose <emph>Edit - AutoText - AutoText (button) - Macro</emph>
+      <section id="makrografik">
+         <paragraph xml-lang="en-US" id="par_id3146938" role="paragraph" l10n="U" oldref="72">Choose <emph>Insert/Format - Picture - Macro</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154323" role="paragraph" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153238" role="paragraph" l10n="U" oldref="73">Choose <emph>Edit - AutoText - AutoText (button) - Macro</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148792" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
+         <paragraph xml-lang="en-US" id="par_id3148792" role="paragraph" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150101" xml-lang="en-US" l10n="U" oldref="149">Choose <emph>Insert - Hyperlink - Events</emph> icon (look for Help tip)</paragraph>
-<paragraph role="paragraph" id="par_id3150039" xml-lang="en-US" l10n="U" oldref="150">Choose <emph>Format - Character - Hyperlink</emph> tab<emph> - Events</emph> button</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3155114" xml-lang="en-US" l10n="U" oldref="74"><variable id="formattabelle">Choose <emph>Table - Table Properties</emph>
+         <paragraph xml-lang="en-US" id="par_id3150101" role="paragraph" l10n="U" oldref="149">Choose <emph>Insert - Hyperlink - Events</emph> icon (look for Help tip)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150039" role="paragraph" l10n="U" oldref="150">Choose <emph>Format - Character - Hyperlink</emph> tab<emph> - Events</emph> button</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3155114" role="paragraph" l10n="U" oldref="74"><variable id="formattabelle">Choose <emph>Table - Table Properties</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="146"><variable id="tabauf">Choose <emph>Table - Split Table</emph>
+      <paragraph xml-lang="en-US" id="par_id3149377" role="paragraph" l10n="U" oldref="146"><variable id="tabauf">Choose <emph>Table - Split Table</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155810" xml-lang="en-US" l10n="U" oldref="154"><variable id="tabverb">Choose <emph>Table - Merge Tables</emph>
+      <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="CHG" oldref="154"><variable id="tabverb">Choose <emph>Table - Merge Table</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151233" xml-lang="en-US" l10n="U" oldref="75"><variable id="tabformat">Choose <emph>Table - Table Properties - Table</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3151233" role="paragraph" l10n="U" oldref="75"><variable id="tabformat">Choose <emph>Table - Table Properties - Table</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="76"><variable id="spaltentab">Choose <emph>Table - Table Properties - Columns</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="76"><variable id="spaltentab">Choose <emph>Table - Table Properties - Columns</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="77"><variable id="tabelletextfluss">Choose <emph>Table - Table Properties - Text Flow</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3153140" role="paragraph" l10n="U" oldref="77"><variable id="tabelletextfluss">Choose <emph>Table - Table Properties - Text Flow</emph> tab 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
+      <paragraph xml-lang="en-US" id="par_id3148823" role="paragraph" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
 </variable></paragraph>
-<section id="verbindenze">
-<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+      <section id="verbindenze">
+         <paragraph xml-lang="en-US" id="par_id3154351" role="paragraph" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
-<section id="syzellenverbinden">
-<table id="tbl_id3154636">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
-<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154002" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3154370" role="paragraph" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
+         <section id="syzellenverbinden">
+            <table id="tbl_id3154636">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153996" role="paragraph" l10n="E">
+<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154002">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150662" role="paragraph" l10n="U" oldref="81">Merge Cells</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="teilenz">
-<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+         </section>
+      </section>
+      <section id="teilenz">
+         <paragraph xml-lang="en-US" id="par_id3154024" role="paragraph" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
-<section id="syzellenteilen">
-<table id="tbl_id3149972">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
-<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3154042" role="paragraph" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+         <section id="syzellenteilen">
+            <table id="tbl_id3149972">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147270" role="paragraph" l10n="E">
+<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147275">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150616" role="paragraph" l10n="U" oldref="84">Split Cells</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149617" role="paragraph" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
 </variable></paragraph>
-<section id="schutzaufhz">
-<paragraph role="paragraph" id="par_id3150786" xml-lang="en-US" l10n="U" oldref="86">In the context menu of a cell, choose <emph>Cell - Unprotect</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3145656" xml-lang="en-US" l10n="U" oldref="145">Open context menu in Navigator for tables</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3148716" xml-lang="en-US" l10n="U" oldref="87"><variable id="zeile">In the context menu of a cell, choose <emph>Row</emph>
+      <section id="schutzaufhz">
+         <paragraph xml-lang="en-US" id="par_id3150786" role="paragraph" l10n="U" oldref="86">In the context menu of a cell, choose <emph>Cell - Unprotect</emph>
+         </paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145656" role="paragraph" l10n="U" oldref="145">Open context menu in Navigator for tables</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3148716" role="paragraph" l10n="U" oldref="87"><variable id="zeile">In the context menu of a cell, choose <emph>Row</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155345" xml-lang="en-US" l10n="U" oldref="88"><variable id="hoehez">In the context menu of a cell, choose <emph>Row - Height</emph>
+      <paragraph xml-lang="en-US" id="par_id3155345" role="paragraph" l10n="U" oldref="88"><variable id="hoehez">In the context menu of a cell, choose <emph>Row - Height</emph>
 </variable></paragraph>
-<section id="optihz">
-<paragraph role="paragraph" id="par_id3155536" xml-lang="en-US" l10n="U" oldref="89">Choose <emph>Table - Autofit - Optimal Row Height</emph>
+      <section id="optihz">
+         <paragraph xml-lang="en-US" id="par_id3155536" role="paragraph" l10n="U" oldref="89">Choose <emph>Table - Autofit - Optimal Row Height</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="90">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syoptimalzeile">
-<table id="tbl_id3150845">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
-<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="U" oldref="90">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+         <section id="syoptimalzeile">
+            <table id="tbl_id3150845">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145222" role="paragraph" l10n="E">
+<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145228">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="91">Optimal Row Height</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153545" role="paragraph" l10n="U" oldref="91">Optimal Row Height</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="verteilenzeile">
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+         </section>
+      </section>
+      <section id="verteilenzeile">
+         <paragraph xml-lang="en-US" id="par_id3153569" role="paragraph" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syverteilenzeile">
-<table id="tbl_id3154064">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3153755" role="paragraph" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+         <section id="syverteilenzeile">
+            <table id="tbl_id3154064">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145297" role="paragraph" l10n="E">
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155994">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153206" role="paragraph" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145095" role="paragraph" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
 </variable></paragraph>
-<section id="loschenz">
-<paragraph role="paragraph" id="par_id3149573" xml-lang="en-US" l10n="U" oldref="99">Choose <emph>Table - Delete - Rows</emph>
+      <section id="loschenz">
+         <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="U" oldref="99">Choose <emph>Table - Delete - Rows</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3149591" xml-lang="en-US" l10n="U" oldref="100">On <emph>Table</emph> Bar, click</paragraph>
-<section id="syzeileloeschen">
-<table id="tbl_id3146892">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
-<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3149591" role="paragraph" l10n="U" oldref="100">On <emph>Table</emph> Bar, click</paragraph>
+         <section id="syzeileloeschen">
+            <table id="tbl_id3146892">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3147555" role="paragraph" l10n="E">
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150361">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156248" xml-lang="en-US" l10n="U" oldref="101">Delete Row</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3156248" role="paragraph" l10n="U" oldref="101">Delete Row</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3149383" xml-lang="en-US" l10n="U" oldref="102"><variable id="spalte">In the context menu of a cell, choose <emph>Column</emph>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149383" role="paragraph" l10n="U" oldref="102"><variable id="spalte">In the context menu of a cell, choose <emph>Column</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="103"><variable id="breites">In the context menu of a cell, choose <emph>Column </emph>
-<emph>- Width</emph>
+      <paragraph xml-lang="en-US" id="par_id3149406" role="paragraph" l10n="U" oldref="103"><variable id="breites">In the context menu of a cell, choose <emph>Column - Width</emph>
 </variable></paragraph>
-<section id="optibrs">
-<paragraph role="paragraph" id="par_id3154752" xml-lang="en-US" l10n="U" oldref="104">Choose <emph>Table - Autofit - Optimal Column Width</emph>
+      <section id="optibrs">
+         <paragraph xml-lang="en-US" id="par_id3154752" role="paragraph" l10n="U" oldref="104">Choose <emph>Table - Autofit - Optimal Column Width</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3148932" xml-lang="en-US" l10n="U" oldref="105">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syoptimalspalte">
-<table id="tbl_id3156030">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
-<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3148932" role="paragraph" l10n="U" oldref="105">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+         <section id="syoptimalspalte">
+            <table id="tbl_id3156030">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3157881" role="paragraph" l10n="E">
+<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3157888">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150524" xml-lang="en-US" l10n="U" oldref="106">Optimal Column Width</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3150524" role="paragraph" l10n="U" oldref="106">Optimal Column Width</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="verteilenspalte">
-<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+         </section>
+      </section>
+      <section id="verteilenspalte">
+         <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syverteilentext">
-<table id="tbl_id3148462">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+         <section id="syverteilentext">
+            <table id="tbl_id3148462">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145179" role="paragraph" l10n="E">
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145186">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151364" role="paragraph" l10n="U" oldref="109">Space Columns Equally</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
+         </section>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153172" role="paragraph" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
 </variable></paragraph>
-<section id="einfgens">
-<paragraph role="paragraph" id="par_id3156296" xml-lang="en-US" l10n="U" oldref="111">Choose <emph>Table - Insert - Columns</emph>
+      <section id="einfgens">
+         <paragraph xml-lang="en-US" id="par_id3156296" role="paragraph" l10n="U" oldref="111">Choose <emph>Table - Insert - Columns</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="U" oldref="96">Choose <emph>Table - Insert - Rows</emph>
+         <paragraph xml-lang="en-US" id="par_id3150794" role="paragraph" l10n="U" oldref="96">Choose <emph>Table - Insert - Rows</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150813" xml-lang="en-US" l10n="U" oldref="112">On <emph>Table</emph> Bar, click</paragraph>
-<table id="tbl_id3156198">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
-<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3150813" role="paragraph" l10n="U" oldref="112">On <emph>Table</emph> Bar, click</paragraph>
+         <table id="tbl_id3156198">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150279" role="paragraph" l10n="E">
+<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150286">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="113">Insert Column</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
-<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150872" role="paragraph" l10n="U" oldref="113">Insert Column</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150895" role="paragraph" l10n="E">
+<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150902">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="98">Insert Row</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149140" role="paragraph" l10n="U" oldref="98">Insert Row</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="lschens">
-<paragraph role="paragraph" id="par_id3155310" xml-lang="en-US" l10n="U" oldref="114">Choose <emph>Table - Delete - Columns</emph>
+      </section>
+      <section id="lschens">
+         <paragraph xml-lang="en-US" id="par_id3155310" role="paragraph" l10n="U" oldref="114">Choose <emph>Table - Delete - Columns</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3155328" xml-lang="en-US" l10n="U" oldref="115">On <emph>Table</emph> Bar, click</paragraph>
-<section id="syspalteloeschen">
-<table id="tbl_id3150954">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
-<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <paragraph xml-lang="en-US" id="par_id3155328" role="paragraph" l10n="U" oldref="115">On <emph>Table</emph> Bar, click</paragraph>
+         <section id="syspalteloeschen">
+            <table id="tbl_id3150954">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3153600" role="paragraph" l10n="E">
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153607">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154423" xml-lang="en-US" l10n="U" oldref="116">Delete Column</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3154423" role="paragraph" l10n="U" oldref="116">Delete Column</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="objektformat">
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
+         </section>
+      </section>
+      <section id="objektformat">
+         <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
 </paragraph>
-<section id="syeigenschaftenobjekt">
-<table id="tbl_id3153367">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
-<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         <section id="syeigenschaftenobjekt">
+            <table id="tbl_id3153367">
+               <tablerow>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3151276" role="paragraph" l10n="E">
+<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3151283">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145157" xml-lang="en-US" l10n="U" oldref="119">Object Properties</paragraph>
-</tablecell>
-</tablerow>
-</table>
+                  </tablecell>
+                  <tablecell>
+                     <paragraph xml-lang="en-US" id="par_id3145157" role="paragraph" l10n="U" oldref="119">Object Properties</paragraph>
+                  </tablecell>
+               </tablerow>
+            </table>
 
-</section>
-</section>
-<section id="syeigenschaftenrahmen">
-<table id="tbl_id3145600">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
-<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+         </section>
+      </section>
+      <section id="syeigenschaftenrahmen">
+         <table id="tbl_id3145600">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3152973" role="paragraph" l10n="E">
+<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152980">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147367" xml-lang="en-US" l10n="U" oldref="158">Frame Properties</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3147367" role="paragraph" l10n="U" oldref="158">Frame Properties</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-<section id="textraster">
-<paragraph role="paragraph" id="par_id3150140" xml-lang="en-US" l10n="U" oldref="174">Menu <emph>Format - Page</emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled</paragraph>
-</section>
-</body>
-</helpdocument>
+      </section>
+      <section id="textraster">
+         <paragraph xml-lang="en-US" id="par_id3150140" role="paragraph" l10n="U" oldref="174">Menu <emph>Format - Page</emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp
index abceda496f..1d1bf19943 100755
--- a/helpcontent2/source/text/swriter/00/00000406.xhp
+++ b/helpcontent2/source/text/swriter/00/00000406.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -95,7 +92,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">
-<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/00/makefile.mk b/helpcontent2/source/text/swriter/00/makefile.mk
index ed5a45b95b..85bf15538e 100644
--- a/helpcontent2/source/text/swriter/00/makefile.mk
+++ b/helpcontent2/source/text/swriter/00/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,4 +55,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/01/01120000.xhp b/helpcontent2/source/text/swriter/01/01120000.xhp
index 3c077ea7bd..95b201037b 100644
--- a/helpcontent2/source/text/swriter/01/01120000.xhp
+++ b/helpcontent2/source/text/swriter/01/01120000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,6 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:ClosePreview" id="bm_id2166814" localize="false"/><paragraph role="paragraph" id="par_id5027008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">To exit the page preview, click the <emph>Close Preview</emph> button.</ahelp></paragraph>
 <section id="Section1">
 <paragraph role="paragraph" id="par_id2649311" xml-lang="en-US" l10n="NEW"><link href="text/swriter/main0210.xhp" name="Page View Object Bar">Page View Object Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><link href="text/swriter/02/10110000.xhp" name="Print Options">Print Options</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/01150000.xhp b/helpcontent2/source/text/swriter/01/01150000.xhp
index 51eed6d346..7e3391f9a4 100644
--- a/helpcontent2/source/text/swriter/01/01150000.xhp
+++ b/helpcontent2/source/text/swriter/01/01150000.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 01150000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -50,42 +47,42 @@
 </section>
 <paragraph role="paragraph" id="par_id3154102" xml-lang="en-US" l10n="U" oldref="4">During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the <link href="text/swriter/01/04090006.xhp" name="Database"><emph>Database</emph></link> tab page under <emph>Insert - Fields - Other</emph>.</paragraph><comment>db browser explorer</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_TLB_TREELISTBOX" id="bm_id5399029" localize="false"/><paragraph role="paragraph" id="par_id8186895" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a database and table.</ahelp></paragraph><comment>db browser records</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph><comment>save as single document</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609447" id="bm_id7246620" localize="false"/><paragraph role="paragraph" id="par_id3101901" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one big document containing all data records.</ahelp></paragraph><comment>save as individual documents</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609448" id="bm_id6964323" localize="false"/><paragraph role="paragraph" id="par_id5345011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one document for every one data record.</ahelp></paragraph><comment>generate file name from database</comment>
-<bookmark xml-lang="en-US" branch="hid/1446609961" id="bm_id6631672" localize="false"/><paragraph role="paragraph" id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Generate each file name from data contained in a database.</ahelp><comment>UFI: sorry, spec doc has no more info about the specifics</comment></paragraph><comment>file format</comment>
-<bookmark xml-lang="en-US" branch="hid/1446612524" id="bm_id8452711" localize="false"/><paragraph role="paragraph" id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the file format.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC" id="bm_id7246620" localize="false"/><paragraph role="paragraph" id="par_id3101901" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one big document containing all data records.</ahelp></paragraph><comment>save as individual documents</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL" id="bm_id6964323" localize="false"/><paragraph role="paragraph" id="par_id5345011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one document for every one data record.</ahelp></paragraph><comment>generate file name from database</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE" id="bm_id6631672" localize="false"/><paragraph role="paragraph" id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Generate each file name from data contained in a database.</ahelp><comment>UFI: sorry, spec doc has no more info about the specifics</comment></paragraph><comment>file format</comment>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_MAILMERGE_LB_FILTER" id="bm_id8452711" localize="false"/><paragraph role="paragraph" id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the file format.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154482" xml-lang="en-US" level="2" l10n="U" oldref="5">Records</paragraph>
 <paragraph role="paragraph" id="par_id3154565" xml-lang="en-US" l10n="U" oldref="6">Determines the number of records for printing the form letter. One letter will be printed for each record.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL" id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_ALL" id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
 <paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL">Processes all the records from the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED" id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_MARKED" id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
 <paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED">Processes only the marked records from the database. This option is only available when you have previously marked the necessary records in the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM" id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FROM" id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
 <paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM">Specifies which records to include in your form letter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM" id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_FROM" id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
 <paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM">Specifies the number of the first record to be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_MAILMERGE:NF_TO" id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_TO" id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
 <paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_TO">Specifies the number of the last record to be printed.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2" l10n="U" oldref="13">Output</paragraph>
 <paragraph role="paragraph" id="par_id3155138" xml-lang="en-US" l10n="U" oldref="14">Determines whether to send your form letters to a printer or save them to a file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_PRINTER" id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485" xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_PRINTER" id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485" xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
 <paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_PRINTER">Prints the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773" xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FILE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773" xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
 <paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILE">Saves the form letters in files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_MAILMERGE:CB_SINGLE_JOBS" id="bm_id3151383" localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US" level="3" l10n="U" oldref="35">Single print jobs</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS" id="bm_id3151383" localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US" level="3" l10n="U" oldref="35">Single print jobs</paragraph>
 <paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:CHECKBOX:DLG_MAILMERGE:CB_SINGLE_JOBS">Prints each form letter individually with the selected printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_MAILMERGE:ED_PATH" id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MAILMERGE:ED_PATH" id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
 <paragraph role="paragraph" id="par_id3150687" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_PATH">Specifies the path to store the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_MAILMERGE:PB_PATH" id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412" xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MAILMERGE:PB_PATH" id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412" xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
 <paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:PUSHBUTTON:DLG_MAILMERGE:PB_PATH">Opens the<emph> Select Path </emph>dialog.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="49">Generate file name from</paragraph>
 <paragraph role="paragraph" id="par_id3150547" xml-lang="en-US" l10n="U" oldref="50">Specifies how the file name is generated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN" id="bm_id3147743" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_MAILMERGE:LB_COLUMN" id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561" xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
+<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MAILMERGE:LB_COLUMN" id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561" xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
 <paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:LISTBOX:DLG_MAILMERGE:LB_COLUMN">Uses the content of the selected data field as the file name for the form letter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME" id="bm_id3148854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_MAILMERGE:ED_FILENAME" id="bm_id3148858" localize="false"/><paragraph role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U" oldref="47">Manual setting</paragraph>
+<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME -->
+<!-- removed HID SW:EDIT:DLG_MAILMERGE:ED_FILENAME --><paragraph role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U" oldref="47">Manual setting</paragraph>
 <paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_FILENAME">Creates the file name based on the text you enter, followed by a serial number.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
diff --git a/helpcontent2/source/text/swriter/01/01160100.xhp b/helpcontent2/source/text/swriter/01/01160100.xhp
index f1780b4095..49b39f6ee1 100644
--- a/helpcontent2/source/text/swriter/01/01160100.xhp
+++ b/helpcontent2/source/text/swriter/01/01160100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/01160200.xhp b/helpcontent2/source/text/swriter/01/01160200.xhp
index 12c5dc11fb..fbe4143c33 100644
--- a/helpcontent2/source/text/swriter/01/01160200.xhp
+++ b/helpcontent2/source/text/swriter/01/01160200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/01160300.xhp b/helpcontent2/source/text/swriter/01/01160300.xhp
index 899a85cc58..e1c5941bd7 100644
--- a/helpcontent2/source/text/swriter/01/01160300.xhp
+++ b/helpcontent2/source/text/swriter/01/01160300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160300.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +24,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License. 
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
 	
@@ -52,10 +49,10 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000401.xhp#sendenautoabstract"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_LEVEL" id="bm_id3154106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL" id="bm_id3154106" localize="false"/>
 <paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="2" l10n="U" oldref="3">Included Outline Levels</paragraph>
 <paragraph role="paragraph" id="par_id3149804" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_LEVEL">Enter the extent of the outline levels to be copied to the new document.</ahelp> For example, if you choose 4 levels, all paragraphs formatted with Heading 1 to Heading 4 are included, along with the number of subsequent paragraphs specified in <emph>Subpoints per Level</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_PARA" id="bm_id3154570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA" id="bm_id3154570" localize="false"/>
 <paragraph role="heading" id="hd_id3151316" xml-lang="en-US" level="2" l10n="U" oldref="5">Subpoints per Level</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_ABSTRACT:NF_PARA">Specify the maximum number of consecutive paragraphs to be included in the AutoAbstract document after each heading.</ahelp> All of the paragraphs up to the maximum defined are included until the next paragraph with a Heading Style is reached.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/01160400.xhp b/helpcontent2/source/text/swriter/01/01160400.xhp
index ff949e57de..bd62095680 100644
--- a/helpcontent2/source/text/swriter/01/01160400.xhp
+++ b/helpcontent2/source/text/swriter/01/01160400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160400.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/01160500.xhp b/helpcontent2/source/text/swriter/01/01160500.xhp
index 292abfabf0..fc8f32afd4 100644
--- a/helpcontent2/source/text/swriter/01/01160500.xhp
+++ b/helpcontent2/source/text/swriter/01/01160500.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01160500.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/02110000.xhp b/helpcontent2/source/text/swriter/01/02110000.xhp
index f35b46f63b..6d44b6d1f1 100644
--- a/helpcontent2/source/text/swriter/01/02110000.xhp
+++ b/helpcontent2/source/text/swriter/01/02110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="E">
-<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150695" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150695" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150695" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -78,7 +75,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN1087B" xml-lang="en-US" l10n="NEW">
-<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.2228in" height="0.2228in"><alt id="alt_id3628141" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3628141" src="sw/imglst/sc20249.png" width="0.2228in" height="0.2228in"><alt id="alt_id3628141" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -94,7 +91,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154616" xml-lang="en-US" l10n="E">
-<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154622" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154622" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154622" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -110,7 +107,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="E">
-<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150773" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150773" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150773" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -131,7 +128,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154949" xml-lang="en-US" l10n="E">
-<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154955" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154955" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154955" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -147,7 +144,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154133" xml-lang="en-US" l10n="E">
-<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154140" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154140" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154140" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -164,7 +161,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154608" xml-lang="en-US" l10n="E">
-<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154904" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154904" src="sw/imglst/sr20014.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154904" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -180,7 +177,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153900" xml-lang="en-US" l10n="E">
-<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153911" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153911" src="sw/imglst/sc20179.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153911" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -196,7 +193,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150217" xml-lang="en-US" l10n="E">
-<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150224" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150224" src="sw/imglst/sc20177.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150224" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -212,7 +209,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153100" xml-lang="en-US" l10n="E">
-<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153108" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153108" src="sw/imglst/sc20182.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153108" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -228,7 +225,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155120" xml-lang="en-US" l10n="E">
-<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -256,7 +253,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153588" xml-lang="en-US" l10n="E">
-<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153595" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153595" src="sw/imglst/sc20236.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153595" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -272,7 +269,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="E">
-<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153275" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153275" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -288,7 +285,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="E">
-<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150828" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150828" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150828" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -304,7 +301,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155414" xml-lang="en-US" l10n="E">
-<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155420" src="sw/imglst/sc20172.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155420" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -320,7 +317,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148414" xml-lang="en-US" l10n="E">
-<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148420" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148420" src="sw/imglst/sc20173.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148420" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp
index c43e868d77..416b83b53d 100644
--- a/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 02110100.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +29,7 @@
  ************************************************************************-->
 
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0102110100xml" indexer="include" status="PUBLISH">
@@ -59,7 +56,7 @@
 <paragraph role="paragraph" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="6">Open the <emph>Navigation</emph> toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NAVI_VS" id="bm_id3154622" localize="false"/>
 <paragraph role="paragraph" id="par_id3153141" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_NAVI_VS">Click the icon for the type of objects you want to browse through. Then click one of the "Previous Object" or "Next Object" arrow buttons. The names of these buttons indicate the type of object you have selected. The text cursor is placed on whichever object you have selected.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Configuration"><emph>Tools - Configuration</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
+<paragraph role="tip" id="par_id3149968" xml-lang="en-US" l10n="CHG" oldref="11">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp" name="Tools - Customize"><emph>Tools - Customize</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp" name="menus">menus</link>, <link href="text/shared/01/06140200.xhp" name="keyboard input">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155338"><bookmark_value>searching; repeating a search</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="2" l10n="U" oldref="8">Repeat Search</paragraph>
@@ -89,7 +86,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_NID_PGE" id="bm_id6152836" localize="false"/>
 <paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NID_POSTIT" id="bm_id5230567" localize="false"/>
-<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through comments.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NID_PREV" id="bm_id1692556" localize="false"/>
 <paragraph role="paragraph" id="par_idN1080B" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the cursor to the previous object of the selected type.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NID_REG" id="bm_id9508651" localize="false"/>
@@ -100,7 +97,7 @@
 <paragraph role="paragraph" id="par_idN10857" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through search results.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NID_TABLE_FORMULA" id="bm_id7630237" localize="false"/>
 <paragraph role="paragraph" id="par_idN1086E" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through table formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_NID_FORMULA_ERROR" id="bm_id7151402" localize="false"/>
+<!-- removed HID HID_NID_FORMULA_ERROR -->
 <bookmark xml-lang="en-US" branch="hid/HID_NID_TABLE_FORMULA_ERROR" id="bm_id8653523" localize="false"/>
 <paragraph role="paragraph" id="par_idN10885" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through wrong table formulas.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NID_TBL" id="bm_id4498428" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/02120000.xhp b/helpcontent2/source/text/swriter/01/02120000.xhp
index 60f744997d..46f743b6a6 100644
--- a/helpcontent2/source/text/swriter/01/02120000.xhp
+++ b/helpcontent2/source/text/swriter/01/02120000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02120000.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,15 +52,15 @@
 <embed href="text/swriter/guide/autotext.xhp#autotext"/>
 <paragraph role="heading" id="hd_id3148982" xml-lang="en-US" level="2" l10n="U" oldref="4">AutoText</paragraph>
 <paragraph role="paragraph" id="par_id3153640" xml-lang="en-US" l10n="U" oldref="5">The <emph>AutoText </emph>dialog lists the AutoText categories and entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_INSERT_TIP" id="bm_id3152778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP" id="bm_id3152778" localize="false"/>
 <paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="6">Display remainder of name as a suggestion while typing</paragraph>
 <paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="CHG" oldref="51"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_INSERT_TIP">Displays a suggestion for completing a word as a Help Tip after you type the first three letters of a word that matches an AutoText entry. To accept the suggestion, press Enter. If more than one AutoText entry matches the letters that you type, press Ctrl+Tab to advance through the entries.</ahelp> For example, to insert dummy text, type "Dum", and then press Enter.</paragraph>
 <paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="53">To display the list in reverse order, press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_GLOSSARY:ED_NAME" id="bm_id3155856" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_GLOSSARY:ED_NAME" id="bm_id3155856" localize="false"/>
 <paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="9">Name</paragraph>
 <paragraph role="paragraph" id="par_id3155862" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_GLOSSARY:ED_NAME">Lists the name of the currently selected AutoText entry. If you have selected text in the document, type the name of the new AutoText entry, click the <emph>AutoText </emph>button, and then choose <emph>New</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_GLOSSARY:ED_SHORTNAME" id="bm_id3150124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_GLOSSARY:ED_SHORTNAME" id="bm_id3150124" localize="false"/>
 <paragraph role="heading" id="hd_id3150113" xml-lang="en-US" level="3" l10n="U" oldref="12">Shortcut</paragraph>
 <paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:EDIT:DLG_GLOSSARY:ED_SHORTNAME">Displays the shortcut for the selected AutoText entry. If you are creating a new AutoText entry, type the shortcut that you want to use for the entry.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149558" xml-lang="en-US" level="3" l10n="U" oldref="65">List box</paragraph>
@@ -73,7 +70,7 @@
 <paragraph role="paragraph" id="par_id3156094" xml-lang="en-US" l10n="U" oldref="15">Inserts the selected AutoText into the current document.</paragraph>
 <paragraph role="note" id="par_id3148788" xml-lang="en-US" l10n="U" oldref="75">If you insert an unformatted AutoText entry into a paragraph, the entry is formatted with the current paragraph style.</paragraph>
 <embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:DLG_GLOSSARY:PB_EDIT" id="bm_id3153121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:DLG_GLOSSARY:PB_EDIT" id="bm_id3153121" localize="false"/>
 <paragraph role="heading" id="hd_id3150039" xml-lang="en-US" level="2" l10n="U" oldref="17">AutoText</paragraph>
 <paragraph role="paragraph" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:MENUBUTTON:DLG_GLOSSARY:PB_EDIT">Click to display additional AutoText commands, for example, to create a new AutoText entry from a text selection in the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DEFINE" id="bm_id3154628" localize="false"/>
@@ -102,41 +99,41 @@
 <bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_IMPORT" id="bm_id3156263" localize="false"/>
 <paragraph role="heading" id="hd_id3149597" xml-lang="en-US" level="3" l10n="U" oldref="77">Import</paragraph>
 <paragraph role="paragraph" id="par_id3148937" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="HID_MD_GLOS_IMPORT">Opens a dialog where you can select the MS 97/2000/XP Word document or template, containing the AutoText entries that you want to import.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_BIB" id="bm_id3156049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_GLOSSARY:PB_BIB" id="bm_id3156049" localize="false"/>
 <paragraph role="heading" id="hd_id3156038" xml-lang="en-US" level="2" l10n="U" oldref="37">Categories</paragraph>
 <paragraph role="paragraph" id="par_id3156055" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:PUSHBUTTON:DLG_GLOSSARY:PB_BIB">Adds, renames, or deletes AutoText categories.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_BIB_BASE" id="bm_id3159229" localize="false"/>
 <paragraph role="heading" id="hd_id3159217" xml-lang="en-US" level="2" l10n="U" oldref="54">Edit Categories</paragraph>
 <paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_BIB_BASE">Adds, renames, or deletes AutoText categories.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_BIB_BASE:ED_NAME" id="bm_id3150796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_BIB_BASE:ED_NAME" id="bm_id3150796" localize="false"/>
 <paragraph role="heading" id="hd_id3145192" xml-lang="en-US" level="3" l10n="U" oldref="39">Category</paragraph>
 <paragraph role="paragraph" id="par_id3150802" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:EDIT:DLG_BIB_BASE:ED_NAME">Displays the name of the selected AutoText category. To change the name of the category, type a new name, and then click <emph>Rename</emph>. To create a new category, type a name, and then click <emph>New</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_BIB_BASE_LB_PATH" id="bm_id3155328" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_BIB_BASE:LB_PATH" id="bm_id3155328" localize="false"/>
 <paragraph role="heading" id="hd_id3155318" xml-lang="en-US" level="3" l10n="U" oldref="79">Path</paragraph>
 <paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="SW_LISTBOX_DLG_BIB_BASE_LB_PATH">Displays the current path to the directory where the selected AutoText category files are stored. If you are creating an AutoText category, select where you want to store the category files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW" id="bm_id3154421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_NEW" id="bm_id3154421" localize="false"/>
 <paragraph role="heading" id="hd_id3154410" xml-lang="en-US" level="3" l10n="U" oldref="41">New</paragraph>
 <paragraph role="paragraph" id="par_id3154933" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW">Creates a new AutoText category using the name that you entered in the<emph> Name</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME" id="bm_id3153372" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_RENAME" id="bm_id3153372" localize="false"/>
 <paragraph role="heading" id="hd_id3154959" xml-lang="en-US" level="3" l10n="U" oldref="67">Rename</paragraph>
 <paragraph role="paragraph" id="par_id3153379" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME">Changes the name of the selected AutoText category to the name that you enter in the <emph>Name </emph>box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_GLOS_GROUP_TREE" id="bm_id3154131" localize="false"/>
 <paragraph role="heading" id="hd_id3154120" xml-lang="en-US" level="3" l10n="U" oldref="81">Selection list</paragraph>
 <paragraph role="paragraph" id="par_id3154137" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_GLOS_GROUP_TREE">Lists the existing AutoText categories and the corresponding paths.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
 <paragraph role="heading" id="hd_id3145615" xml-lang="en-US" level="2" l10n="U" oldref="56">Path</paragraph>
 <paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="." visibility="hidden">Opens the Edit Paths dialog, where you can select the directory to store AutoText.</ahelp>Opens the <link href="text/shared/optionen/01010301.xhp" name="Edit Paths">Edit Paths</link> dialog, where you can select the directory to store AutoText.</paragraph>
 <paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="CHG" oldref="61">To add a new path to an AutoText directory, click the <emph>Path</emph> button in the <emph>AutoText </emph>dialog.</paragraph>
 <paragraph role="heading" id="hd_id3155383" xml-lang="en-US" level="2" l10n="U" oldref="45">Save links relative to</paragraph>
 <paragraph role="paragraph" id="par_id3155396" xml-lang="en-US" l10n="U" oldref="46">Use this area to set the way $[officename] inserts links to the AutoText directory. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_FILE_REL" id="bm_id3148755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL" id="bm_id3148755" localize="false"/>
 <paragraph role="heading" id="hd_id3148743" xml-lang="en-US" level="3" l10n="U" oldref="47">File system</paragraph>
 <paragraph role="paragraph" id="par_id3148762" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_FILE_REL">Links to AutoText directories on your computer are relative.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_NET_REL" id="bm_id3153031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_NET_REL" id="bm_id3153031" localize="false"/>
 <paragraph role="heading" id="hd_id3153020" xml-lang="en-US" level="3" l10n="U" oldref="49">Internet</paragraph>
 <paragraph role="paragraph" id="par_id3153037" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_NET_REL">Links to files on the Internet are relative.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_GLOSSARY:CB_SHOW_EXAMPLE" id="bm_id3154603" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE" id="bm_id3154603" localize="false"/>
 <paragraph role="heading" id="hd_id3154590" xml-lang="en-US" level="3" l10n="U" oldref="71">Show preview</paragraph>
 <paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SW:CHECKBOX:DLG_GLOSSARY:CB_SHOW_EXAMPLE">Turns on or off a preview of the selected AutoText entry.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154909" xml-lang="en-US" level="3" l10n="U" oldref="69">Preview</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02120100.xhp b/helpcontent2/source/text/swriter/01/02120100.xhp
index ac5dd9757a..c350b0b49c 100755
--- a/helpcontent2/source/text/swriter/01/02120100.xhp
+++ b/helpcontent2/source/text/swriter/01/02120100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02120100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,11 +45,11 @@
   <section id="howtoget">
   <embed href="text/swriter/00/00000402.xhp#autotextum"/>
 </section>
-  <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_ON" xml-lang="en-US" id="bm_id3155921"/><paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US" oldref="3">Name</paragraph>
+  <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_ON" xml-lang="en-US" id="bm_id3155921"/><paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US" oldref="3">Name</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3151372" xml-lang="en-US" oldref="4"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_ON" visibility="visible">Displays the current name of the selected AutoText item.</ahelp></paragraph>
-  <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_NN" xml-lang="en-US" id="bm_id3155869"/><paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US" oldref="5">New</paragraph>
+  <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NN" xml-lang="en-US" id="bm_id3155869"/><paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US" oldref="5">New</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150686" xml-lang="en-US" oldref="6"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NN" visibility="visible">Type the new name for the selected AutoText component.</ahelp></paragraph>
-  <bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_OS" xml-lang="en-US" id="bm_id3150122"/><bookmark branch="hid/SW:EDIT:DLG_RENAME_GLOS:ED_NS" xml-lang="en-US" id="bm_id3145576"/><paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US" oldref="7">Shortcut</paragraph>
+  <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_OS" xml-lang="en-US" id="bm_id3150122"/><bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NS" xml-lang="en-US" id="bm_id3145576"/><paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US" oldref="7">Shortcut</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145583" xml-lang="en-US" oldref="8"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NS" visibility="visible">Assigns a shortcut to the selected AutoText entry.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/02130000.xhp b/helpcontent2/source/text/swriter/01/02130000.xhp
index d8e8e6defb..474e1bbc3f 100644
--- a/helpcontent2/source/text/swriter/01/02130000.xhp
+++ b/helpcontent2/source/text/swriter/01/02130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02130000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/02140000.xhp b/helpcontent2/source/text/swriter/01/02140000.xhp
index b2f4ebefd0..2fcf2080ad 100644
--- a/helpcontent2/source/text/swriter/01/02140000.xhp
+++ b/helpcontent2/source/text/swriter/01/02140000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
 <paragraph role="note" id="par_id3151371" xml-lang="en-US" l10n="U" oldref="13">The following dialog elements are only visible when the corresponding field type is selected.</paragraph>
 <paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="56">Select</paragraph>
 <paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="57">Lists the field options, for example, "fixed". If you want, you can click another option for the selected field type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT" id="bm_id3155866" localize="false"/><paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT" id="bm_id3155866" localize="false"/><paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
 <paragraph role="paragraph" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT">Select the format for the contents of the field. For date, time, and user-defined fields, you can also click "Additional formats" in the list, and then choose a different format.</ahelp> The formats that are available depend on the type of field that you are editing.</paragraph>
 <paragraph role="heading" id="hd_id3149556" xml-lang="en-US" level="2" l10n="U" oldref="24">Offset</paragraph>
 <paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="CHG" oldref="25">Displays the offset for the selected field type, for example, for "Next Page," "Page Numbers" or "Previous Page". You can enter a new offset value which will be added to the displayed page number.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index a3a0564c53..73dc34d735 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_EDIT_FOOTNOTE" id="bm_id8871205" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EditFootnote" id="bm_id3149486" localize="false"/>
 <paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit  Footnotes">Footnote/Endnote</link></paragraph>
@@ -60,21 +57,21 @@
 <embed href="text/swriter/01/04030000.xhp#bearbeitenzeichen"/>
 <paragraph role="heading" id="hd_id3150113" xml-lang="en-US" level="3" l10n="U" oldref="14">...</paragraph>
 <embed href="text/swriter/01/04030000.xhp#bearbeitensonderzeichen"/>
-<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press F11 to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
+<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
 <paragraph role="heading" id="hd_id3153296" xml-lang="en-US" level="2" l10n="U" oldref="15">Type</paragraph>
 <paragraph role="paragraph" id="par_id3153308" xml-lang="en-US" l10n="U" oldref="20">Select the type of note to insert, that is, footnote or endnote. A footnote is placed at the bottom of the current page, whereas an endnote is placed at the end of the document.</paragraph>
 <paragraph role="heading" id="hd_id3156130" xml-lang="en-US" level="3" l10n="U" oldref="16">Footnote</paragraph>
 <paragraph role="paragraph" id="par_id3156098" xml-lang="en-US" l10n="U" oldref="21">Converts an endnote to a footnote.</paragraph>
 <paragraph role="heading" id="hd_id3156111" xml-lang="en-US" level="3" l10n="U" oldref="17">Endnote</paragraph>
 <paragraph role="paragraph" id="par_id3155079" xml-lang="en-US" l10n="U" oldref="22">Converts a footnote to an endnote.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_PREV" id="bm_id3154335" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV" id="bm_id3154335" localize="false"/>
 <paragraph role="heading" id="hd_id3154323" xml-lang="en-US" level="2" l10n="U" oldref="23">Arrow left</paragraph>
 <paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_PREV">Moves to the previous footnote or endnote anchor in the document.</ahelp></paragraph>
 <table id="tbl_id3148791">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150023" xml-lang="en-US" l10n="E">
-<image id="img_id3150030" src="res/sc10618.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150030" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150030" src="res/sc10618.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150030" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -83,14 +80,14 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_NEXT" id="bm_id3149631" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT" id="bm_id3149631" localize="false"/>
 <paragraph role="heading" id="hd_id3154630" xml-lang="en-US" level="2" l10n="U" oldref="26">Arrow right</paragraph>
 <paragraph role="paragraph" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_NEXT">Moves to the next footnote or endnote anchor in the document.</ahelp></paragraph>
 <table id="tbl_id3150662">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154029" xml-lang="en-US" l10n="E">
-<image id="img_id3154044" src="res/sc10617.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154044" src="res/sc10617.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154044" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/02160000.xhp b/helpcontent2/source/text/swriter/01/02160000.xhp
index ec06350da3..45b7b977a7 100644
--- a/helpcontent2/source/text/swriter/01/02160000.xhp
+++ b/helpcontent2/source/text/swriter/01/02160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 </section>
 <paragraph role="heading" id="hd_id3159193" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
 <paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="4">Edits the selected index entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_MULTMRK:LB_TOX" id="bm_id3143283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MULTMRK:LB_TOX" id="bm_id3143283" localize="false"/>
 <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="3" l10n="U" oldref="5">Index</paragraph>
 <paragraph role="paragraph" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_MULTMRK:LB_TOX">Displays the type of index that the selected entry belongs to.</ahelp> You cannot change the index type of an index entry in this dialog. Instead, you must delete the index entry from the document, and then insert it again in a different index type.</paragraph>
 <paragraph role="heading" id="hd_id3149107" xml-lang="en-US" level="3" l10n="U" oldref="7">Entry</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02170000.xhp b/helpcontent2/source/text/swriter/01/02170000.xhp
index c5d634ab17..8cc0207d78 100644
--- a/helpcontent2/source/text/swriter/01/02170000.xhp
+++ b/helpcontent2/source/text/swriter/01/02170000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02170000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
 <paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="6">The current write protection status of a section is indicated by the lock symbol in front of the section name in the list. An open lock is unprotected and a closed lock is protected. Similarly, visible sections are indicated by a glasses symbol.</paragraph>
 <paragraph role="heading" id="hd_id3153638" xml-lang="en-US" level="2" l10n="U" oldref="20">Options</paragraph>
 <paragraph role="paragraph" id="par_id3152773" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_REGION_TREE">Opens the <link href="text/swriter/01/05040501.xhp" name="Options"><emph>Options</emph></link> dialog, where you can edit the column layout, background, footnote and endnote behavior of the selected section.</ahelp> If the section is password protected, you must enter the password first.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS" id="bm_id3156269" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:CB_DISMISS" id="bm_id3156269" localize="false"/>
 <paragraph role="heading" id="hd_id3155143" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Remove</paragraph>
 <paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS">Removes the selected section from the document, and inserts the contents of the section into the document.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/03050000.xhp b/helpcontent2/source/text/swriter/01/03050000.xhp
index f87e6c1607..af9ac93596 100644
--- a/helpcontent2/source/text/swriter/01/03050000.xhp
+++ b/helpcontent2/source/text/swriter/01/03050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,17 +34,13 @@
 <title id="tit" xml-lang="en-US">Ruler</title>
 <filename>/text/swriter/01/03050000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:45:47">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="lineal">
 <bookmark xml-lang="en-US" branch="hid/FN_RULER" id="bm_id8671021" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:Ruler" id="bm_id3151170" localize="false"/>
 <paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/03050000.xhp" name="Ruler">Ruler</link></paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View">%PRODUCTNAME Writer - View</link></emph>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000403.xhp#lineal"/>
diff --git a/helpcontent2/source/text/swriter/01/03070000.xhp b/helpcontent2/source/text/swriter/01/03070000.xhp
index 5508b563a6..31e4c53e4e 100644
--- a/helpcontent2/source/text/swriter/01/03070000.xhp
+++ b/helpcontent2/source/text/swriter/01/03070000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03070000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/03080000.xhp b/helpcontent2/source/text/swriter/01/03080000.xhp
index 95fcf13242..4a40a53e75 100644
--- a/helpcontent2/source/text/swriter/01/03080000.xhp
+++ b/helpcontent2/source/text/swriter/01/03080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03080000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/03090000.xhp b/helpcontent2/source/text/swriter/01/03090000.xhp
index d868f450ee..7857501ac0 100644
--- a/helpcontent2/source/text/swriter/01/03090000.xhp
+++ b/helpcontent2/source/text/swriter/01/03090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,10 +34,6 @@
 <title id="tit" xml-lang="en-US">Fields</title>
 <filename>/text/swriter/01/03090000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-09T16:31:55">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="feldbefehle">
@@ -52,7 +45,7 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000403.xhp#feldbefehle"/>
 </section>
-<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph>Tools - Options - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
 <paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="5">When you print a document with <emph>View - Field Names</emph> enabled, you are prompted to include the field names in the print out.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3145579" xml-lang="en-US" l10n="U" oldref="3"><link href="text/swriter/01/04090000.xhp" name="Insert - Fields">Insert - Fields</link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/03100000.xhp b/helpcontent2/source/text/swriter/01/03100000.xhp
index 5c91b2e1b2..7c1b1c3d22 100644
--- a/helpcontent2/source/text/swriter/01/03100000.xhp
+++ b/helpcontent2/source/text/swriter/01/03100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03100000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,6 +50,6 @@
   <embed href="text/swriter/00/00000403.xhp#steuerzeichen"/>
 </section>
 <paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="5">When you delete a paragraph mark, the paragraph that is merged takes on the formatting of the paragraph that the cursor is in.</paragraph>
-<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then select the options that you want in the <emph>Display of</emph> area.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/03120000.xhp b/helpcontent2/source/text/swriter/01/03120000.xhp
index bfd94dc4c0..4297d3aedf 100644
--- a/helpcontent2/source/text/swriter/01/03120000.xhp
+++ b/helpcontent2/source/text/swriter/01/03120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03120000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/03130000.xhp b/helpcontent2/source/text/swriter/01/03130000.xhp
index 32844f756b..33c523e459 100644
--- a/helpcontent2/source/text/swriter/01/03130000.xhp
+++ b/helpcontent2/source/text/swriter/01/03130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03130000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/03140000.xhp b/helpcontent2/source/text/swriter/01/03140000.xhp
index 029f189312..19a7b5f2b5 100644
--- a/helpcontent2/source/text/swriter/01/03140000.xhp
+++ b/helpcontent2/source/text/swriter/01/03140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03140000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000403.xhp#versteckteabs"/>
 </section>
-<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
+<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
 <paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="4">Use the <link href="text/swriter/01/04090000.xhp" name="field command">field command</link> "Hidden Paragraph" to assign a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> that must be met to hide a paragraph. If the condition is not met, the paragraph is displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="5">When you hide a paragraph, footnotes and frames that are anchored to characters in the paragraph are also hidden.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04010000.xhp b/helpcontent2/source/text/swriter/01/04010000.xhp
index 77cc958e39..6f24ea7eb9 100644
--- a/helpcontent2/source/text/swriter/01/04010000.xhp
+++ b/helpcontent2/source/text/swriter/01/04010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04010000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,25 +50,25 @@
 </section>
 <paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
 <paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="5">Select the type of break that you want to insert.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_LINE" id="bm_id3154108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_LINE" id="bm_id3154108" localize="false"/>
 <paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="6">Line Break</paragraph>
 <paragraph role="paragraph" id="par_id3149805" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_LINE">Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3149685" xml-lang="en-US" l10n="U" oldref="8">You can also insert a line break by pressing Shift+Enter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_COL" id="bm_id3155176" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_COL" id="bm_id3155176" localize="false"/>
 <paragraph role="heading" id="hd_id3148566" xml-lang="en-US" level="3" l10n="U" oldref="9">Column Break</paragraph>
 <paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_COL">Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next <link href="text/swriter/01/05040500.xhp" name="column">column</link>. A manual column break is indicated by a nonprinting border at the top of the new column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_BREAK:RB_PAGE" id="bm_id3149096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_BREAK:RB_PAGE" id="bm_id3149096" localize="false"/>
 <paragraph role="heading" id="hd_id3149487" xml-lang="en-US" level="3" l10n="U" oldref="11">Page Break</paragraph>
 <paragraph role="paragraph" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_BREAK:RB_PAGE">Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="13">You can also insert a page break by pressing <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. However, if you want to assign the following page a different Page Style, you must use the menu command to insert the manual page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_BREAK:LB_COLL" id="bm_id3156270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_BREAK:LB_COLL" id="bm_id3156270" localize="false"/>
 <paragraph role="heading" id="hd_id3149175" xml-lang="en-US" level="3" l10n="U" oldref="14">Style</paragraph>
 <paragraph role="paragraph" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:LISTBOX:DLG_BREAK:LB_COLL">Select the page style for the page that follows the manual page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_BREAK:CB_PAGENUM" id="bm_id3155911" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_BREAK:CB_PAGENUM" id="bm_id3155911" localize="false"/>
 <paragraph role="heading" id="hd_id3145782" xml-lang="en-US" level="3" l10n="U" oldref="16">Change page number</paragraph>
 <paragraph role="paragraph" id="par_id3155917" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:DLG_BREAK:CB_PAGENUM">Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_BREAK:ED_PAGENUM" id="bm_id3150693" localize="false"/>
 <paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="3" l10n="U" oldref="20">Page number</paragraph>
 <paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM">Enter the new page number for the page that follows the manual page break.</ahelp></paragraph>
 <paragraph role="note" id="par_id3150554" xml-lang="en-US" l10n="U" oldref="18">To display manual breaks, choose <link href="text/swriter/01/03100000.xhp" name="View - Nonprinting Characters"><emph>View - Nonprinting Characters</emph></link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020000.xhp b/helpcontent2/source/text/swriter/01/04020000.xhp
index d21995efb3..9dec2f948c 100644
--- a/helpcontent2/source/text/swriter/01/04020000.xhp
+++ b/helpcontent2/source/text/swriter/01/04020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/FN_INSERT_REGION" id="bm_id7648447" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertSection" id="bm_id3149809" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_COLUMN_SECTION" id="bm_id3153527" localize="false"/>
+<!-- removed HID FN_INSERT_COLUMN_SECTION -->
 <paragraph role="heading" id="hd_id3154108" xml-lang="en-US" level="1" l10n="U" oldref="1">
 <variable id="bereicheinfuegen"><link href="text/swriter/01/04020000.xhp" name="Insert Section">Insert Section</link>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020100.xhp b/helpcontent2/source/text/swriter/01/04020100.xhp
index 3bd569b3ce..e1527b9781 100644
--- a/helpcontent2/source/text/swriter/01/04020100.xhp
+++ b/helpcontent2/source/text/swriter/01/04020100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,17 +50,17 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#bereicheinbereich"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_INSERT_SECTION:ED_RNAME" id="bm_id3145413" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_MD_EDIT_REGION_ED_RANAME" id="bm_id8467970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_INSERT_SECTION:ED_RNAME" id="bm_id3145413" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_RANAME" id="bm_id8467970" localize="false"/>
 <paragraph role="heading" id="hd_id3151170" xml-lang="en-US" level="2" l10n="U" oldref="6">New Section</paragraph>
 <paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:COMBOBOX:TP_INSERT_SECTION:ED_RNAME">Type a name for the new section.</ahelp> By default, $[officename] automatically assigns the name "Section X" to new sections, where X is a consecutive number.</paragraph>
 <paragraph role="heading" id="hd_id3154102" xml-lang="en-US" level="2" l10n="U" oldref="8">Link</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_FILE" id="bm_id3153532" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_FILE" id="bm_id3153536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_FILE" id="bm_id3153532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_FILE" id="bm_id3153536" localize="false"/>
 <paragraph role="heading" id="hd_id3149806" xml-lang="en-US" level="3" l10n="U" oldref="20">Link</paragraph>
 <paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:TP_INSERT_SECTION:CB_FILE">Inserts the contents of another document or section from another document in the current section.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_DDE" id="bm_id3154569" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:MD_EDIT_REGION:CB_DDE" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_DDE" id="bm_id3154569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:MD_EDIT_REGION:CB_DDE" id="bm_id3154573" localize="false"/>
 <switch select="sys">
 <case select="WIN">
 <paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="3" l10n="U" oldref="26">DDE<comment>UFI: WIN only, while fixing #109638#</comment></paragraph>
@@ -72,41 +69,41 @@
 <paragraph role="paragraph" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="35">For example, to insert a section named "Section1" from a $[officename] text document abc.sxw as a DDE link, use the command: "soffice x:\abc.sxw Section1". To insert the contents of the first cell from a MS Excel spreadsheet file called "abc.xls", use the command: "excel x:\[abc.xls]Sheet1 z1s1". You can also copy the elements that you want to insert as a DDE link, and then <emph>Edit - Paste Special</emph>. You can then view the DDE command for the link, by selecting the contents and choosing <emph>Edit - Fields</emph>.</paragraph>
 </case>
 </switch>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_INSERT_SECTION:ED_FILE" id="bm_id3149038" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:MD_EDIT_REGION:ED_FILE" id="bm_id3149042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_INSERT_SECTION:ED_FILE" id="bm_id3149038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_FILE" id="bm_id3149042" localize="false"/>
 <paragraph role="heading" id="hd_id3153640" xml-lang="en-US" level="3" l10n="U" oldref="28">File name<switchinline select="sys"><caseinline select="WIN"> / DDE command 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3145754" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:EDIT:MD_EDIT_REGION:ED_FILE">Enter the path and the filename for the file that you want to insert, or click the browse button (<emph>...</emph>) to locate the file.</ahelp><switchinline select="sys"><caseinline select="WIN">If the <emph>DDE </emph>check box is selected, enter the DDE command that you want to use. 
 </caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_INSERT_SECTION:PB_FILE" id="bm_id3155148" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:MD_EDIT_REGION:PB_FILE" id="bm_id3156266" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_INSERT_SECTION:PB_FILE" id="bm_id3155148" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:PB_FILE" id="bm_id3156266" localize="false"/>
 <paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="3" l10n="U" oldref="39">...</paragraph>
 <paragraph role="paragraph" id="par_id3156274" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:PUSHBUTTON:MD_EDIT_REGION:PB_FILE">Locate the file that you want to insert as a link, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_INSERT_SECTION:LB_SUBREG" id="bm_id3145781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:MD_EDIT_REGION:LB_SUBREG" id="bm_id3145785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG" id="bm_id3145781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:MD_EDIT_REGION:LB_SUBREG" id="bm_id3145785" localize="false"/>
 <paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="23">Section</paragraph>
 <paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:COMBOBOX:MD_EDIT_REGION:LB_SUBREG">Select the section in the file that you want to insert as a link.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151373" xml-lang="en-US" l10n="U" oldref="25">When you open a document that contains linked sections, you are prompted to update the links.</paragraph>
 <paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="43">Write Protection</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_PROTECT" id="bm_id3155864" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_PROTECT" id="bm_id3155868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT" id="bm_id3155864" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT" id="bm_id3155868" localize="false"/>
 <paragraph role="heading" id="hd_id3150700" xml-lang="en-US" level="3" l10n="U" oldref="10">Protected</paragraph>
 <paragraph role="paragraph" id="par_id3150110" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:TRISTATEBOX:MD_EDIT_REGION:CB_PROTECT">Prevents the selected section from being edited.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_INSERT_SECTION_CB_PASSWD" id="bm_id3145273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD" id="bm_id3145273" localize="false"/>
 <paragraph role="heading" id="hd_id3145261" xml-lang="en-US" level="3" l10n="U" oldref="44">With password</paragraph>
 <paragraph role="paragraph" id="par_id3149555" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_CHECKBOX_TP_INSERT_SECTION_CB_PASSWD">Protects the selected section with a password. The password must have a minimum of 5 characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_MD_EDIT_REGION_PB_PASSWD" id="bm_id3150561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_INSERT_SECTION_PB_PASSWD" id="bm_id3147735" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:MD_EDIT_REGION:PB_PASSWD" id="bm_id3150561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_INSERT_SECTION:PB_PASSWD" id="bm_id3147735" localize="false"/>
 <paragraph role="heading" id="hd_id3150549" xml-lang="en-US" level="3" l10n="U" oldref="46">...</paragraph>
 <paragraph role="paragraph" id="par_id3147742" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SW_PUSHBUTTON_TP_INSERT_SECTION_PB_PASSWD">Opens a dialog where you can change the current password.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3146333" xml-lang="en-US" level="2" l10n="U" oldref="48">Hide</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_INSERT_SECTION:CB_HIDE" id="bm_id3149843" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:MD_EDIT_REGION:CB_HIDE" id="bm_id3149847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_INSERT_SECTION:CB_HIDE" id="bm_id3149843" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:MD_EDIT_REGION:CB_HIDE" id="bm_id3149847" localize="false"/>
 <paragraph role="heading" id="hd_id3149830" xml-lang="en-US" level="3" l10n="U" oldref="12">Hide</paragraph>
 <paragraph role="paragraph" id="par_id3148849" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:TRISTATEBOX:MD_EDIT_REGION:CB_HIDE">Hides and prevents the selected section from being printed.</ahelp> The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip "hidden" is displayed.</paragraph>
 <paragraph role="note" id="par_id3155074" xml-lang="en-US" l10n="U" oldref="50">You cannot hide a section if it is the only content on a page, or in a header, footer, footnote, frame, or table cell.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_INSERT_SECTION:ED_CONDITION" id="bm_id3154334" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:MD_EDIT_REGION:ED_CONDITION" id="bm_id3154338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_INSERT_SECTION:ED_CONDITION" id="bm_id3154334" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:MD_EDIT_REGION:ED_CONDITION" id="bm_id3154338" localize="false"/>
 <paragraph role="heading" id="hd_id3154323" xml-lang="en-US" level="3" l10n="U" oldref="16">With condition</paragraph>
 <paragraph role="paragraph" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:EDIT:MD_EDIT_REGION:ED_CONDITION">Enter the condition that must be met to hide the section.</ahelp> A condition is a <link href="text/swriter/01/04090200.xhp" name="logical expression">logical expression</link>, such as "SALUTATION EQ Mr.". For example, if you use the <link href="text/swriter/guide/form_letters_main.xhp" name="mail merge">mail merge</link> form letter feature to define a database field called "Salutation" that contains "Mr.", "Ms.", or "Sir or Madam", you can then specify that a section will only be printed if the salutation is "Mr.".</paragraph>
 <paragraph role="paragraph" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="18">Another example would be to create the field variable "x" and set its value to 1. Then specify a condition based on this variable for hiding a section, such as: "x eq 1". If you want to display the section, set the value of the variable "x" to "0".</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04020200.xhp b/helpcontent2/source/text/swriter/01/04020200.xhp
index 4d17d4a846..2541c5759d 100755
--- a/helpcontent2/source/text/swriter/01/04020200.xhp
+++ b/helpcontent2/source/text/swriter/01/04020200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04020200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,10 +47,10 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#sectionindents"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_SECTION_INDENTS_MF_BEFORE" id="bm_id3149818" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE" id="bm_id3149818" localize="false"/>
 <paragraph role="heading" id="hd_id3149488" xml-lang="en-US" level="2" l10n="U" oldref="3">Before section</paragraph>
 <paragraph role="paragraph" id="par_id3149824" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW_METRICFIELD_TP_SECTION_INDENTS_MF_BEFORE">Specifies the indents before the section, at the left margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_SECTION_INDENTS_MF_AFTER" id="bm_id3151258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_SECTION_INDENTS:MF_AFTER" id="bm_id3151258" localize="false"/>
 <paragraph role="heading" id="hd_id3149108" xml-lang="en-US" level="2" l10n="U" oldref="5">After section</paragraph>
 <paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_METRICFIELD_TP_SECTION_INDENTS_MF_AFTER">Specifies the indents after the section, at the right margin.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04030000.xhp b/helpcontent2/source/text/swriter/01/04030000.xhp
index 15cb0265ef..1964a56ca5 100644
--- a/helpcontent2/source/text/swriter/01/04030000.xhp
+++ b/helpcontent2/source/text/swriter/01/04030000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,27 +54,27 @@
 </section>
 <paragraph role="heading" id="hd_id3154106" xml-lang="en-US" level="2" l10n="U" oldref="7">Numbering</paragraph>
 <paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="16">Select the type of numbering that you want to use for footnotes and endnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" id="bm_id3154482" localize="false"/>
 <paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="8">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR" id="bm_id3152963" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR" id="bm_id3152963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR" id="bm_id3152962" localize="false"/>
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="3" l10n="U" oldref="9">Character</paragraph>
 <paragraph role="paragraph" id="par_id3155901" xml-lang="en-US" l10n="U" oldref="18"><variable id="bearbeitenzeichen"><ahelp hid="SW:EDIT:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR">Choose this option to define a character or symbol for the current footnote.</ahelp> This can be either a letter or number. To assign a special character, click the button at the bottom. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR" id="bm_id3153519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR" id="bm_id3153519" localize="false"/>
 <paragraph role="heading" id="hd_id3155185" xml-lang="en-US" level="3" l10n="U" oldref="10">...</paragraph>
 <paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="19"><variable id="bearbeitensonderzeichen"><ahelp hid="SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR">Inserts a <link href="text/shared/01/04100000.xhp" name="special character ">special character </link> as a footnote or endnote anchor.</ahelp>
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="2" l10n="U" oldref="11">Type</paragraph>
 <paragraph role="paragraph" id="par_id3151256" xml-lang="en-US" l10n="U" oldref="20">Select whether to insert a footnote or an endnote. Endnote numbering is separate from the footnote numbering.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN" id="bm_id3148974" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN" id="bm_id3148974" localize="false"/>
 <paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="12">Footnote</paragraph>
 <paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN">Inserts a footnote anchor at the current cursor position in the document, and adds a footnote to the bottom of the page.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_INSERT_ENDNOTE" id="bm_id5303788" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertEndnote" id="bm_id3149042" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE" id="bm_id3149046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE" id="bm_id3149046" localize="false"/>
 <paragraph role="heading" id="hd_id3153644" xml-lang="en-US" level="3" l10n="U" oldref="13">Endnote</paragraph>
 <paragraph role="paragraph" id="par_id3152770" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE">Inserts an endnote anchor at the current cursor position in the document, and adds an endnote at the end of the document.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04040000.xhp b/helpcontent2/source/text/swriter/01/04040000.xhp
index d38e50eb63..fda6971125 100644
--- a/helpcontent2/source/text/swriter/01/04040000.xhp
+++ b/helpcontent2/source/text/swriter/01/04040000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04040000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,10 +52,10 @@
 <paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" oldref="3">To jump to a specific bookmark, press F5 to open the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link>, click the plus sign (+) next to the<emph> Bookmark</emph> entry, and then double-click the bookmark.</paragraph>
 <paragraph role="paragraph" id="par_id3151308" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="sys"><caseinline select="MAC">
 </caseinline><defaultinline>You can also right-click the <emph>Page Number</emph> field at the left end of the <emph>Status Bar</emph> at the bottom of the document window, and then choose the bookmark that you want to jump to.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:DLG_INSERT_BOOKMARK:CB_BOOKMARK" id="bm_id3154200" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="5">Bookmarks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK" id="bm_id3154200" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="5">Bookmarks</paragraph>
 <paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:COMBOBOX:DLG_INSERT_BOOKMARK:CB_BOOKMARK">Type the name of the bookmark that you want to create. The lower list contains all of the bookmarks in the current document. To delete a bookmark, select it in the list, and then click <emph>Delete</emph>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="13">You cannot use the following characters in a bookmark name: / \ @ : * ? " ; , . #</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_INSERT_BOOKMARK:BT_DELETE" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3149817" xml-lang="en-US" level="2" l10n="U" oldref="11">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3149817" xml-lang="en-US" level="2" l10n="U" oldref="11">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:DLG_INSERT_BOOKMARK:BT_DELETE">To delete a bookmark, select the bookmark from the <emph>Insert Bookmark</emph> dialog and click the <emph>Delete</emph> button. No confirmation dialog will follow.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 980f3fdf1a..b24899a27b 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,26 +53,26 @@
 </section>
 <paragraph role="heading" id="hd_id3154098" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3149804" xml-lang="en-US" l10n="U" oldref="4">Set the caption options for the current selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY" id="bm_id3154567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_CAPTION:BOX_CATEGORY" id="bm_id3154567" localize="false"/>
 <paragraph role="heading" id="hd_id3153533" xml-lang="en-US" level="3" l10n="U" oldref="5">Category</paragraph>
 <paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. </ahelp> For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_CAPTION:BOX_FORMAT" id="bm_id3152956" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_FORMAT" id="bm_id3152956" localize="false"/>
 <paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="7">Numbering</paragraph>
 <paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_FORMAT">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
 <paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Caption</paragraph>
 <paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_CAPTION_EDT_SEP" id="bm_id7607959" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_SEP" id="bm_id7607959" localize="false"/>
 <paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
 <paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_CAPTION_BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
 <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
 <paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149043" xml-lang="en-US" level="2" l10n="U" oldref="29"><link href="text/swriter/01/04060100.xhp" name="Options">Options</link></paragraph>
 <embed href="text/swriter/01/04060100.xhp#optionentext"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
 <paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
-<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu Tools - Options - %PRODUCTNAME Writer - AutoCaption.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/captions.xhp#captions"/>
 <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
diff --git a/helpcontent2/source/text/swriter/01/04060100.xhp b/helpcontent2/source/text/swriter/01/04060100.xhp
index 96ca573ecc..03bbab141e 100755
--- a/helpcontent2/source/text/swriter/01/04060100.xhp
+++ b/helpcontent2/source/text/swriter/01/04060100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04060100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CAPTION:BTN_OPTION" id="bm_id3151170" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_OPTION" id="bm_id3151170" localize="false"/>
 <paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Options</paragraph>
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionentext"><ahelp hid="SW:PUSHBUTTON:DLG_CAPTION:BTN_OPTION">Adds the chapter number to the caption label. To use this feature, you must first assign an <link href="text/swriter/guide/chapter_numbering.xhp" name="outline level">outline level</link> to a paragraph style, and then apply the style to the chapter headings in your document.</ahelp>
 </variable></paragraph>
@@ -55,18 +52,18 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
 </section>
 <paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="3">Numbering by chapter</paragraph>
 <paragraph role="paragraph" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="4">When you add chapter numbers to caption labels, the caption numbering is reset when a chapter heading is encountered. For example, if the last figure in chapter 1 is "Figure 1.12", the first figure in the next chapter would be "Figure 2.1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SEQUENCE_OPTION:LB_LEVEL" id="bm_id3154479" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL" id="bm_id3154479" localize="false"/>
 <paragraph role="heading" id="hd_id3154574" xml-lang="en-US" level="3" l10n="U" oldref="5">Level</paragraph>
 <paragraph role="paragraph" id="par_id3152954" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_SEQUENCE_OPTION:LB_LEVEL">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_SEQUENCE_OPTION:ED_SEPARATOR" id="bm_id3153672" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR" id="bm_id3153672" localize="false"/>
 <paragraph role="heading" id="hd_id3151316" xml-lang="en-US" level="3" l10n="U" oldref="7">Separator</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:DLG_SEQUENCE_OPTION:ED_SEPARATOR">Enter the character that you want to insert between the chapter number and the caption number.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Category and frame format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_SEQUENCE_OPTION_LB_CHARSTYLE" id="bm_id8001037" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE" id="bm_id8001037" localize="false"/>
 <paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="3" l10n="NEW">Character style</paragraph>
 <paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR" id="bm_id3149820" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_SEQUENCE_OPTION_CB_APPLYBAS" id="bm_id2826013" localize="false"/>
+<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS" id="bm_id2826013" localize="false"/>
 <paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
 <paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04070000.xhp b/helpcontent2/source/text/swriter/01/04070000.xhp
index 5004874fe7..bb9c7ad51b 100644
--- a/helpcontent2/source/text/swriter/01/04070000.xhp
+++ b/helpcontent2/source/text/swriter/01/04070000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070000.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,51 +29,53 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriter0104070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Envelope</title>
-<filename>/text/swriter/01/04070000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriter0104070000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Envelope</title>
+         <filename>/text/swriter/01/04070000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7094027"><bookmark_value>inserting;envelopes</bookmark_value>
-<bookmark_value>letters;inserting envelopes</bookmark_value>
-<bookmark_value>envelopes;inserting</bookmark_value>
-</bookmark><comment>mw corrected a typo in "letters;..."</comment>
+      <bookmark_value>letters;inserting envelopes</bookmark_value>
+      <bookmark_value>envelopes</bookmark_value>
+</bookmark><comment>MW made "envelopes;" a one level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/FN_ENVELOP" id="bm_id3025884" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3148773" localize="false"/><paragraph role="heading" id="hd_id3145245" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04070000.xhp" name="Envelope">Envelope</link></paragraph>
-<paragraph role="paragraph" id="par_id3149289" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation. 
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertEnvelope" id="bm_id3148773" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145245" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04070000.xhp" name="Envelope">Envelope</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" l10n="CHG" oldref="2"><variable id="briefum"><ahelp hid=".uno:InsertEnvelope">Creates an envelope.</ahelp> On three tab pages, you can specify the addressee and sender, the position and format for both addresses, the size of the envelope, and the envelope orientation. 
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000404.xhp#briefumschlag"/>
-</section>
-<embed href="text/swriter/01/04070100.xhp#umschlag"/>
-<embed href="text/swriter/01/04070200.xhp#format"/>
-<embed href="text/swriter/01/04070300.xhp#drucker"/>
-<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_PRINT" id="bm_id3154574" localize="false"/><paragraph role="heading" id="hd_id3153540" xml-lang="en-US" level="2" l10n="U" oldref="4">New doc.</paragraph>
-<paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_ENVELOP_PRINT">Creates a new document and inserts the envelope.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_INSERT" id="bm_id3151314" localize="false"/><paragraph role="heading" id="hd_id3152959" xml-lang="en-US" level="2" l10n="U" oldref="6">Insert</paragraph>
-<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp> The envelope is formatted with the <emph>Envelope</emph> page style.</paragraph>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-<paragraph role="heading" id="hd_id8208563" xml-lang="en-US" level="2" l10n="NEW">To delete an envelope from a document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id396130" xml-lang="en-US" l10n="NEW">Click into the envelope page to make it the current page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7174596" xml-lang="en-US" l10n="CHG">Right-click the field on the status line that shows "Envelope".</paragraph>
-<paragraph role="paragraph" id="par_id7657704" xml-lang="en-US" l10n="NEW">A submenu opens showing some page styles.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5187536" xml-lang="en-US" l10n="NEW">Choose the "Default" page style from the submenu.</paragraph>
-<paragraph role="paragraph" id="par_id6952726" xml-lang="en-US" l10n="NEW">This removes the special "Envelope" page formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1777092" xml-lang="en-US" l10n="NEW">Delete the frames for sender and recipient. Click the border of each frame and press the <item type="keycode">Del</item> key.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000404.xhp#briefumschlag"/>
+      </section>
+      <embed href="text/swriter/01/04070100.xhp#umschlag"/>
+      <embed href="text/swriter/01/04070200.xhp#format"/>
+      <embed href="text/swriter/01/04070300.xhp#drucker"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_PRINT" id="bm_id3154574" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153540" role="heading" level="2" l10n="U" oldref="4">New doc.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154473" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_ENVELOP_PRINT">Creates a new document and inserts the envelope.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ENVELOP_INSERT" id="bm_id3151314" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152959" role="heading" level="2" l10n="U" oldref="6">Insert</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_ENVELOP_INSERT">Inserts the envelope before the current page in the document.</ahelp> The envelope is formatted with the <emph>Envelope</emph> page style.</paragraph>
+      <embed href="text/shared/00/00000001.xhp#zurueck"/>
+      <paragraph xml-lang="en-US" id="hd_id8208563" role="heading" level="2" l10n="NEW">To delete an envelope from a document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id396130" role="paragraph" l10n="NEW">Click into the envelope page to make it the current page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7174596" role="paragraph" l10n="CHG">Right-click the field on the status line that shows "Envelope".</paragraph>
+            <paragraph xml-lang="en-US" id="par_id7657704" role="paragraph" l10n="NEW">A submenu opens showing some page styles.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5187536" role="paragraph" l10n="NEW">Choose the "Default" page style from the submenu.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6952726" role="paragraph" l10n="NEW">This removes the special "Envelope" page formatting.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1777092" role="paragraph" l10n="NEW">Delete the frames for sender and recipient. Click the border of each frame and press the Del key.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/04070100.xhp b/helpcontent2/source/text/swriter/01/04070100.xhp
index 63913aca4a..07b580f1cd 100755
--- a/helpcontent2/source/text/swriter/01/04070100.xhp
+++ b/helpcontent2/source/text/swriter/01/04070100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,15 +47,15 @@
   <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#umschlagb"/>
 </section>
-  <bookmark branch="hid/SW:MULTILINEEDIT:TP_ENV_ENV:EDT_ADDR" xml-lang="en-US" id="bm_id3151178"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
+  <bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR" xml-lang="en-US" id="bm_id3151178"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref="4"><ahelp hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_ADDR" visibility="visible">Enter the delivery address.</ahelp> You can also click in this box, and select a database, a table, and field, and then click the arrow button to insert the field in the address. If you want, you can apply  formatting, such as bold and underline, to the address text.</paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_ENV_ENV:BOX_SEND" xml-lang="en-US" id="bm_id3149802"/><bookmark branch="hid/SW:MULTILINEEDIT:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_ENV_ENV:BOX_SEND" xml-lang="en-US" id="bm_id3149802"/><bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3153527" oldref="6"><ahelp visibility="visible" hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_SEND">Includes a return address on the envelope. Select the <emph>Sender </emph>check box, and then enter the return  address.</ahelp> $[officename] automatically inserts your user data in the <emph>Sender </emph>box, but you can also enter the data that you want.</paragraph>
-  <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_DATABASE" xml-lang="en-US" id="bm_id3154474"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DATABASE" xml-lang="en-US" id="bm_id3154474"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154480" xml-lang="en-US" oldref="10"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_DATABASE" visibility="visible">Select the database containing the address data that you want to insert.</ahelp></paragraph>
-  <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_TABLE" xml-lang="en-US" id="bm_id3155892"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_TABLE" xml-lang="en-US" id="bm_id3155892"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155898" xml-lang="en-US" oldref="12"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_TABLE" visibility="visible">Select the database table containing the address data that you want to insert.</ahelp></paragraph>
-  <bookmark branch="hid/SW:LISTBOX:TP_ENV_ENV:LB_DBFIELD" xml-lang="en-US" id="bm_id3154197"/><bookmark branch="hid/SW:IMAGEBUTTON:TP_ENV_ENV:BTN_INSERT" xml-lang="en-US" id="bm_id3154201"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DBFIELD" xml-lang="en-US" id="bm_id3154197"/><bookmark branch="hid/sw:ImageButton:TP_ENV_ENV:BTN_INSERT" xml-lang="en-US" id="bm_id3154201"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155180" xml-lang="en-US" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_ENV_ENV:BTN_INSERT" visibility="visible">Select the database field containing the address data that you want to insert, and then click the left arrow button. The data is added to the address box containing the cursor.</ahelp></paragraph>
   <embed href="text/shared/00/00000001.xhp#vorschau"/>
  </body>
diff --git a/helpcontent2/source/text/swriter/01/04070200.xhp b/helpcontent2/source/text/swriter/01/04070200.xhp
index 2438c999f4..11e549e84b 100755
--- a/helpcontent2/source/text/swriter/01/04070200.xhp
+++ b/helpcontent2/source/text/swriter/01/04070200.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,11 +51,11 @@
 <paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="43">Sets the position and the text formatting options of the addressee field.</paragraph>
 <paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
 <paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="U" oldref="4">Sets the position of the recipient's address on the envelope.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_LEFT" id="bm_id3154482" localize="false"/><paragraph role="heading" id="hd_id3154471" xml-lang="en-US" level="3" l10n="U" oldref="15">from left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT" id="bm_id3154482" localize="false"/><paragraph role="heading" id="hd_id3154471" xml-lang="en-US" level="3" l10n="U" oldref="15">from left</paragraph>
 <paragraph role="paragraph" id="par_id3152957" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_LEFT">Enter the amount of space that you want to leave between the left edge of the envelope and the addressee field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_TOP" id="bm_id3153675" localize="false"/><paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="17">from top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP" id="bm_id3153675" localize="false"/><paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="17">from top</paragraph>
 <paragraph role="paragraph" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_ADDR_TOP">Enter the amount of space that you want to leave between the top edge of the envelope and the addressee field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:TP_ENV_FMT:BTN_ADDR_EDIT" id="bm_id3154195" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT" id="bm_id3154195" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3154201" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:MENUBUTTON:TP_ENV_FMT:BTN_ADDR_EDIT">Click and choose the text formatting style for the addressee field that you want to edit.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="4" l10n="U" oldref="7">Character</paragraph>
 <paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="8">Opens a dialog where you can edit the character formatting that is used in the addressee field.</paragraph>
@@ -68,11 +65,11 @@
 <paragraph role="paragraph" id="par_id3149107" xml-lang="en-US" l10n="U" oldref="45">Sets the position and the text formatting options of the sender field.</paragraph>
 <paragraph role="heading" id="hd_id3148980" xml-lang="en-US" level="2" l10n="U" oldref="46">Position</paragraph>
 <paragraph role="paragraph" id="par_id3149041" xml-lang="en-US" l10n="U" oldref="47">Sets the position of the sender's address on the envelope.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_LEFT" id="bm_id3152769" localize="false"/><paragraph role="heading" id="hd_id3153636" xml-lang="en-US" level="3" l10n="U" oldref="29">from left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT" id="bm_id3152769" localize="false"/><paragraph role="heading" id="hd_id3153636" xml-lang="en-US" level="3" l10n="U" oldref="29">from left</paragraph>
 <paragraph role="paragraph" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_LEFT">Enter the amount of space that you want to leave between the left edge of the envelope and the sender field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_TOP" id="bm_id3155142" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="31">from top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP" id="bm_id3155142" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="31">from top</paragraph>
 <paragraph role="paragraph" id="par_id3155149" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:METRICFIELD:TP_ENV_FMT:FLD_SEND_TOP">Enter the amount of space that you want to leave between the top edge of the envelope and the sender field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MENUBUTTON:TP_ENV_FMT:BTN_SEND_EDIT" id="bm_id3156274" localize="false"/><paragraph role="heading" id="hd_id3149179" xml-lang="en-US" level="2" l10n="CHG" oldref="19">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT" id="bm_id3156274" localize="false"/><paragraph role="heading" id="hd_id3149179" xml-lang="en-US" level="2" l10n="CHG" oldref="19">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:MENUBUTTON:TP_ENV_FMT:BTN_SEND_EDIT">Click and choose the text formatting style for the sender field that you want to edit.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="4" l10n="U" oldref="21">Character</paragraph>
 <paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="22">Opens a dialog where you can edit the character formatting that is used in the sender field.</paragraph>
@@ -80,11 +77,11 @@
 <paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="U" oldref="26">Opens a dialog where you can edit the paragraph formatting that is used in the sender field.</paragraph>
 <paragraph role="heading" id="hd_id3150687" xml-lang="en-US" level="2" l10n="U" oldref="34">Size</paragraph>
 <paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="35">Select the envelope size format that you want to use, or create a custom size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_ENV_FMT_BOX_SIZE_FORMAT" id="bm_id3147416" localize="false"/><paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="3" l10n="U" oldref="36">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT" id="bm_id3147416" localize="false"/><paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="3" l10n="U" oldref="36">Format</paragraph>
 <paragraph role="paragraph" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW_LISTBOX_TP_ENV_FMT_BOX_SIZE_FORMAT">Select the envelope size that want, or select "User Defined", and then enter the width and the height of the custom size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_WIDTH" id="bm_id3145268" localize="false"/><paragraph role="heading" id="hd_id3145256" xml-lang="en-US" level="3" l10n="U" oldref="38">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH" id="bm_id3145268" localize="false"/><paragraph role="heading" id="hd_id3145256" xml-lang="en-US" level="3" l10n="U" oldref="38">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149551" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_WIDTH">Enter the width of the envelope.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_HEIGHT" id="bm_id3150554" localize="false"/><paragraph role="heading" id="hd_id3149567" xml-lang="en-US" level="3" l10n="U" oldref="40">Height</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT" id="bm_id3150554" localize="false"/><paragraph role="heading" id="hd_id3149567" xml-lang="en-US" level="3" l10n="U" oldref="40">Height</paragraph>
 <paragraph role="paragraph" id="par_id3150561" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW_METRICFIELD_TP_ENV_FMT_FLD_SIZE_HEIGHT">Enter the height of the envelope.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04070300.xhp b/helpcontent2/source/text/swriter/01/04070300.xhp
index 66e49eac4a..f01bd4f7db 100755
--- a/helpcontent2/source/text/swriter/01/04070300.xhp
+++ b/helpcontent2/source/text/swriter/01/04070300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04070300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,21 +67,21 @@
 <bookmark xml-lang="en-US" branch="hid/ITM_VER_RGHT" id="bm_id3153644" localize="false"/>
 <paragraph role="heading" id="hd_id3153633" xml-lang="en-US" level="2" l10n="U" oldref="15">Vertical right</paragraph>
 <paragraph role="paragraph" id="par_id3149037" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="ITM_VER_RGHT">Feeds the envelope vertically from the right edge of the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_ENV_PRT:BTN_TOP" id="bm_id3145757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_ENV_PRT:BTN_TOP" id="bm_id3145757" localize="false"/>
 <paragraph role="heading" id="hd_id3152773" xml-lang="en-US" level="2" l10n="U" oldref="17">Print from top</paragraph>
 <paragraph role="paragraph" id="par_id3145763" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_ENV_PRT:BTN_TOP">Feeds the envelope with the print side face up in the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_ENV_PRT:BTN_BOTTOM" id="bm_id3149171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM" id="bm_id3149171" localize="false"/>
 <paragraph role="heading" id="hd_id3155146" xml-lang="en-US" level="2" l10n="U" oldref="19">Print from bottom</paragraph>
 <paragraph role="paragraph" id="par_id3149178" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_ENV_PRT:BTN_BOTTOM">Feeds the envelope with the print side face down in the printer tray.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_PRT:FLD_RIGHT" id="bm_id3145778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_PRT:FLD_RIGHT" id="bm_id3145778" localize="false"/>
 <paragraph role="heading" id="hd_id3156279" xml-lang="en-US" level="2" l10n="U" oldref="21">Shift right</paragraph>
 <paragraph role="paragraph" id="par_id3145784" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_ENV_PRT:FLD_RIGHT">Enter the amount to shift the print area to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_ENV_PRT:FLD_DOWN" id="bm_id3151378" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_ENV_PRT:FLD_DOWN" id="bm_id3151378" localize="false"/>
 <paragraph role="heading" id="hd_id3155921" xml-lang="en-US" level="2" l10n="U" oldref="23">Shift down</paragraph>
 <paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:METRICFIELD:TP_ENV_PRT:FLD_DOWN">Enter the amount to shift the print area down.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150123" xml-lang="en-US" level="2" l10n="U" oldref="25">Current printer</paragraph>
 <paragraph role="paragraph" id="par_id3150696" xml-lang="en-US" l10n="U" oldref="26">Displays the name of the current printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_ENV_PRT:BTN_PRTSETUP" id="bm_id3147411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP" id="bm_id3147411" localize="false"/>
 <paragraph role="heading" id="hd_id3155862" xml-lang="en-US" level="2" l10n="U" oldref="27">Setup</paragraph>
 <paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:PUSHBUTTON:TP_ENV_PRT:BTN_PRTSETUP">Opens the Print Setup dialog where you can define additional printer settings, such as paper format and orientation.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04090000.xhp b/helpcontent2/source/text/swriter/01/04090000.xhp
index b2c0bdc09e..3036e6c0f1 100644
--- a/helpcontent2/source/text/swriter/01/04090000.xhp
+++ b/helpcontent2/source/text/swriter/01/04090000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index 867458bf87..43820c0cf2 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090001.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,213 +32,218 @@
  
 	
 <meta>
-<topic id="textswriter0104090001xml" indexer="include">
-<title id="tit" xml-lang="en-US">Document</title>
-<filename>/text/swriter/01/04090001.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="dokument">
+      <topic id="textswriter0104090001xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Document</title>
+         <filename>/text/swriter/01/04090001.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="dokument">
 <bookmark xml-lang="en-US" branch="hid/HID_FLD_DOK" id="bm_id3145246" localize="false"/>
-<paragraph role="heading" id="hd_id3150017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2">Fields are used to insert information about the current document, for example, file name, template, statistics, user data, date, and time.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000404.xhp#felddokument"/>
-</section>
-<paragraph role="note" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="3">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
-<section id="feldtyp">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
-<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
-<paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp> The following fields are available:</paragraph>
-</section>
-<table id="tbl_id3149686">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="6">Type</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="7">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="10">Author</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148975" xml-lang="en-US" l10n="U" oldref="11">Inserts the name of the user who first saved the document. </paragraph>
-<paragraph role="tablecontent" id="par_id3147093" xml-lang="en-US" l10n="CHG" oldref="66">To view the name of the author, choose <emph>File - Properties</emph>, click the <emph>General</emph> tab, and then look at the <emph>Created </emph>line. The name of the author is appended to the <emph>Created</emph> line only if the <emph>Apply user data</emph> check box is selected.<comment>we must define the difference of (first) Author and (current) User somewhere, so it is here next to the Author index entry</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145759" xml-lang="en-US" l10n="U" oldref="18">Chapter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149172" xml-lang="en-US" l10n="U" oldref="19">Inserts the chapter number and/or the chapter name.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145771" xml-lang="en-US" l10n="U" oldref="14">Date</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151370" xml-lang="en-US" l10n="CHG" oldref="15">Inserts the current date. You can insert the date as a fixed field - <item type="literal">Date (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Date</item> - that it is updated automatically. To manually update the <item type="literal">Date</item> field, press F9.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150699" xml-lang="en-US" l10n="U" oldref="12">File name</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="13">Inserts the filename and/or the directory path of the current document, as well as the filename without extension.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="20">Page</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145264" xml-lang="en-US" l10n="U" oldref="21">Inserts the page number of the current, previous, or next page.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150561" xml-lang="en-US" l10n="U" oldref="8">Sender</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146341" xml-lang="en-US" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148863" xml-lang="en-US" l10n="U" oldref="22">Statistics</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151091" xml-lang="en-US" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153302" xml-lang="en-US" l10n="U" oldref="16">Templates</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156123" xml-lang="en-US" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose <emph>File - Templates -</emph><link href="text/shared/01/01110100.xhp" name="Organize"><emph>Organize</emph></link>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146939" xml-lang="en-US" l10n="U" oldref="24">Time</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154340" xml-lang="en-US" l10n="CHG" oldref="25">Inserts the current time. You can insert the time as a fixed field - <item type="literal">Time (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Time</item> - that it is updated automatically. To manually update the <item type="literal">Time</item> field, press F9.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3150017" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="2">Fields are used to insert information about the current document, for example, file name, template, statistics, user data, date, and time.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000404.xhp#felddokument"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3154470" role="note" l10n="U" oldref="3">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
+      <section id="feldtyp">
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151312" role="heading" level="2" l10n="U" oldref="4">Type</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153672" role="paragraph" l10n="U" oldref="5"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp> The following fields are available:</paragraph>
+      </section>
+      <table id="tbl_id3149686">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155182" role="tablehead" l10n="U" oldref="6">Type</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3143272" role="tablehead" l10n="U" oldref="7">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151248" role="tablecontent" l10n="U" oldref="10">Author</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148975" role="tablecontent" l10n="CHG" oldref="11">Inserts the name of the current user. </paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145759" role="tablecontent" l10n="U" oldref="18">Chapter</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149172" role="tablecontent" l10n="U" oldref="19">Inserts the chapter number and/or the chapter name.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145771" role="tablecontent" l10n="U" oldref="14">Date</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151370" role="tablecontent" l10n="CHG" oldref="15">Inserts the current date. You can insert the date as a fixed field - <item type="literal">Date (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Date</item> - that it is updated automatically. To manually update the <item type="literal">Date</item> field, press F9.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150699" role="tablecontent" l10n="U" oldref="12">File name</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150122" role="tablecontent" l10n="U" oldref="13">Inserts the filename and/or the directory path of the current document, as well as the filename without extension.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147495" role="tablecontent" l10n="U" oldref="20">Page</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145264" role="tablecontent" l10n="U" oldref="21">Inserts the page number of the current, previous, or next page.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150561" role="tablecontent" l10n="U" oldref="8">Sender</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data">$[officename] - User Data</link></emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148863" role="tablecontent" l10n="U" oldref="22">Statistics</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the <emph>Statistics</emph> tab.
+               </paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153302" role="tablecontent" l10n="U" oldref="16">Templates</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156123" role="tablecontent" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose <emph>File - Templates -</emph><link href="text/shared/01/01110100.xhp" name="Organize"><emph>Organize</emph></link>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146939" role="tablecontent" l10n="U" oldref="24">Time</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154340" role="tablecontent" l10n="CHG" oldref="25">Inserts the current time. You can insert the time as a fixed field - <item type="literal">Time (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Time</item> - that it is updated automatically. To manually update the <item type="literal">Time</item> field, press F9.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="hinweis">
-<paragraph role="note" id="par_id3154631" xml-lang="en-US" l10n="U" oldref="26">The following fields can only be inserted if the corresponding field type is selected in the <emph>Type </emph>list.</paragraph>
-</section>
-<section id="auswahl">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
-<paragraph role="heading" id="hd_id3150660" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="53">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command 
+      <section id="hinweis">
+         <paragraph xml-lang="en-US" id="par_id3154631" role="note" l10n="U" oldref="26">The following fields can only be inserted if the corresponding field type is selected in the <emph>Type </emph>list.</paragraph>
+      </section>
+      <section id="auswahl">
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150660" role="heading" level="2" l10n="CHG"
+                    oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150678" role="paragraph" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155537" role="tip" l10n="U" oldref="53">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
-<table id="tbl_id3148722">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155359" xml-lang="en-US" l10n="U" oldref="30">Fields</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154220" xml-lang="en-US" l10n="U" oldref="31">Function</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145107" xml-lang="en-US" l10n="U" oldref="32">Previous page</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149595" xml-lang="en-US" l10n="U" oldref="33">Inserts the page number of the previous page in the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146896" xml-lang="en-US" l10n="U" oldref="34">Next page </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="35">Inserts the page number of the next page in the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="36">Page Number </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3159212" xml-lang="en-US" l10n="U" oldref="37">Inserts the current page number.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+         <table id="tbl_id3148722">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3155359" role="tablehead" l10n="U" oldref="30">Fields</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154220" role="tablehead" l10n="U" oldref="31">Function</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3145107" role="tablecontent" l10n="U" oldref="32">Previous page</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149595" role="tablecontent" l10n="U" oldref="33">Inserts the page number of the previous page in the document.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3146896" role="tablecontent" l10n="U" oldref="34">Next page </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148923" role="tablecontent" l10n="U" oldref="35">Inserts the page number of the next page in the document.</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3156032" role="tablecontent" l10n="U" oldref="36">Page Number </paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3159212" role="tablecontent" l10n="U" oldref="37">Inserts the current page number.</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="38">In the <emph>Format</emph>, click the numbering format that you want to use.</paragraph>
-<paragraph role="paragraph" id="par_id3145188" xml-lang="en-US" l10n="U" oldref="39">If you want, you can enter an <emph>Offset </emph>for the displayed page number. With an <emph>Offset</emph> value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty.</paragraph>
-</section>
-<section id="korrektur">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
-<paragraph role="heading" id="hd_id3150891" xml-lang="en-US" level="2" l10n="U" oldref="45">Offset</paragraph>
-<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FLD_DOK:ED_DOKVALUE">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
-</section>
-<paragraph role="tip" id="par_id3154948" xml-lang="en-US" l10n="U" oldref="54">If you want to change the actual page number and not the displayed number, do not use the <emph>Offset</emph> value. To change page numbers, read the <link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers"><emph>Page Numbers</emph></link> guide.</paragraph>
-<section id="format">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
-<paragraph role="heading" id="hd_id3145595" xml-lang="en-US" level="2" l10n="U" oldref="41">Format</paragraph>
-<paragraph role="paragraph" id="par_id3145613" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150138" xml-lang="en-US" l10n="U" oldref="49"><variable id="datumuhrzeitformat">When you click "Additional formats", the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog opens, where you can define a custom format. 
+         <paragraph xml-lang="en-US" id="par_id3159229" role="paragraph" l10n="U" oldref="38">In the <emph>Format</emph>, click the numbering format that you want to use.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145188" role="paragraph" l10n="U" oldref="39">If you want, you can enter an <emph>Offset </emph>for the displayed page number. With an <emph>Offset</emph> value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty.</paragraph>
+      </section>
+      <section id="korrektur">
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150891" role="heading" level="2" l10n="U"
+                    oldref="45">Offset</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FLD_DOK:ED_DOKVALUE">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3154948" role="tip" l10n="U" oldref="54">If you want to change the actual page number and not the displayed number, do not use the <emph>Offset</emph> value. To change page numbers, read the <link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers"><emph>Page Numbers</emph></link> guide.</paragraph>
+      <section id="format">
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145595" role="heading" level="2" l10n="U"
+                    oldref="41">Format</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3150138" role="paragraph" l10n="U" oldref="49"><variable id="datumuhrzeitformat">When you click "Additional formats", the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog opens, where you can define a custom format. 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154867" xml-lang="en-US" l10n="U" oldref="50">If you choose "Chapter number without separator" for a chapter field, the separators that are specified for chapter number in <link href="text/swriter/01/06060000.xhp" name="Tools - Chapter numbering"><emph>Tools - Chapter numbering</emph></link> are not displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3156079" xml-lang="en-US" l10n="U" oldref="63">If you choose "chapter number" as the <emph>format</emph> for reference fields, only the number of the chapter heading containing the referenced object is displayed in the field. If the paragraph style for the chapter heading is not numbered, the field is left blank.</paragraph>
-<paragraph role="paragraph" id="par_id3148682" xml-lang="en-US" l10n="U" oldref="56">The following number range formats are for paragraphs formatted with numbered or bulleted lists:</paragraph>
-<table id="tbl_id3149976">
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150006" xml-lang="en-US" l10n="U" oldref="57">Category and number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155386" xml-lang="en-US" l10n="U" oldref="58">The format contains everything between the beginning of the paragraph and directly after the number-range field</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="59">Caption text</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155929" xml-lang="en-US" l10n="U" oldref="60">The format contains the text following the number-range field up to the end of the paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148733" xml-lang="en-US" l10n="U" oldref="61">Number</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="62">The format only contains the reference number</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3154867" role="paragraph" l10n="U" oldref="50">If you choose "Chapter number without separator" for a chapter field, the separators that are specified for chapter number in <link href="text/swriter/01/06060000.xhp" name="Tools - Outline numbering"><emph>Tools - Outline numbering</emph></link> are not displayed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156079" role="paragraph" l10n="U" oldref="63">If you choose "chapter number" as the <emph>format</emph> for reference fields, only the number of the chapter heading containing the referenced object is displayed in the field. If the paragraph style for the chapter heading is not numbered, the field is left blank.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148682" role="paragraph" l10n="U" oldref="56">The following number range formats are for paragraphs formatted with numbered or bulleted lists:</paragraph>
+      <table id="tbl_id3149976">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150006" role="tablecontent" l10n="U" oldref="57">Category and number</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155386" role="tablecontent" l10n="U" oldref="58">The format contains everything between the beginning of the paragraph and directly after the number-range field</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146919" role="tablecontent" l10n="U" oldref="59">Caption text</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155929" role="tablecontent" l10n="U" oldref="60">The format contains the text following the number-range field up to the end of the paragraph</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148733" role="tablecontent" l10n="U" oldref="61">Number</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148755" role="tablecontent" l10n="U" oldref="62">The format only contains the reference number</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
-<paragraph role="paragraph" id="par_id0902200804313432" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
-<embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
-<paragraph role="heading" id="hd_id3153026" xml-lang="en-US" level="2" l10n="U" oldref="43">Layer</paragraph>
-<paragraph role="paragraph" id="par_id3154580" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL">Select the chapter heading level that you want to include in the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
-<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="51">Offset in days/minutes</paragraph>
-<paragraph role="paragraph" id="par_id3154899" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the offset that you want to apply to a date or time field.</ahelp></paragraph>
-<section id="wert">
-<paragraph role="heading" id="hd_id3154922" xml-lang="en-US" level="2" l10n="U" oldref="47">Value</paragraph>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0902200804313432" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
+      <embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153026" role="heading" level="2" l10n="U"
+                 oldref="43">Layer</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154580" role="paragraph" l10n="U" oldref="44"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL">Select the chapter heading level that you want to include in the selected field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154598" role="heading" level="2" l10n="U"
+                 oldref="51">Offset in days/minutes</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154899" role="paragraph" l10n="U" oldref="52"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the offset that you want to apply to a date or time field.</ahelp></paragraph>
+      <section id="wert">
+         <paragraph xml-lang="en-US" id="hd_id3154922" role="heading" level="2" l10n="U"
+                    oldref="47">Value</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153049" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/04090002.xhp b/helpcontent2/source/text/swriter/01/04090002.xhp
index 3f7672a83d..1bee300a97 100644
--- a/helpcontent2/source/text/swriter/01/04090002.xhp
+++ b/helpcontent2/source/text/swriter/01/04090002.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090002.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 <embed href="text/swriter/00/00000404.xhp#feldreferenzen"/>
 </section>
 <embed href="text/swriter/guide/references.xhp#references"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
 <paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
 <paragraph role="paragraph" id="par_id4516129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the available field types. To add a field to your document, click a field type, click a field in the Selection list, and then click Insert.</ahelp> The following fields are available:</paragraph>
 <table id="tbl_id3145784">
@@ -129,7 +126,7 @@
 </table>
 
 <paragraph role="tip" id="par_id3154772" xml-lang="en-US" l10n="U" oldref="18">References are fields. To remove a reference, delete the field. If you set a longer text as a reference and you do not want to reenter it after deleting the reference, select the text and copy it to the clipboard. You can then reinsert it as "unformatted text" at the same position using the command <emph>Edit - Paste special</emph>. The text remains intact while the reference is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/>
 <paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
 <paragraph role="paragraph" id="par_id7374187" xml-lang="en-US" l10n="CHG"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, select a format in the "Insert reference to" list, and then click <emph>Insert</emph>.</ahelp></paragraph>
@@ -137,7 +134,7 @@
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
 <section id="format">
 <paragraph role="paragraph" id="par_id2171086" xml-lang="en-US" l10n="CHG">In the <emph>Insert reference to</emph> list, click the format that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
 <paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
 <paragraph role="paragraph" id="par_id3148786" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT">Select the format that you want to use for the selected reference field.</ahelp> The following formats are available:</paragraph>
 <table id="tbl_id3150090">
@@ -243,12 +240,12 @@
 <paragraph role="note" id="par_id5189062" xml-lang="en-US" l10n="CHG">For example, when you are in a chapter 1, subchapter 2, subpart 5, this may be numbered as 1.2.5. When you insert here a reference to text in the previous subpart "1.2.4" and you apply the "Number" format, then the reference will be shown as "4". If in this example the numbering is set to show more sublevels, the same reference will be shown as "2.4" or "1.2.4", depending on the setting. If you use the "Number (full context)" format, you will always see "1.2.4", no matter how the numbered paragraph is formatted.</paragraph>
 </section>
 <section id="name">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
 <paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
 <paragraph role="paragraph" id="par_id3156259" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_FLD_REF:ED_REFNAME">Type the name of the user-defined field that you want to create.</ahelp> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="17">In a master document, targets that are in different sub-documents are not displayed in the<emph> Selection</emph> list. If you want to insert a reference to the target, you must type the path and the name in the <emph>Name </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802250745" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#wert"/>
 <paragraph role="paragraph" id="par_id3159216" xml-lang="en-US" l10n="U" oldref="15">If you select text in the document, and then insert a reference, the selected text becomes the contents of the field that you insert.</paragraph><comment>Value box (always disabled)</comment>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 5a0fbc53ff..6eb9494153 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090003.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,15 +41,15 @@
 <section id="funktionen">
 <bookmark xml-lang="en-US" branch="hid/HID_FLD_FUNC" id="bm_id3156382" localize="false"/>
 <paragraph role="heading" id="hd_id3149123" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090003.xhp" name="Functions">Functions</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCNAME" id="bm_id3149875" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCVALUE" id="bm_id3150251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCNAME" id="bm_id3149875" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE" id="bm_id3150251" localize="false"/>
 <paragraph role="paragraph" id="par_id3150343" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_FUNCVALUE" visibility="hidden">Sets additional function parameters for fields. The type of parameter depends on the field type that you select.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="2">Depending on the field type that you select, you can assign conditions to certain functions. For example, you can define a field that executes a macro when you click the field in the document, or a condition that, when met, hides a field. You can also define placeholder fields that insert graphics, tables, frames and other objects into your document when needed.</paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
 <paragraph role="paragraph" id="par_id0902200804352037" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#feldtyp"/>
 <table id="tbl_id3147403">
@@ -109,7 +106,7 @@
 <paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -117,7 +114,7 @@
 <paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -130,7 +127,7 @@
 </tablerow>
 </table>
 <embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
 <paragraph role="paragraph" id="par_id0902200804352213" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#format"/>
 <paragraph role="paragraph" id="par_id3151329" xml-lang="en-US" l10n="U" oldref="17">For function fields, the format field is only used for fields of the type placeholder. Here, the format determines the object for which the placeholder stands.</paragraph>
@@ -138,8 +135,8 @@
 <paragraph role="heading" id="hd_id3149494" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition</paragraph>
 <paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBCONDITION">For fields linked to a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link>, enter the criteria here.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND1" id="bm_id3151259" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND2" id="bm_id3151262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1" id="bm_id3151259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2" id="bm_id3151262" localize="false"/>
 <paragraph role="heading" id="hd_id3151248" xml-lang="en-US" level="2" l10n="U" oldref="20">Then, Else</paragraph>
 <paragraph role="paragraph" id="par_id3154830" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_FUNCCOND2">Enter the text to display when the condition is met in the <emph>Then </emph>box, and the text to display when the condition is not met in the <emph>Else </emph>box.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3146865" xml-lang="en-US" l10n="U" oldref="22">You can also insert database fields in the <emph>Then </emph>and <emph>Else </emph>boxes using the format "databasename.tablename.fieldname".</paragraph>
@@ -162,40 +159,40 @@
 <paragraph role="heading" id="hd_id3156369" xml-lang="en-US" level="2" l10n="U" oldref="41">Value</paragraph>
 <paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="44">Enter a value for the selected field.</paragraph>
 <section id="makro">
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_BT_FUNCMACRO" id="bm_id3148889" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO" id="bm_id3148889" localize="false"/>
 <paragraph role="heading" id="hd_id3148877" xml-lang="en-US" level="2" l10n="U" oldref="36">Macro</paragraph>
 <paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_BT_FUNCMACRO">Opens the <emph>Macro Selector</emph>, where you can choose the macro that will run when you click the selected field in the document.</ahelp> This button is only available for the "Execute macro" function field.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3150111" xml-lang="en-US" l10n="U" oldref="49">The following controls are displayed for <emph>Input list</emph> fields:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_LISTITEM" id="bm_id3155871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_LISTITEM" id="bm_id3155871" localize="false"/>
 <paragraph role="heading" id="hd_id3155860" xml-lang="en-US" level="2" l10n="U" oldref="50">Item</paragraph>
 <paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_LISTITEM">Enter a new item.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTADD" id="bm_id3147425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTADD" id="bm_id3147425" localize="false"/>
 <paragraph role="heading" id="hd_id3147413" xml-lang="en-US" level="2" l10n="U" oldref="52">Add</paragraph>
 <paragraph role="paragraph" id="par_id3147473" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTADD">Adds the <emph>Item</emph> to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_LISTITEMS" id="bm_id3147612" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS" id="bm_id3147612" localize="false"/>
 <paragraph role="heading" id="hd_id3147496" xml-lang="en-US" level="2" l10n="U" oldref="54">Items on list</paragraph>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SW_LISTBOX_TP_FLD_FUNC_LB_LISTITEMS">Lists the items. The topmost item is shown in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTREMOVE" id="bm_id3149552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE" id="bm_id3149552" localize="false"/>
 <paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="2" l10n="U" oldref="56">Remove</paragraph>
 <paragraph role="paragraph" id="par_id3149558" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTREMOVE">Removes the selected item from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTUP" id="bm_id3155964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTUP" id="bm_id3155964" localize="false"/>
 <paragraph role="heading" id="hd_id3145126" xml-lang="en-US" level="2" l10n="U" oldref="58">Move Up</paragraph>
 <paragraph role="paragraph" id="par_id3155970" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTUP">Moves the selected item up in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTDOWN" id="bm_id3150562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN" id="bm_id3150562" localize="false"/>
 <paragraph role="heading" id="hd_id3150549" xml-lang="en-US" level="2" l10n="U" oldref="60">Move Down</paragraph>
 <paragraph role="paragraph" id="par_id3156221" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_PUSHBUTTON_TP_FLD_FUNC_PB_LISTDOWN">Moves the selected item down in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_FUNC_ED_LISTNAME" id="bm_id3149226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_FUNC:ED_LISTNAME" id="bm_id3149226" localize="false"/>
 <paragraph role="heading" id="hd_id3149215" xml-lang="en-US" level="2" l10n="U" oldref="62">Name</paragraph>
 <paragraph role="paragraph" id="par_id3147733" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SW_EDIT_TP_FLD_FUNC_ED_LISTNAME">Enter a unique name for the <emph>Input list</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_FLD_DROPDOWN_LB_LISTITEMS" id="bm_id3146344" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS" id="bm_id3146344" localize="false"/>
 <paragraph role="heading" id="hd_id3146332" xml-lang="en-US" level="2" l10n="U" oldref="64">Choose Item</paragraph>
 <paragraph role="paragraph" id="par_id3147455" xml-lang="en-US" l10n="U" oldref="65">This dialog is shown when you click an <emph>Input list</emph> field in the document. </paragraph>
 <paragraph role="paragraph" id="par_id3149837" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SW_LISTBOX_DLG_FLD_DROPDOWN_LB_LISTITEMS">Choose the item that you want to display in the document, then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_EDIT" id="bm_id3148848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT" id="bm_id3148848" localize="false"/>
 <paragraph role="heading" id="hd_id3147602" xml-lang="en-US" level="2" l10n="U" oldref="67">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3148855" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_EDIT">Displays the <emph>Edit Fields: Functions</emph> dialog, where you can edit the <emph>Input list</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_NEXT" id="bm_id3155570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT" id="bm_id3155570" localize="false"/>
 <paragraph role="heading" id="hd_id3155558" xml-lang="en-US" level="2" l10n="U" oldref="69">Next</paragraph>
 <paragraph role="paragraph" id="par_id3148434" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SW_PUSHBUTTON_DLG_FLD_DROPDOWN_PB_NEXT">Closes the current <emph>Input list</emph> and displays the next, if available.</ahelp> You see this button when you open the <emph>Choose Item</emph> dialog by Ctrl+Shift+F9.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp
index ef527495f2..1528b49f6f 100644
--- a/helpcontent2/source/text/swriter/01/04090004.xhp
+++ b/helpcontent2/source/text/swriter/01/04090004.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04090004.xhp,v $
- * $Revision: 1.7.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textswriter0104090004xml" indexer="include">
 <title id="tit" xml-lang="en-US">DocInformation</title>
@@ -80,10 +77,10 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Description</paragraph>
+<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Comments</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comment as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
+<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comments as entered in the <emph>Description</emph> tab page of the <emph>Properties</emph> dialog.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -144,16 +141,16 @@
 </tablerow>
 </table>
 <embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
 <paragraph role="paragraph" id="par_id0902200804290272" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#auswahl"/>
 <paragraph role="note" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="26">For the "Created", "Modified", and "Last printed" field types, you can include the author, date, and time of the corresponding operation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
 <paragraph role="paragraph" id="par_id0902200804290382" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#format"/>
 <embed href="text/swriter/01/04090001.xhp#datumuhrzeitformat"/>
 <section id="inhaltfix">
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
 <paragraph role="heading" id="hd_id3149608" xml-lang="en-US" level="2" l10n="U" oldref="28">Fixed content</paragraph>
 <paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/swriter/01/04090005.xhp b/helpcontent2/source/text/swriter/01/04090005.xhp
index b3fe90aa31..1c92fb1902 100644
--- a/helpcontent2/source/text/swriter/01/04090005.xhp
+++ b/helpcontent2/source/text/swriter/01/04090005.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090005.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 <embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
 </section>
 <paragraph role="warning" id="par_id3149759" xml-lang="en-US" l10n="U" oldref="3">User-defined fields are only available in the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARTYPE" id="bm_id3154692" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243625" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#feldtyp"/>
 <table id="tbl_id3145416">
@@ -140,19 +137,19 @@
 </tablerow>
 </table>
 <embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#format"/>
 <paragraph role="paragraph" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="25">For user-defined fields, click the format that you want to apply in the <emph>Format </emph>list, or click "Additional formats" to define a custom format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARNAME" id="bm_id3150108" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Type the name of the user-defined field that you want to create.</ahelp></paragraph>
 <embed href="text/swriter/01/04090002.xhp#name"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARVALUE" id="bm_id3150119" localize="false"/>
 <paragraph role="paragraph" id="par_id0903200802243951" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#wert"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARFORMAT" id="bm_id3155871" localize="false"/>
 <paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARSELECTION" id="bm_id3150684" localize="false"/>
 <paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
 <paragraph role="paragraph" id="par_id7453535" xml-lang="en-US" l10n="NEW"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3326822" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command 
@@ -164,16 +161,16 @@
 <embed href="text/swriter/01/04090003.xhp#hinweis"/>
 <embed href="text/swriter/01/04090001.xhp#korrektur"/>
 <section id="unsichtbar">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
 <paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
 <paragraph role="paragraph" id="par_id3156233" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE">Hides the field contents in the document.</ahelp> The field is inserted as a thin gray mark in the document. This option is only available for the "Set Variable" and "User Field" field types.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3146326" xml-lang="en-US" level="2" l10n="U" oldref="39">Chapter numbering</paragraph>
 <paragraph role="paragraph" id="par_id3146340" xml-lang="en-US" l10n="U" oldref="40">Sets the options for resetting chapter numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
 <paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
 <paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL">Choose the heading or chapter level at which to restart numbering in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
 <paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
 <paragraph role="paragraph" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp></paragraph>
 <section id="uebernehmen">
@@ -190,7 +187,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="E">
-<image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/04090006.xhp b/helpcontent2/source/text/swriter/01/04090006.xhp
index 012cf7d292..7271ad7881 100644
--- a/helpcontent2/source/text/swriter/01/04090006.xhp
+++ b/helpcontent2/source/text/swriter/01/04090006.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090006.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
 <paragraph role="paragraph" id="par_id090220080439090" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
 <embed href="text/swriter/01/04090001.xhp#feldtyp"/>
 <table id="tbl_id3155894">
@@ -108,27 +105,27 @@
 <bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/>
 <paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
 <paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_DB_SELECTION_TLB">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
 <paragraph role="paragraph" id="par_id0902200804391084" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For fields linked to a condition, enter the criteria here.</ahelp></paragraph>
 <embed href="text/swriter/01/04090003.xhp#bedingung"/>
 <paragraph role="paragraph" id="par_id3147739" xml-lang="en-US" l10n="U" oldref="19">If you want, you can assign a condition that must be met before the contents of the "Any Record" and "Next Record" fields are inserted. The default condition is "True", that is, the condition is always true if you do not change the condition text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
 <paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
 <paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
 <paragraph role="note" id="par_id3153305" xml-lang="en-US" l10n="U" oldref="22">If you refer to fields in a different database (or in a different table or query within the same database), $[officename] determines the record number relative to the current selection.</paragraph>
 <paragraph role="heading" id="hd_id3156109" xml-lang="en-US" level="2" l10n="U" oldref="23">Format</paragraph>
 <paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid=".">Select the format of the field that you want to insert. This option is available for numerical, boolean, date and time fields.</ahelp><comment>see #i64135</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
 <paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
 <paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT">Uses the format defined in the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_DB:PB_ADDDB" id="bm_id5024262" localize="false"/>
 <paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="878711313">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
 <paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
 <paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
 <paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
 <paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT">Lists the available user-defined formats.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090007.xhp b/helpcontent2/source/text/swriter/01/04090007.xhp
index 4e7d13b9c8..68220aee01 100755
--- a/helpcontent2/source/text/swriter/01/04090007.xhp
+++ b/helpcontent2/source/text/swriter/01/04090007.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090007.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04090100.xhp b/helpcontent2/source/text/swriter/01/04090100.xhp
index d4be346836..6ca24371e3 100755
--- a/helpcontent2/source/text/swriter/01/04090100.xhp
+++ b/helpcontent2/source/text/swriter/01/04090100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,10 +44,10 @@
 <paragraph role="heading" id="hd_id3147515" xml-lang="en-US" level="1" l10n="U" oldref="1">Input Field</paragraph>
 <paragraph role="paragraph" id="par_id3146041" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FLD_INPUT">Inserts a text field that you can open and edit by clicking it in the document.</ahelp> You can use input fields for text, or to assign a new value to a variable.</paragraph>
 <paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="7">To change the content of an Input Field in a document, click the field, and then edit the text in the lower box of the dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MULTILINEEDIT:DLG_FLD_INPUT:ED_EDIT" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT" id="bm_id3154564" localize="false"/>
 <paragraph role="heading" id="hd_id3153669" xml-lang="en-US" level="2" l10n="U" oldref="3">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:MULTILINEEDIT:DLG_FLD_INPUT:ED_EDIT">The upper box displays the name that you entered in the <emph>Reference</emph> box of the Input Field on the <emph>Functions </emph>tab of the <emph>Fields</emph> dialog. The lower box displays the contents of the field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT" id="bm_id3149685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_FLD_INPUT:PB_NEXT" id="bm_id3149685" localize="false"/>
 <paragraph role="heading" id="hd_id3155897" xml-lang="en-US" level="2" l10n="U" oldref="5">Next</paragraph>
 <paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT">Jumps to the next input field in the document.</ahelp> This button is only available when you position the cursor directly before an input field, and then press Shift+Ctrl+F9.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 3cad566260..aba76bab43 100755..100644
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04090200.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,437 +27,441 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0104090200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Conditions</title>
-<filename>/text/swriter/01/04090200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-29T10:05:35">UFI: some code problems in database field conditions?
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriter0104090200xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Conditions</title>
+         <filename>/text/swriter/01/04090200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145828"><bookmark_value>logical expressions</bookmark_value>
-<bookmark_value>formulating conditions</bookmark_value>
-<bookmark_value>conditions; in fields and sections</bookmark_value>
-<bookmark_value>fields;defining conditions</bookmark_value>
-<bookmark_value>sections;defining conditions</bookmark_value>
-<bookmark_value>variables; in conditions</bookmark_value>
-<bookmark_value>user data;in conditions</bookmark_value>
-<bookmark_value>databases;in conditions</bookmark_value>
-<bookmark_value>hiding; database fields</bookmark_value>
+      <bookmark_value>formulating conditions</bookmark_value>
+      <bookmark_value>conditions; in fields and sections</bookmark_value>
+      <bookmark_value>fields;defining conditions</bookmark_value>
+      <bookmark_value>sections;defining conditions</bookmark_value>
+      <bookmark_value>variables; in conditions</bookmark_value>
+      <bookmark_value>user data;in conditions</bookmark_value>
+      <bookmark_value>databases;in conditions</bookmark_value>
+      <bookmark_value>hiding; database fields</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145828" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="defining_conditions"><link href="text/swriter/01/04090200.xhp">Defining Conditions</link>
+<paragraph xml-lang="en-US" id="hd_id3145828" role="heading" level="1" l10n="CHG"
+                 oldref="1"><variable id="defining_conditions"><link href="text/swriter/01/04090200.xhp">Defining Conditions</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145242" xml-lang="en-US" l10n="CHG" oldref="13">Conditions are logical expressions that you can use to control the display of <link href="text/swriter/01/04090000.xhp">fields</link> and <link href="text/swriter/01/04020000.xhp">sections</link> in your document. Although the following examples apply to fields, they also apply to sections.</paragraph>
-<paragraph role="paragraph" id="par_id3147171" xml-lang="en-US" l10n="U" oldref="93">You can define conditions for the following field types:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151185" xml-lang="en-US" l10n="U" oldref="14">Conditional text: displays text A if the condition is true, or text B if the condition is false.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149289" xml-lang="en-US" l10n="U" oldref="15">Hidden text: hides the contents of the field if the condition is true.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="16">Hidden paragraph: hides the paragraph if the condition is true.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="17">Any record and next record: controls the access to database records.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="18">The simplest way to define a condition is to type the logical expression directly in a <emph>Condition </emph>box using the following values:</paragraph>
-<table id="tbl_id3153537">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="19">TRUE</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152960" xml-lang="en-US" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155900" xml-lang="en-US" l10n="CHG" oldref="21">FALSE</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154191" xml-lang="en-US" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3145242" role="paragraph" l10n="CHG" oldref="13">Conditions are logical expressions that you can use to control the display of <link href="text/swriter/01/04090000.xhp">fields</link> and <link href="text/swriter/01/04020000.xhp">sections</link> in your document. Although the following examples apply to fields, they also apply to sections.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147171" role="paragraph" l10n="U" oldref="93">You can define conditions for the following field types:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151185" role="listitem" l10n="U" oldref="14">Conditional text: displays text A if the condition is true, or text B if the condition is false.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149289" role="listitem" l10n="U" oldref="15">Hidden text: hides the contents of the field if the condition is true.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145412" role="listitem" l10n="U" oldref="16">Hidden paragraph: hides the paragraph if the condition is true.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147515" role="listitem" l10n="U" oldref="17">Any record and next record: controls the access to database records.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149802" role="paragraph" l10n="U" oldref="18">The simplest way to define a condition is to type the logical expression directly in a <emph>Condition </emph>box using the following values:</paragraph>
+      <table id="tbl_id3153537">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153677" role="tablecontent" l10n="CHG" oldref="19">TRUE</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152960" role="tablecontent" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155900" role="tablecontent" l10n="CHG" oldref="21">FALSE</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154191" role="tablecontent" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id3147090" xml-lang="en-US" l10n="U" oldref="23">If you leave the <emph>Condition </emph>box empty, the condition is interpreted as not being met.</paragraph>
-<paragraph role="paragraph" id="par_id3148980" xml-lang="en-US" l10n="U" oldref="24">When you define a condition, use the same <link href="text/swriter/02/14020000.xhp">elements</link> for defining a formula, namely comparative operators, mathematical and statistical functions, number formats, variables and constants.</paragraph>
-<paragraph role="paragraph" id="par_id3153638" xml-lang="en-US" l10n="U" oldref="25">You can use the following types of variables when you define a condition:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155135" xml-lang="en-US" l10n="U" oldref="27">Predefined <link href="text/swriter/02/14020000.xhp">$[officename] variables</link> that use statistics on document properties</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156273" xml-lang="en-US" l10n="U" oldref="26">Custom variables, that are a created with the "Set variable" field</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="94">Variables based on user data</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145781" xml-lang="en-US" l10n="U" oldref="28">Variables based on the contents of database fields</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155916" xml-lang="en-US" l10n="U" oldref="29">You cannot use internal variables, such as page and chapter numbers, in condition expression.</paragraph>
-<paragraph role="heading" id="hd_id3151375" xml-lang="en-US" level="2" l10n="U" oldref="30">Conditions and Variables</paragraph>
-<paragraph role="paragraph" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="31">The following examples use a variable called "x":</paragraph>
-<table id="tbl_id3155867">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147417" xml-lang="en-US" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147500" xml-lang="en-US" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150551" xml-lang="en-US" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147749" xml-lang="en-US" l10n="U" oldref="36">sinx == 0</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146345" xml-lang="en-US" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3147090" role="note" l10n="U" oldref="23">If you leave the <emph>Condition </emph>box empty, the condition is interpreted as not being met.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148980" role="paragraph" l10n="U" oldref="24">When you define a condition, use the same <link href="text/swriter/02/14020000.xhp">elements</link> for defining a formula, namely comparative operators, mathematical and statistical functions, number formats, variables and constants.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153638" role="paragraph" l10n="U" oldref="25">You can use the following types of variables when you define a condition:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155135" role="listitem" l10n="U" oldref="27">Predefined <link href="text/swriter/02/14020000.xhp">$[officename] variables</link> that use statistics on document properties</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156273" role="listitem" l10n="U" oldref="26">Custom variables, that are a created with the "Set variable" field</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149174" role="listitem" l10n="U" oldref="94">Variables based on user data</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145781" role="listitem" l10n="U" oldref="28">Variables based on the contents of database fields</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155916" role="paragraph" l10n="U" oldref="29">You cannot use internal variables, such as page and chapter numbers, in condition expression.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151375" role="heading" level="2" l10n="U"
+                 oldref="30">Conditions and Variables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150122" role="paragraph" l10n="U" oldref="31">The following examples use a variable called "x":</paragraph>
+      <table id="tbl_id3155867">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147417" role="tablecontent" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147500" role="tablecontent" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145259" role="tablecontent" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150551" role="tablecontent" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147749" role="tablecontent" l10n="U" oldref="36">sinx == 0</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146345" role="tablecontent" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3149846" xml-lang="en-US" l10n="U" oldref="38">To use comparative operators with strings, the operands must be bounded by double quotation marks:</paragraph>
-<table id="tbl_id3148855">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151078" xml-lang="en-US" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150162" xml-lang="en-US" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153301" xml-lang="en-US" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
-<paragraph role="paragraph" id="par_id3156120" xml-lang="en-US" l10n="U" oldref="90">or</paragraph>
-<paragraph role="paragraph" id="par_id3156133" xml-lang="en-US" l10n="U" oldref="42">!x or NOT x</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156112" xml-lang="en-US" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3149846" role="paragraph" l10n="U" oldref="38">To use comparative operators with strings, the operands must be bounded by double quotation marks:</paragraph>
+      <table id="tbl_id3148855">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151078" role="tablecontent" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150162" role="tablecontent" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153301" role="tablecontent" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156120" role="tablecontent" l10n="U" oldref="90">or</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156133" role="tablecontent" l10n="U" oldref="42">!x or NOT x</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156112" role="tablecontent" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id3150097" xml-lang="en-US" l10n="CHG" oldref="45">The "equal" comparative operator must be represented by two equal signs (==) in a condition. For example, if you define a variable "x" with the value of 1, you can enter the condition as x==1.</paragraph>
-<paragraph role="heading" id="hd_id3148791" xml-lang="en-US" level="3" l10n="U" oldref="95">User Data</paragraph>
-<paragraph role="paragraph" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph>Tools - Options - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="U" oldref="97">The following table lists user data variables and their meanings:</paragraph>
-<table id="tbl_id3153139">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149632" xml-lang="en-US" l10n="U" oldref="130">Variable</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="131">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154026" xml-lang="en-US" l10n="U" oldref="98">user_firstname</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149953" xml-lang="en-US" l10n="U" oldref="99">First name</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147272" xml-lang="en-US" l10n="U" oldref="100">user_lastname</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149601" xml-lang="en-US" l10n="U" oldref="101">Last name</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150770" xml-lang="en-US" l10n="U" oldref="102">user_initials</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="103">Initials</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148705" xml-lang="en-US" l10n="U" oldref="104">user_company</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148728" xml-lang="en-US" l10n="U" oldref="105">Company</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155361" xml-lang="en-US" l10n="U" oldref="106">user_street</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154222" xml-lang="en-US" l10n="U" oldref="107">Street</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145108" xml-lang="en-US" l10n="U" oldref="108">user_country</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146885" xml-lang="en-US" l10n="U" oldref="109">Country</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="110">user_zipcode</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156241" xml-lang="en-US" l10n="U" oldref="111">Zip code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="112">user_city</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148945" xml-lang="en-US" l10n="U" oldref="113">City</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156053" xml-lang="en-US" l10n="U" oldref="114">user_title</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="115">Title</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156435" xml-lang="en-US" l10n="U" oldref="116">user_position</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145178" xml-lang="en-US" l10n="U" oldref="117">Position</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150797" xml-lang="en-US" l10n="U" oldref="118">user_tel_work</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150820" xml-lang="en-US" l10n="U" oldref="119">Business telephone number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150894" xml-lang="en-US" l10n="U" oldref="120">user_tel_home</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155320" xml-lang="en-US" l10n="U" oldref="121">Home telephone number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154400" xml-lang="en-US" l10n="U" oldref="122">user_fax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="123">Fax number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153390" xml-lang="en-US" l10n="U" oldref="124">user_email</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="U" oldref="125">E-mail address</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145603" xml-lang="en-US" l10n="U" oldref="126">user_state</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3150097" role="note" l10n="CHG" oldref="45">The "equal" comparative operator must be represented by two equal signs (==) in a condition. For example, if you define a variable "x" with the value of 1, you can enter the condition as x==1.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148791" role="heading" level="2" l10n="U"
+                 oldref="95">User Data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="U" oldref="97">The following table lists user data variables and their meanings:</paragraph>
+      <table id="tbl_id3153139">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149632" role="tablehead" l10n="U" oldref="130">Variable</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150662" role="tablehead" l10n="U" oldref="131">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154026" role="tablecontent" l10n="U" oldref="98">user_firstname</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149953" role="tablecontent" l10n="U" oldref="99">First name</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147272" role="tablecontent" l10n="U" oldref="100">user_lastname</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149601" role="tablecontent" l10n="U" oldref="101">Last name</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150770" role="tablecontent" l10n="U" oldref="102">user_initials</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="103">Initials</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148705" role="tablecontent" l10n="U" oldref="104">user_company</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148728" role="tablecontent" l10n="U" oldref="105">Company</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="106">user_street</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154222" role="tablecontent" l10n="U" oldref="107">Street</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="108">user_country</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146885" role="tablecontent" l10n="U" oldref="109">Country</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149580" role="tablecontent" l10n="U" oldref="110">user_zipcode</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156241" role="tablecontent" l10n="U" oldref="111">Zip code</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148922" role="tablecontent" l10n="U" oldref="112">user_city</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148945" role="tablecontent" l10n="U" oldref="113">City</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156053" role="tablecontent" l10n="U" oldref="114">user_title</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159219" role="tablecontent" l10n="U" oldref="115">Title</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156435" role="tablecontent" l10n="U" oldref="116">user_position</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145178" role="tablecontent" l10n="U" oldref="117">Position</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150797" role="tablecontent" l10n="U" oldref="118">user_tel_work</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150820" role="tablecontent" l10n="U" oldref="119">Business telephone number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="120">user_tel_home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155320" role="tablecontent" l10n="U" oldref="121">Home telephone number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154400" role="tablecontent" l10n="U" oldref="122">user_fax</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153363" role="tablecontent" l10n="U" oldref="123">Fax number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent" l10n="U" oldref="124">user_email</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent" l10n="U" oldref="125">E-mail address</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145603" role="tablecontent" l10n="U" oldref="126">user_state</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150129" role="tablecontent" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3150147" xml-lang="en-US" l10n="U" oldref="128">For example, to hide a paragraph, text, or a section from a user with a specific initial, such as "LM", enter the condition: user_initials=="LM".</paragraph>
-<paragraph role="heading" id="hd_id3154115" xml-lang="en-US" level="2" l10n="U" oldref="46">Conditions and Database Fields</paragraph>
-<paragraph role="paragraph" id="par_id3154128" xml-lang="en-US" l10n="U" oldref="47">You can define conditions for accessing databases, or database fields. For example, you can check the contents of a database field from a condition, or use database fields in logical expressions. The following table lists a few more examples of using databases in conditions:</paragraph>
-<table id="tbl_id3154848">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156066" xml-lang="en-US" l10n="U" oldref="132">Example</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156088" xml-lang="en-US" l10n="U" oldref="133">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155948" xml-lang="en-US" l10n="U" oldref="48">Database.Table.Company</paragraph>
-<paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="91">Database.Table.Company NEQ ""</paragraph>
-<paragraph role="paragraph" id="par_id3148687" xml-lang="en-US" l10n="U" oldref="92">Database.Table.Company != ""</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155373" xml-lang="en-US" l10n="U" oldref="49">The condition is true if the COMPANY field is not empty. (In the first example, no operator is required.)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149977" xml-lang="en-US" l10n="U" oldref="7">!Database.Table.Company</paragraph>
-<paragraph role="paragraph" id="par_id3149991" xml-lang="en-US" l10n="U" oldref="129">NOT Database.Table.Company</paragraph>
-<paragraph role="paragraph" id="par_id3150004" xml-lang="en-US" l10n="U" oldref="50">Database.Table.Company EQ ""</paragraph>
-<paragraph role="paragraph" id="par_id3146911" xml-lang="en-US" l10n="U" oldref="9">Database.Table.Company ==""</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148733" xml-lang="en-US" l10n="U" oldref="8">Returns TRUE if the COMPANY field is empty. (Exclamation sign represents a logical NOT.)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148762" xml-lang="en-US" l10n="U" oldref="5">Database.Table.Company !="Sun Microsystems"</paragraph>
-<paragraph role="paragraph" id="par_id3153016" xml-lang="en-US" l10n="U" oldref="149">Database.Table.Company NEQ "Sun Microsystems"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is "Sun Microsystems".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154605" xml-lang="en-US" l10n="U" oldref="51">Database.Table.Firstname AND Database.Table.Name</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153059" xml-lang="en-US" l10n="U" oldref="52">Returns TRUE if the record contains the first and the last name.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3150147" role="paragraph" l10n="U" oldref="128">For example, to hide a paragraph, text, or a section from a user with a specific initial, such as "LM", enter the condition: user_initials=="LM".</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154115" role="heading" level="2" l10n="U"
+                 oldref="46">Conditions and Database Fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154128" role="paragraph" l10n="U" oldref="47">You can define conditions for accessing databases, or database fields. For example, you can check the contents of a database field from a condition, or use database fields in logical expressions. The following table lists a few more examples of using databases in conditions:</paragraph>
+      <table id="tbl_id3154848">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156066" role="paragraph" l10n="U" oldref="132">Example</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156088" role="paragraph" l10n="U" oldref="133">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155948" role="paragraph" l10n="U" oldref="48">Database.Table.Company</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" l10n="U" oldref="91">Database.Table.Company NEQ ""</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148687" role="paragraph" l10n="U" oldref="92">Database.Table.Company != ""</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155373" role="paragraph" l10n="U" oldref="49">The condition is true if the COMPANY field is not empty. (In the first example, no operator is required.)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="U" oldref="7">!Database.Table.Company</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149991" role="paragraph" l10n="U" oldref="129">NOT Database.Table.Company</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150004" role="paragraph" l10n="U" oldref="50">Database.Table.Company EQ ""</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3146911" role="paragraph" l10n="U" oldref="9">Database.Table.Company ==""</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148733" role="paragraph" l10n="U" oldref="8">Returns TRUE if the COMPANY field is empty.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148762" role="paragraph" l10n="U" oldref="5">Database.Table.Company !="Sun"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153016" role="paragraph" l10n="U" oldref="149">Database.Table.Company NEQ "Sun"</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153040" role="paragraph" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is not "Sun". (Exclamation sign represents a logical NOT.)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154605" role="paragraph" l10n="U" oldref="51">Database.Table.Firstname AND Database.Table.Name</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153059" role="paragraph" l10n="U" oldref="52">Returns TRUE if the record contains the first and the last name.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id3159247" xml-lang="en-US" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
-<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
-<paragraph role="paragraph" id="par_id3153891" xml-lang="en-US" l10n="U" oldref="55">Example: Hiding an Empty Database Field</paragraph>
-<paragraph role="paragraph" id="par_id3150051" xml-lang="en-US" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
-<paragraph role="paragraph" id="par_id3150067" xml-lang="en-US" l10n="U" oldref="57">Select the <emph>Hidden Paragraph</emph> box, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
-<paragraph role="paragraph" id="par_id3147110" xml-lang="en-US" l10n="U" oldref="150">or type the following</paragraph>
-<paragraph role="paragraph" id="par_id3147123" xml-lang="en-US" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
-<paragraph role="paragraph" id="par_id3147136" xml-lang="en-US" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
-<paragraph role="note" id="par_id3150232" xml-lang="en-US" l10n="U" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Hidden paragraphs</emph> check box.</paragraph>
-<paragraph role="heading" id="hd_id3145218" xml-lang="en-US" level="2" l10n="U" oldref="59">Examples of Conditions in Fields</paragraph>
-<paragraph role="paragraph" id="par_id3145231" xml-lang="en-US" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
-<paragraph role="heading" id="hd_id3150311" xml-lang="en-US" level="3" l10n="U" oldref="61">To display conditional text based on the number of pages:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150333" xml-lang="en-US" l10n="U" oldref="136">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Functions</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147471" xml-lang="en-US" l10n="U" oldref="62">In the <emph>Type</emph> list, click "Conditional text".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154294" xml-lang="en-US" l10n="U" oldref="63">In the <emph>Condition </emph>box, type "page == 1".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="64">In the <emph>Then</emph> box, type "There is only one page".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150640" xml-lang="en-US" l10n="U" oldref="65">In the <emph>Or </emph>box, type "There are several pages".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153086" xml-lang="en-US" l10n="U" oldref="137">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155814" xml-lang="en-US" level="3" l10n="U" oldref="67">To display conditional text based on a user-defined Variable</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155836" xml-lang="en-US" l10n="U" oldref="138">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Variables</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155109" xml-lang="en-US" l10n="U" oldref="68">In the <emph>Type </emph>list, click "Set Variable".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="139">In the<emph> Name</emph> box, type "Profit".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147032" xml-lang="en-US" l10n="U" oldref="140">In the<emph> Value</emph> box, type "5000".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152974" xml-lang="en-US" l10n="U" oldref="141">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152998" xml-lang="en-US" l10n="U" oldref="70">Click the <emph>Functions</emph> tab, and click "Conditional text" in the <emph>Type</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150952" xml-lang="en-US" l10n="U" oldref="142">In the <emph>Condition</emph> box, type "Profit &lt; 5000".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156291" xml-lang="en-US" l10n="U" oldref="71">In the <emph>Then</emph> box, type "Target is not met".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156317" xml-lang="en-US" l10n="U" oldref="72">In the <emph>Or </emph>box, type "Target is met".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="143">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154389" xml-lang="en-US" l10n="U" oldref="73">To edit the contents of the "Profit" variable, double-click the variable field.</paragraph>
-<paragraph role="heading" id="hd_id3155573" xml-lang="en-US" level="3" l10n="U" oldref="74">To display conditional text based on the contents of a database field:</paragraph>
-<paragraph role="paragraph" id="par_id3155587" xml-lang="en-US" l10n="CHG" oldref="144">The first part of this example inserts a space between the "First Name" and "Last Name" fields in a document, and the second part inserts text based on the contents of a field. This example requires that an address data source is registered with $[officename].</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150523" xml-lang="en-US" l10n="U" oldref="145">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Database</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148811" xml-lang="en-US" l10n="U" oldref="75">In the <emph>Type </emph>list, click "Mail merge fields".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148841" xml-lang="en-US" l10n="U" oldref="76">In the<emph> Database selection</emph> box, double-click an address book, click "First Name", and then click<emph> Insert</emph>. Repeat for "Last Name".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147549" xml-lang="en-US" l10n="U" oldref="78">In the document, place the cursor between the two fields, press Space, and then return to the <emph>Fields </emph>dialog:</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150416" xml-lang="en-US" l10n="U" oldref="79">Click the <emph>Functions</emph> tab, and then click "Conditional text" in the <emph>Type</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153589" xml-lang="en-US" l10n="U" oldref="146">In the <emph>Condition </emph>box, type: "Addressbook.addresses.firstname".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153615" xml-lang="en-US" l10n="U" oldref="80">In the <emph>Then </emph>box, type a space and leave the <emph>Or </emph>box blank.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="84">You can now use a condition to insert text based on the contents of the First Name field.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150574" xml-lang="en-US" l10n="U" oldref="147">In the <emph>Fields </emph>dialog, click the <emph>Functions </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150605" xml-lang="en-US" l10n="U" oldref="85">In the <emph>Type </emph>box, click "Conditional text".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="86">In the <emph>Condition </emph>box, type: Addressbook.addresses.firstname == "Michael"</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151303" xml-lang="en-US" l10n="U" oldref="87">In the <emph>Then </emph>box, type "Dear".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149138" xml-lang="en-US" l10n="U" oldref="88">In the <emph>Or </emph>box, type "Hello".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149163" xml-lang="en-US" l10n="U" oldref="148">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-</list>
-</body>
+      <paragraph xml-lang="en-US" id="par_id3159247" role="note" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153891" role="heading" level="3" l10n="U"
+                 oldref="55">Example: Hiding an Empty Database Field</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150067" role="paragraph" l10n="CHG" oldref="57">Select the <emph>Hidden Paragraph</emph> list entry, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
+                 oldref="59">Examples of Conditions in Fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150311" role="heading" level="2" l10n="U"
+                 oldref="61">To display conditional text based on the number of pages:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150333" role="listitem" l10n="U" oldref="136">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Functions</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147471" role="listitem" l10n="U" oldref="62">In the <emph>Type</emph> list, click "Conditional text".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154294" role="listitem" l10n="U" oldref="63">In the <emph>Condition </emph>box, type "page == 1".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154319" role="listitem" l10n="U" oldref="64">In the <emph>Then</emph> box, type "There is only one page".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150640" role="listitem" l10n="U" oldref="65">In the <emph>Or </emph>box, type "There are several pages".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153086" role="listitem" l10n="U" oldref="137">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155814" role="heading" level="2" l10n="U"
+                 oldref="67">To display conditional text based on a user-defined Variable</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155836" role="listitem" l10n="U" oldref="138">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Variables</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155109" role="listitem" l10n="U" oldref="68">In the <emph>Type </emph>list, click "Set Variable".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147008" role="listitem" l10n="U" oldref="139">In the<emph> Name</emph> box, type "Profit".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147032" role="listitem" l10n="U" oldref="140">In the<emph> Value</emph> box, type "5000".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152974" role="listitem" l10n="U" oldref="141">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152998" role="listitem" l10n="U" oldref="70">Click the <emph>Functions</emph> tab, and click "Conditional text" in the <emph>Type</emph> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150952" role="listitem" l10n="U" oldref="142">In the <emph>Condition</emph> box, type "Profit &lt; 5000".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156291" role="listitem" l10n="U" oldref="71">In the <emph>Then</emph> box, type "Target is not met".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156317" role="listitem" l10n="U" oldref="72">In the <emph>Or </emph>box, type "Target is met".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154366" role="listitem" l10n="U" oldref="143">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="U" oldref="73">To edit the contents of the "Profit" variable, double-click the variable field.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155573" role="heading" level="2" l10n="U"
+                 oldref="74">To display conditional text based on the contents of a database field:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155587" role="paragraph" l10n="CHG" oldref="144">The first part of this example inserts a space between the "First Name" and "Last Name" fields in a document, and the second part inserts text based on the contents of a field. This example requires that an address data source is registered with $[officename].</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150523" role="listitem" l10n="U" oldref="145">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Database</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148811" role="listitem" l10n="U" oldref="75">In the <emph>Type </emph>list, click "Mail merge fields".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148841" role="listitem" l10n="U" oldref="76">In the<emph> Database selection</emph> box, double-click an address book, click "First Name", and then click<emph> Insert</emph>. Repeat for "Last Name".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147549" role="listitem" l10n="U" oldref="78">In the document, place the cursor between the two fields, press Space, and then return to the <emph>Fields </emph>dialog:</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150416" role="listitem" l10n="U" oldref="79">Click the <emph>Functions</emph> tab, and then click "Conditional text" in the <emph>Type</emph> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153589" role="listitem" l10n="U" oldref="146">In the <emph>Condition </emph>box, type: "Addressbook.addresses.firstname".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153615" role="listitem" l10n="U" oldref="80">In the <emph>Then </emph>box, type a space and leave the <emph>Or </emph>box blank.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153562" role="paragraph" l10n="U" oldref="84">You can now use a condition to insert text based on the contents of the First Name field.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150574" role="listitem" l10n="U" oldref="147">In the <emph>Fields </emph>dialog, click the <emph>Functions </emph>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150605" role="listitem" l10n="U" oldref="85">In the <emph>Type </emph>box, click "Conditional text".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151277" role="listitem" l10n="U" oldref="86">In the <emph>Condition </emph>box, type: Addressbook.addresses.firstname == "Michael"</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151303" role="listitem" l10n="U" oldref="87">In the <emph>Then </emph>box, type "Dear".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149138" role="listitem" l10n="CHG" oldref="88">In the <emph>Else</emph> box, type "Hello".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149163" role="listitem" l10n="U" oldref="148">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+      </list>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120000.xhp b/helpcontent2/source/text/swriter/01/04120000.xhp
index 4d4caa8148..08ccf733c9 100755
--- a/helpcontent2/source/text/swriter/01/04120000.xhp
+++ b/helpcontent2/source/text/swriter/01/04120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120100.xhp b/helpcontent2/source/text/swriter/01/04120100.xhp
index 1dd8ccabb8..8de4a40978 100644
--- a/helpcontent2/source/text/swriter/01/04120100.xhp
+++ b/helpcontent2/source/text/swriter/01/04120100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120100.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -100,7 +97,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_INSERT_IDX_MRK_NEW" id="bm_id3151095" localize="false"/>
 <paragraph role="heading" id="hd_id3151083" xml-lang="en-US" level="2" l10n="U" oldref="28">New user-defined index</paragraph>
 <paragraph role="paragraph" id="par_id3150161" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_INSERT_IDX_MRK_NEW">Opens the <emph>Create New User-defined Index</emph> dialog where you can create a custom index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_NEW_USER_IDX:ED_NAME" id="bm_id3153307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_NEW_USER_IDX:ED_NAME" id="bm_id3153307" localize="false"/>
 <paragraph role="heading" id="hd_id3153296" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
 <paragraph role="paragraph" id="par_id3153507" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:DLG_NEW_USER_IDX:ED_NAME">Enter a name for the new user-defined index. The new index is added to the list of available indexes and tables.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04120200.xhp b/helpcontent2/source/text/swriter/01/04120200.xhp
index c64fafea36..8435b928df 100644
--- a/helpcontent2/source/text/swriter/01/04120200.xhp
+++ b/helpcontent2/source/text/swriter/01/04120200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120201.xhp b/helpcontent2/source/text/swriter/01/04120201.xhp
index 868efc064f..7553d5d77b 100755
--- a/helpcontent2/source/text/swriter/01/04120201.xhp
+++ b/helpcontent2/source/text/swriter/01/04120201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120201.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,19 +48,19 @@
   <embed href="text/swriter/00/00000404.xhp#stichwortverzeichnisverz3"/>
 </section>
 <paragraph role="heading" id="hd_id3150565" xml-lang="en-US" level="2" l10n="U" oldref="26">Assignment</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_STYLES:LB_LEVEL" id="bm_id3154642" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_STYLES:LB_LEVEL" id="bm_id3154642" localize="false"/>
 <paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="28">Levels</paragraph>
 <paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:LISTBOX:TP_TOX_STYLES:LB_LEVEL">Select the index level that you change the formatting of.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_STYLES:LB_PARALAY" id="bm_id3150766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_STYLES:LB_PARALAY" id="bm_id3150766" localize="false"/>
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="30">Paragraph Styles</paragraph>
 <paragraph role="paragraph" id="par_id3149290" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:LISTBOX:TP_TOX_STYLES:LB_PARALAY">Select the paragraph style that you want to apply to the selected index level, and then click the Assign (<emph>&lt;) </emph>button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_TOX_STYLES_BT_ASSIGN" id="bm_id3147514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN" id="bm_id3147514" localize="false"/>
 <paragraph role="heading" id="hd_id3145418" xml-lang="en-US" level="3" l10n="U" oldref="32">&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW_IMAGEBUTTON_TP_TOX_STYLES_BT_ASSIGN">Formats the selected index level with the selected paragraph style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_STYLES:BT_STD" id="bm_id3153533" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_STYLES:BT_STD" id="bm_id3153533" localize="false"/>
 <paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
 <paragraph role="paragraph" id="par_id3153539" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW:PUSHBUTTON:TP_TOX_STYLES:BT_STD">Resets the formatting of the selected level to the "Default" paragraph style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_STYLES:BT_EDIT_STYLE" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE" id="bm_id3153668" localize="false"/>
 <paragraph role="heading" id="hd_id3154474" xml-lang="en-US" level="3" l10n="U" oldref="38">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3153675" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SW:PUSHBUTTON:TP_TOX_STYLES:BT_EDIT_STYLE">Opens the <emph>Paragraph Style</emph> dialog, where you can modify the selected paragraph style.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04120210.xhp b/helpcontent2/source/text/swriter/01/04120210.xhp
index 2d49c825dd..8ef51fb4a5 100755
--- a/helpcontent2/source/text/swriter/01/04120210.xhp
+++ b/helpcontent2/source/text/swriter/01/04120210.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120210.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120211.xhp b/helpcontent2/source/text/swriter/01/04120211.xhp
index 2415e5a5b1..d5b377da6c 100755
--- a/helpcontent2/source/text/swriter/01/04120211.xhp
+++ b/helpcontent2/source/text/swriter/01/04120211.xhp
@@ -4,36 +4,28 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, 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.
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *    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.
- *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
@@ -56,47 +48,47 @@
       <section id="typtitel">
          <paragraph xml-lang="en-US" id="hd_id3150763" role="heading" level="2" l10n="U" oldref="3">Type and Title</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149286" role="paragraph" l10n="U" oldref="4">Specify the type and title of the index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_TYPE" id="bm_id3145412" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_TYPE" id="bm_id3145412" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151171" role="heading" level="3" l10n="U" oldref="5">Type</paragraph>
          <paragraph xml-lang="en-US" id="par_id3145418" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_TYPE">Select the type of index that you want to insert.</ahelp> The options available on this tab depend on the index type that you select. If the cursor is in an index when you choose the <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, you can then edit that index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_TOX_SELECT:ED_TITLE" id="bm_id3149812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_TOX_SELECT:ED_TITLE" id="bm_id3149812" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149801" role="heading" level="3" l10n="U" oldref="7">Title</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_TOX_SELECT:ED_TITLE">Enter a title for the selected index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U" oldref="9">Protected against manual changes</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
       </section>
       <section id="verzfuer">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155893" role="heading" level="2" l10n="U"
                     oldref="11">Create index for</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_AREA">Select whether to create the index for the document or for the current chapter.</ahelp></paragraph>
       </section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_TOX_SELECT:NF_LEVEL" id="bm_id3155181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TOX_SELECT:NF_LEVEL" id="bm_id3155181" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154199" role="heading" level="3" l10n="U"
                  oldref="13">Evaluation level</paragraph>
       <paragraph xml-lang="en-US" id="par_id3143270" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW:NUMERICFIELD:TP_TOX_SELECT:NF_LEVEL">Enter the number of heading levels to include in the index.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3149484" role="heading" level="2" l10n="U"
                  oldref="15">Create from</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149096" role="paragraph" l10n="U" oldref="16">Use this area to specify which information to include in an index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMHEADINGS" id="bm_id3149826" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS" id="bm_id3149826" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149815" role="heading" level="3" l10n="U"
                  oldref="17">Outline</paragraph>
       <paragraph xml-lang="en-US" id="par_id3151253" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMHEADINGS">Creates the index using outline levels, that is, paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id1209200804373840" role="paragraph" l10n="NEW">You can also assign the outline levels in the <link href="text/swriter/01/05030800.xhp">Outline &amp; Numbering</link> tab page of the Format - Paragraph dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_ADDSTYLES" id="bm_id3152766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES" id="bm_id3152766" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153633" role="heading" level="3" l10n="U"
                  oldref="21">Additional Styles</paragraph>
       <paragraph xml-lang="en-US" id="par_id3152772" role="paragraph" l10n="CHG" oldref="22"><variable id="vorlg"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_ADDSTYLES">Includes the paragraph styles that you specify in the <emph>Assign Styles</emph> dialog as index entries. To select the paragraph styles that you want to include in the index, click the <emph>Assign Styles (...</emph>) button to the right of this box.</ahelp>
 </variable></paragraph>
       <section id="buttonvor">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_SELECT:PB_ADDSTYLES" id="bm_id3149180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES" id="bm_id3149180" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149168" role="heading" level="3" l10n="U"
                     oldref="23">...</paragraph>
          <paragraph xml-lang="en-US" id="par_id3145776" role="paragraph" l10n="CHG" oldref="24"><ahelp hid="SW:PUSHBUTTON:TP_TOX_SELECT:PB_ADDSTYLES">Opens the <emph>Assign Styles</emph> dialog, where you can select the paragraph styles to include in the index.</ahelp></paragraph>
       </section>
       <section id="verzmark">
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_TOXMARKS" id="bm_id3155854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS" id="bm_id3155854" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151374" role="heading" level="3" l10n="U"
                     oldref="25">Index marks</paragraph>
          <paragraph xml-lang="en-US" id="par_id3155861" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_TOXMARKS">Includes the index entries that you inserted by choosing <emph>Insert - Indexes and Tables - Entry</emph> in the index.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04120212.xhp b/helpcontent2/source/text/swriter/01/04120212.xhp
index 5133002add..40d2a4133d 100755
--- a/helpcontent2/source/text/swriter/01/04120212.xhp
+++ b/helpcontent2/source/text/swriter/01/04120212.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120212.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,39 +53,39 @@ DEDR: reviewed</lastedited>
 <embed href="text/swriter/01/04120211.xhp#typtitel"/>
 <embed href="text/swriter/01/04120211.xhp#verzfuer"/>
 <paragraph role="heading" id="hd_id3153247" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME" id="bm_id3146963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME" id="bm_id3146963" localize="false"/>
 <paragraph role="heading" id="hd_id3154651" xml-lang="en-US" level="3" l10n="U" oldref="5">Combine identical entries</paragraph>
 <paragraph role="paragraph" id="par_id3153810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF" id="bm_id3151393" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_USEFF" id="bm_id3151393" localize="false"/>
 <paragraph role="heading" id="hd_id3147403" xml-lang="en-US" level="3" l10n="U" oldref="7">Combine identical entries with p or pp</paragraph>
 <paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries, which occur also on the directly following page or pages, with a single entry that lists the first page number and a "p" or "pp". For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 11" as "View 10p".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH" id="bm_id3149353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH" id="bm_id3149353" localize="false"/>
 <paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="9">Combine with -</paragraph>
 <paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_CASESENSITIVE" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE" id="bm_id3150019" localize="false"/>
 <paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="3" l10n="U" oldref="11">Case sensitive</paragraph>
 <paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_CASESENSITIVE">Distinguishes between uppercase and lowercase letters in identical index entries. For Asian languages special handling applies.</ahelp> If you want the first occurrence of the entry in the document to determine the case of the entry, select <emph>Combine identical entries</emph>.</paragraph>
 <paragraph role="note" id="par_idN10671" xml-lang="en-US" l10n="NEW">To use multi-level collation to Asian languages, select <emph>Case sensitive</emph>. In the multi-level collation, the cases and diacritics of the entries are ignored and only the primitive forms of the entries are compared. If the forms are identical, the diacritics of the forms are compared. If the forms are still identical, the cases of the forms as well as the widths of the characters, and the differences in the Japanese Kana are compared.<comment>UFI: see #112590# and #112507#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_INITIALCAPS" id="bm_id3148393" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS" id="bm_id3148393" localize="false"/>
 <paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">AutoCapitalize entries</paragraph>
 <paragraph role="paragraph" id="par_id3148772" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_INITIALCAPS">Automatically capitalizes the first letter of an index entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_KEYASENTRY" id="bm_id3153924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY" id="bm_id3153924" localize="false"/>
 <paragraph role="heading" id="hd_id3155986" xml-lang="en-US" level="3" l10n="U" oldref="15">Keys as separate entries</paragraph>
 <paragraph role="paragraph" id="par_id3147170" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_KEYASENTRY">Inserts index keys as separate index entries.</ahelp> A key is inserted as a top level index entry and the entries that are assigned to the key as indented subentries.</paragraph>
 <paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="17">To define an index key, choose <link href="text/swriter/01/04120100.xhp" name="Insert Index Entry"><emph>Insert Index Entry</emph></link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_FROMFILE" id="bm_id3150766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE" id="bm_id3150766" localize="false"/>
 <paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="18">Concordance file</paragraph>
 <paragraph role="paragraph" id="par_id3156322" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_FROMFILE">Automatically marks index entries using a concordance file - a list of words to include in an index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MENUBUTTON_TP_TOX_SELECT_MB_AUTOMARK" id="bm_id3153151" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK" id="bm_id3153151" localize="false"/>
 <paragraph role="heading" id="hd_id3150258" xml-lang="en-US" level="3" l10n="U" oldref="24">File</paragraph>
 <paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW_MENUBUTTON_TP_TOX_SELECT_MB_AUTOMARK">Select, create, or edit a concordance file.</ahelp></paragraph>
 <section id="sort">
 <paragraph role="heading" id="hd_id3152950" xml-lang="en-US" level="2" l10n="U" oldref="32">Sort</paragraph>
 <paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="33">Sets the options for sorting the index entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TOX_SELECT_LB_LANGUAGE" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE" id="bm_id3150359" localize="false"/>
 <paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="3" l10n="U" oldref="34">Language</paragraph>
 <paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW_LISTBOX_TP_TOX_SELECT_LB_LANGUAGE">Select the language rules to use for sorting the index entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TOX_SELECT_LB_SORTALG" id="bm_id3147524" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_SORTALG" id="bm_id3147524" localize="false"/>
 <paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="36">Key type</paragraph>
 <paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW_LISTBOX_TP_TOX_SELECT_LB_SORTALG">Select numeric when you want to sort numbers by value, such as in 1, 2, 12. Select alphanumeric, when you want to sort the numbers by character code, such as in 1, 12, 2.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/swriter/01/04120213.xhp b/helpcontent2/source/text/swriter/01/04120213.xhp
index 82a6377a6e..79574821ee 100755
--- a/helpcontent2/source/text/swriter/01/04120213.xhp
+++ b/helpcontent2/source/text/swriter/01/04120213.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04120213.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0104120213xml" indexer="include" status="PUBLISH">
@@ -55,13 +52,13 @@
 <section id="erzaus">
 <paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="3">Create from</paragraph>
 <paragraph role="paragraph" id="par_id3151315" xml-lang="en-US" l10n="U" oldref="4">Specify the information to be combined to form an index.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMCAPTIONS" id="bm_id3153671" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS" id="bm_id3153671" localize="false"/>
 <paragraph role="heading" id="hd_id3154478" xml-lang="en-US" level="3" l10n="U" oldref="5">Captions</paragraph>
 <paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMCAPTIONS">Creates index entries from object captions.</ahelp> To add a caption to an object, select the object, and then choose <emph>Insert - Caption</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_CAPTIONSEQUENCE" id="bm_id3155903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE" id="bm_id3155903" localize="false"/>
 <paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
 <paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_CAPTIONSEQUENCE">Select the caption category that you want to use for the index entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_DISPLAYTYPE" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE" id="bm_id3155179" localize="false"/>
 <paragraph role="heading" id="hd_id3154195" xml-lang="en-US" level="3" l10n="U" oldref="9">Display</paragraph>
 <paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_DISPLAYTYPE">Select the part of the caption that you want to use for index entries.</ahelp> The following table lists the caption options that can be selected, based on the caption text "Illustration 24: The Sun", where "Illustration 24" was automatically generated, and "The Sun" was added by the user.</paragraph>
 <table id="tbl_id3149490" name="tbl_id3149490">
@@ -100,8 +97,8 @@
 </table>
 
 <paragraph role="paragraph" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="19">If you select "Caption Text", the punctuation and the space at the beginning of the caption does not appear in the index entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMOBJECTNAMES" id="bm_id3155857" localize="false"/>
-<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES" id="bm_id3155857" localize="false"/>
+<paragraph role="heading" id="hd_id3151378" xml-lang="en-US" level="3" l10n="U" oldref="20">Object names</paragraph>
 <paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:RADIOBUTTON:TP_TOX_SELECT:RB_FROMOBJECTNAMES">Creates index entries from object names.</ahelp> You can view object names in the Navigator, for example, and change them in the context menu.</paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04120214.xhp b/helpcontent2/source/text/swriter/01/04120214.xhp
index 3f058f1033..51e6d1050a 100755
--- a/helpcontent2/source/text/swriter/01/04120214.xhp
+++ b/helpcontent2/source/text/swriter/01/04120214.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120214.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120215.xhp b/helpcontent2/source/text/swriter/01/04120215.xhp
index 539aee9be7..283b15a984 100755
--- a/helpcontent2/source/text/swriter/01/04120215.xhp
+++ b/helpcontent2/source/text/swriter/01/04120215.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120215.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,19 +55,19 @@
 <embed href="text/swriter/01/04120211.xhp#vorlg"/>
 <embed href="text/swriter/01/04120211.xhp#buttonvor"/>
 <embed href="text/swriter/01/04120211.xhp#verzmark"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMTABLES" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES" id="bm_id3152962" localize="false"/>
 <paragraph role="heading" id="hd_id3151320" xml-lang="en-US" level="3" l10n="U" oldref="8">Tables</paragraph>
 <paragraph role="paragraph" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMTABLES">Includes tables in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMGRAPHICS" id="bm_id3153670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS" id="bm_id3153670" localize="false"/>
 <paragraph role="heading" id="hd_id3154569" xml-lang="en-US" level="3" l10n="U" oldref="10">Graphics</paragraph>
 <paragraph role="paragraph" id="par_id3153676" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMGRAPHICS">Includes graphics in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMFRAMES" id="bm_id3154188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES" id="bm_id3154188" localize="false"/>
 <paragraph role="heading" id="hd_id3149685" xml-lang="en-US" level="3" l10n="U" oldref="12">Text frames</paragraph>
 <paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMFRAMES">Includes text frames in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_FROMOLE" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE" id="bm_id3143276" localize="false"/>
 <paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="14">OLE objects</paragraph>
 <paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_FROMOLE">Includes OLE objects in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_LEVELFROMCHAPTER" id="bm_id3149106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER" id="bm_id3149106" localize="false"/>
 <paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="16">Use level from source chapter</paragraph>
 <paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_LEVELFROMCHAPTER">Indents table, graphic, text frame, and OLE object index entries according their place in the chapter heading hierarchy.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/04120216.xhp b/helpcontent2/source/text/swriter/01/04120216.xhp
index 26d4122ff4..b4cb401ac7 100755
--- a/helpcontent2/source/text/swriter/01/04120216.xhp
+++ b/helpcontent2/source/text/swriter/01/04120216.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120216.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120217.xhp b/helpcontent2/source/text/swriter/01/04120217.xhp
index dd18663a1b..b0853bd77f 100755
--- a/helpcontent2/source/text/swriter/01/04120217.xhp
+++ b/helpcontent2/source/text/swriter/01/04120217.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120217.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,10 +49,10 @@
 </section>
 <embed href="text/swriter/01/04120211.xhp#typtitel"/>
 <paragraph role="heading" id="hd_id3148773" xml-lang="en-US" level="2" l10n="U" oldref="3">Formatting of the entries</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_SEQUENCE" id="bm_id3154640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE" id="bm_id3154640" localize="false"/>
 <paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="3" l10n="U" oldref="5">Number entries</paragraph>
 <paragraph role="paragraph" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_SEQUENCE">Automatically numbers the bibliography entries.</ahelp> To set the sorting options for the numbering, click the <link href="text/swriter/01/04120227.xhp" name="Entries">Entries</link> tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_BRACKET" id="bm_id3149290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_SELECT:LB_BRACKET" id="bm_id3149290" localize="false"/>
 <paragraph role="heading" id="hd_id3150759" xml-lang="en-US" level="3" l10n="U" oldref="7">Brackets</paragraph>
 <paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:TP_TOX_SELECT:LB_BRACKET">Select the brackets that you want to enclose bibliography entries.</ahelp></paragraph>
 <embed href="text/swriter/01/04120212.xhp#sort"/>
diff --git a/helpcontent2/source/text/swriter/01/04120219.xhp b/helpcontent2/source/text/swriter/01/04120219.xhp
index 72f397111c..963834669e 100755
--- a/helpcontent2/source/text/swriter/01/04120219.xhp
+++ b/helpcontent2/source/text/swriter/01/04120219.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120219.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
   <paragraph role="heading" level="2" id="hd_id3145249" l10n="U" xml-lang="en-US" oldref="3">Styles</paragraph>
   <paragraph role="paragraph" id="par_id3150566" l10n="U" xml-lang="en-US" oldref="4">The list contains the paragraph styles that you can assign to index levels.</paragraph>
   <paragraph xml-lang="en-US" oldref="5" role="paragraph" id="par_id3147176" l10n="U">To create an index entry from a paragraph style, click the style in the<emph> Styles</emph> list, and then click the <emph>&gt;&gt; </emph>button to move the style to the index level that you want.</paragraph>
-  <bookmark branch="hid/SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_LEFT" xml-lang="en-US" id="bm_id3151187"/><paragraph role="heading" level="2" id="hd_id3150762" l10n="U" xml-lang="en-US" oldref="6">&lt;&lt;</paragraph>
+  <bookmark branch="hid/sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT" xml-lang="en-US" id="bm_id3151187"/><paragraph role="heading" level="2" id="hd_id3150762" l10n="U" xml-lang="en-US" oldref="6">&lt;&lt;</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149289" xml-lang="en-US" oldref="7"><ahelp hid="SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_LEFT" visibility="visible">Moves the selected paragraph style up one level in the index hierarchy.</ahelp></paragraph>
-  <bookmark branch="hid/SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_RIGHT" xml-lang="en-US" id="bm_id3147506"/><paragraph role="heading" level="2" id="hd_id3151178" l10n="U" xml-lang="en-US" oldref="8">&gt;&gt;</paragraph>
+  <bookmark branch="hid/sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT" xml-lang="en-US" id="bm_id3147506"/><paragraph role="heading" level="2" id="hd_id3151178" l10n="U" xml-lang="en-US" oldref="8">&gt;&gt;</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3157903" xml-lang="en-US" oldref="9"><ahelp hid="SW_IMAGEBUTTON_DLG_ADD_IDX_STYLES_PB_RIGHT" visibility="visible">Moves the selected paragraph style down one level in the index hierarchy.</ahelp></paragraph>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120220.xhp b/helpcontent2/source/text/swriter/01/04120220.xhp
index e3452246a4..510855a759 100755
--- a/helpcontent2/source/text/swriter/01/04120220.xhp
+++ b/helpcontent2/source/text/swriter/01/04120220.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120220.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120221.xhp b/helpcontent2/source/text/swriter/01/04120221.xhp
index 539f18bdba..179644cc62 100755
--- a/helpcontent2/source/text/swriter/01/04120221.xhp
+++ b/helpcontent2/source/text/swriter/01/04120221.xhp
@@ -6,14 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 04120221.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +41,7 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3145827" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120221.xhp" name="Entries (table of contents)">Entries (table of contents)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents. 
+<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents.
 </variable></paragraph>
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#verz31"/>
@@ -75,42 +71,42 @@
 </list>
 </section>
 <section id="chapterno">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="11">Chapter number (E#)</paragraph>
-<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the complete chapter heading, including, if available, the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="11">Chapter number (E#)</paragraph>
+<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
 </section>
 <section id="eintragstext">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRY" id="bm_id3154193" localize="false"/><paragraph role="heading" id="hd_id3149691" xml-lang="en-US" level="3" l10n="U" oldref="13">Entry text (E)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRY" id="bm_id3154193" localize="false"/><paragraph role="heading" id="hd_id3149691" xml-lang="en-US" level="3" l10n="U" oldref="13">Entry text (E)</paragraph>
 <paragraph role="paragraph" id="par_id3154199" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRY">Inserts the text of the chapter heading.</ahelp></paragraph>
 </section>
 <section id="tabulator">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_TAB" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="3" l10n="U" oldref="15">Tab stop (T)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_TAB" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="3" l10n="U" oldref="15">Tab stop (T)</paragraph>
 <paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_TAB">Inserts a tab stop. To add leader dots to the tab stop, select a character in the <emph>Fill character box</emph>. To change the position of the tab stop, enter a value in the <emph>Tab stop position </emph>box, or select the <emph>Align right </emph>check box.</ahelp></paragraph>
 </section>
 <section id="seitennr">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_PAGENO" id="bm_id3148974" localize="false"/><paragraph role="heading" id="hd_id3151257" xml-lang="en-US" level="3" l10n="U" oldref="17">Page number (#)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_PAGENO" id="bm_id3148974" localize="false"/><paragraph role="heading" id="hd_id3151257" xml-lang="en-US" level="3" l10n="U" oldref="17">Page number (#)</paragraph>
 <paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_PAGENO">Inserts the page number of the entry.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_HYPERLINK" id="bm_id3147224" localize="false"/><paragraph role="heading" id="hd_id3147212" xml-lang="en-US" level="3" l10n="U" oldref="19"> Hyperlink (LS and LE)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK" id="bm_id3147224" localize="false"/><paragraph role="heading" id="hd_id3147212" xml-lang="en-US" level="3" l10n="U" oldref="19"> Hyperlink (LS and LE)</paragraph>
 <paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_HYPERLINK">Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the <emph>Structure </emph>line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELS" id="bm_id3152778" localize="false"/><paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="36">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ALL_LEVELS" id="bm_id3152778" localize="false"/><paragraph role="heading" id="hd_id3152766" xml-lang="en-US" level="3" l10n="U" oldref="36">All</paragraph>
 <paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELS">Applies the current settings without closing the dialog.</ahelp></paragraph>
 <section id="aufbau2">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_CHARSTYLE" id="bm_id3156270" localize="false"/><paragraph role="heading" id="hd_id3153355" xml-lang="en-US" level="3" l10n="U" oldref="21">Character Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE" id="bm_id3156270" localize="false"/><paragraph role="heading" id="hd_id3153355" xml-lang="en-US" level="3" l10n="U" oldref="21">Character Style</paragraph>
 <paragraph role="paragraph" id="par_id3156277" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_CHARSTYLE">Specify the formatting style for the selected part on the <emph>Structure line</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_EDITSTYLE" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="3" l10n="U" oldref="23">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="3" l10n="U" oldref="23">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3151372" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_EDITSTYLE">Opens a dialog where you can edit the selected character style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_TOX_ENTRY:CB_FILLCHAR" id="bm_id3155921" localize="false"/><paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="3" l10n="U" oldref="25">Fill character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR" id="bm_id3155921" localize="false"/><paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="3" l10n="U" oldref="25">Fill character</paragraph>
 <paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:COMBOBOX:TP_TOX_ENTRY:CB_FILLCHAR">Select the tab leader that you want use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TOX_ENTRY:MF_TABPOS" id="bm_id3155871" localize="false"/><paragraph role="heading" id="hd_id3155859" xml-lang="en-US" level="3" l10n="U" oldref="27">Tab stop position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TOX_ENTRY:MF_TABPOS" id="bm_id3155871" localize="false"/><paragraph role="heading" id="hd_id3155859" xml-lang="en-US" level="3" l10n="U" oldref="27">Tab stop position</paragraph>
 <paragraph role="paragraph" id="par_id3150689" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:METRICFIELD:TP_TOX_ENTRY:MF_TABPOS">Enter the distance to leave between the left page margin and the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="U" oldref="29">To right margin</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT" id="bm_id3147488" localize="false"/><paragraph role="heading" id="hd_id3147415" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Align right</paragraph>
 <paragraph role="paragraph" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_AUTORIGHT">Aligns the tab stop to the right page margin.</ahelp></paragraph>
 </section>
 <section id="formatierung">
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_TOX_ENTRY_LB_ENTRY_NO" id="bm_id9986877" localize="false"/><paragraph role="heading" id="hd_id3145269" xml-lang="en-US" level="3" l10n="U" oldref="31">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_ENTRY_NO" id="bm_id9986877" localize="false"/><paragraph role="heading" id="hd_id3145269" xml-lang="en-US" level="3" l10n="U" oldref="31">Format</paragraph>
 <paragraph role="paragraph" id="par_id6499221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only visible when you click the E# button in the Structure line. Select to show the chapter number with or without separator.</ahelp></paragraph>
 <embed href="text/swriter/01/04120222.xhp#eval"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_RELTOSTYLE" id="bm_id3150547" localize="false"/><paragraph role="heading" id="hd_id3149559" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab position relative to Paragraph Style indent</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE" id="bm_id3150547" localize="false"/><paragraph role="heading" id="hd_id3149559" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab position relative to Paragraph Style indent</paragraph>
 <paragraph role="paragraph" id="par_id3150554" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_RELTOSTYLE">Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the <emph>Styles</emph> tab. Otherwise the tab stop is positioned relative to the left text margin.</ahelp></paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04120222.xhp b/helpcontent2/source/text/swriter/01/04120222.xhp
index 616e108509..68d4f2a89a 100755
--- a/helpcontent2/source/text/swriter/01/04120222.xhp
+++ b/helpcontent2/source/text/swriter/01/04120222.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120222.xhp,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,23 +52,23 @@
 <embed href="text/swriter/01/04120221.xhp#eintragstext"/>
 <embed href="text/swriter/01/04120221.xhp#tabulator"/>
 <section id="level">
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_CHAPTERINFO" id="bm_id3154566" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="4">Chapter Info</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO" id="bm_id3154566" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="4">Chapter Info</paragraph>
 <paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_CHAPTERINFO">Inserts chapter information, such as the chapter heading and number. Select the information that you want to display in the <emph>Chapter entry </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_CHAPTERENTRY" id="bm_id3154196" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="3" l10n="U" oldref="6">Chapter entry</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY" id="bm_id3154196" localize="false"/><paragraph role="heading" id="hd_id3149692" xml-lang="en-US" level="3" l10n="U" oldref="6">Chapter entry</paragraph>
 <paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_CHAPTERENTRY">Select the chapter information that you want to include in the index entry.</ahelp></paragraph>
 <section id="eval">
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL" id="bm_id354930" localize="false"/><paragraph role="heading" id="hd_id7605517" xml-lang="en-US" level="3" l10n="NEW">Evaluate up to level</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TOX_ENTRY:NF_LEVEL_OL" id="bm_id354930" localize="false"/><paragraph role="heading" id="hd_id7605517" xml-lang="en-US" level="3" l10n="NEW">Evaluate up to level</paragraph>
 <paragraph role="paragraph" id="par_id6739402" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the maximum hierarchy level down to which objects are shown in the generated index.</ahelp></paragraph>
 </section>
 </section>
 <embed href="text/swriter/01/04120221.xhp#seitennr"/>
 <embed href="text/swriter/01/04120221.xhp#aufbau2"/>
 <embed href="text/swriter/01/04120221.xhp#formatierung"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE" id="bm_id3149102" localize="false"/><paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="3" l10n="U" oldref="8">Character Style for main entries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE" id="bm_id3149102" localize="false"/><paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="3" l10n="U" oldref="8">Character Style for main entries</paragraph>
 <paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE">Specify the formatting style for the main entries in the alphabetical index. To convert an index entry into a main entry, click in front of the index field in the document and then choose <emph>Edit - </emph><link href="text/swriter/01/04120100.xhp" name="Index Entry"><emph>Index Entry</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_ALPHADELIM" id="bm_id3147094" localize="false"/><paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="3" l10n="U" oldref="10">Alphabetical delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM" id="bm_id3147094" localize="false"/><paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="3" l10n="U" oldref="10">Alphabetical delimiter</paragraph>
 <paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_ALPHADELIM">Uses the initial letters of the alphabetically arranged index entries as section headings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_ENTRY:CB_COMMASEPARATED" id="bm_id3149043" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="3" l10n="U" oldref="12">Key separated by commas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED" id="bm_id3149043" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="3" l10n="U" oldref="12">Key separated by commas</paragraph>
 <paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_TOX_ENTRY:CB_COMMASEPARATED">Arranges the index entries on the same line, separated by commas.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120223.xhp b/helpcontent2/source/text/swriter/01/04120223.xhp
index 927b6358e5..bc5295ea11 100755
--- a/helpcontent2/source/text/swriter/01/04120223.xhp
+++ b/helpcontent2/source/text/swriter/01/04120223.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120223.xhp,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120224.xhp b/helpcontent2/source/text/swriter/01/04120224.xhp
index 9473b80f01..3ad4b73813 100755
--- a/helpcontent2/source/text/swriter/01/04120224.xhp
+++ b/helpcontent2/source/text/swriter/01/04120224.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120224.xhp,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120225.xhp b/helpcontent2/source/text/swriter/01/04120225.xhp
index 669492bfb3..84c365d467 100755
--- a/helpcontent2/source/text/swriter/01/04120225.xhp
+++ b/helpcontent2/source/text/swriter/01/04120225.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120225.xhp,v $
- *
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120226.xhp b/helpcontent2/source/text/swriter/01/04120226.xhp
index e7f12cc05b..98c9296c33 100755
--- a/helpcontent2/source/text/swriter/01/04120226.xhp
+++ b/helpcontent2/source/text/swriter/01/04120226.xhp
@@ -7,14 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120226.xhp,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120227.xhp b/helpcontent2/source/text/swriter/01/04120227.xhp
index 39a1b427ca..a320696dc9 100755
--- a/helpcontent2/source/text/swriter/01/04120227.xhp
+++ b/helpcontent2/source/text/swriter/01/04120227.xhp
@@ -6,13 +6,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 04120227.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,40 +41,40 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120227.xhp" name="Entries (bibliography)">Entries (bibliography)</link></paragraph>
-<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries. 
+<paragraph role="paragraph" id="par_id3083449" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format for bibliography entries.
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#verz37"/>
 </section>
-<embed href="text/swriter/01/04120221.xhp#ebene"/>
+<paragraph role="heading" id="hd_id31544970" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
 <paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="3">The types that are displayed depend on the different literature sources.</paragraph>
 <embed href="text/swriter/01/04120221.xhp#aufbau"/>
 <embed href="text/swriter/01/04120221.xhp#tabulator"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_AUTHFIELD" id="bm_id3147168" localize="false"/><paragraph role="heading" id="hd_id3150570" xml-lang="en-US" level="3" l10n="U" oldref="4">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_AUTHFIELD" id="bm_id3147168" localize="false"/><paragraph role="heading" id="hd_id3150570" xml-lang="en-US" level="3" l10n="U" oldref="4">Type</paragraph>
 <paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="CHG" oldref="5">Lists the available bibliography entries. <ahelp hid=".">To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click <emph>Insert</emph>.</ahelp> Use the <link href="text/swriter/01/04120229.xhp" name="Define Bibliography Entry">Define Bibliography Entry</link> dialog to add new entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHINSERT" id="bm_id3151171" localize="false"/><paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="3" l10n="U" oldref="6">Insert</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT" id="bm_id3151171" localize="false"/><paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="3" l10n="U" oldref="6">Insert</paragraph>
 <paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHINSERT">Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHREMOVE" id="bm_id3149800" localize="false"/><paragraph role="heading" id="hd_id3154096" xml-lang="en-US" level="3" l10n="U" oldref="8">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE" id="bm_id3149800" localize="false"/><paragraph role="heading" id="hd_id3154096" xml-lang="en-US" level="3" l10n="U" oldref="8">Remove</paragraph>
 <paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_AUTHREMOVE">Removes the selected reference code from the Structure line.</ahelp></paragraph>
 <embed href="text/swriter/01/04120221.xhp#aufbau2"/>
 <paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="2" l10n="U" oldref="10">Sort by</paragraph>
 <paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="11">Specify the sorting options for the bibliography entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_ENTRY:RB_DOCPOS" id="bm_id3153677" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="12">Document position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_ENTRY:RB_DOCPOS" id="bm_id3153677" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="12">Document position</paragraph>
 <paragraph role="paragraph" id="par_id3151314" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:TP_TOX_ENTRY:RB_DOCPOS">Sorts the bibliography entries according to the position of their references in the document.</ahelp> Select this option if you want to use automatically numbered references.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TOX_ENTRY:RB_SORTCONTENT" id="bm_id3155902" localize="false"/><paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="14">Content</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TOX_ENTRY:RB_SORTCONTENT" id="bm_id3155902" localize="false"/><paragraph role="heading" id="hd_id3154576" xml-lang="en-US" level="3" l10n="U" oldref="14">Content</paragraph>
 <paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:RADIOBUTTON:TP_TOX_ENTRY:RB_SORTCONTENT">Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="2" l10n="U" oldref="16">Sort keys</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_FIRSTKEY" id="bm_id3143281" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_SECONDKEY" id="bm_id3149481" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_ENTRY:LB_THIRDKEY" id="bm_id3149486" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="18">1, 2 or 3</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_FIRSTKEY" id="bm_id3143281" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_SECONDKEY" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TOX_ENTRY:LB_THIRDKEY" id="bm_id3149486" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="18">1, 2 or 3</paragraph>
 <paragraph role="paragraph" id="par_id3149491" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:LISTBOX:TP_TOX_ENTRY:LB_THIRDKEY">Select the entry by which to sort the bibliography entries. This option is only available if you select the <emph>Content</emph> radio button in the <emph>Sort by</emph> area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP1" id="bm_id3149104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP2" id="bm_id3149108" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP3" id="bm_id3147091" localize="false"/><paragraph role="heading" id="hd_id3149826" xml-lang="en-US" level="3" l10n="U" oldref="20">AZ</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP1" id="bm_id3149104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP2" id="bm_id3149108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP3" id="bm_id3147091" localize="false"/><paragraph role="heading" id="hd_id3149826" xml-lang="en-US" level="3" l10n="U" oldref="20">AZ</paragraph>
 <paragraph role="paragraph" id="par_id3147098" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTUP3">Sorts the bibliography entries in ascending alphanumerical order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN1" id="bm_id3147221" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN2" id="bm_id3147225" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN3" id="bm_id3149035" localize="false"/><paragraph role="heading" id="hd_id3148981" xml-lang="en-US" level="3" l10n="U" oldref="22">ZA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN1" id="bm_id3147221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN2" id="bm_id3147225" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN3" id="bm_id3149035" localize="false"/><paragraph role="heading" id="hd_id3148981" xml-lang="en-US" level="3" l10n="U" oldref="22">ZA</paragraph>
 <paragraph role="paragraph" id="par_id3149041" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:IMAGERADIOBUTTON:TP_TOX_ENTRY:RB_SORTDOWN3">Sorts the bibliography entries in a descending alphanumerical order.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120229.xhp b/helpcontent2/source/text/swriter/01/04120229.xhp
index cc4328ec12..385fd6eaa2 100755
--- a/helpcontent2/source/text/swriter/01/04120229.xhp
+++ b/helpcontent2/source/text/swriter/01/04120229.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120229.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,31 +27,28 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0104120229xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Define Bibliography Entry</title>
-<filename>/text/swriter/01/04120229.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-04-28T09:26:14">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriter0104120229xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Define Bibliography Entry</title>
+         <filename>/text/swriter/01/04120229.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_CREATE_AUTH_ENTRY" id="bm_id3147571" localize="false"/>
-<paragraph role="heading" id="hd_id3147176" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120229.xhp" name="Define Bibliography Entry">Define Bibliography Entry</link></paragraph>
-<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_DLG_CREATE_AUTH_ENTRY">Change the content of a bibliography entry.</ahelp></paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000404.xhp#litdef"/>
-</section>
-<paragraph role="heading" id="hd_id3151175" xml-lang="en-US" level="2" l10n="U" oldref="3">Entry data</paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="4">Enter a short name and select the appropriate source type. You can now enter data into the other fields belonging for the entry.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147176" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120229.xhp" name="Define Bibliography Entry">Define Bibliography Entry</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151183" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_DLG_CREATE_AUTH_ENTRY">Change the content of a bibliography entry.</ahelp></paragraph>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000404.xhp#litdef"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3151175" role="heading" level="2" l10n="U" oldref="3">Entry data</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="U" oldref="4">Enter a short name and select the appropriate source type. You can now enter data into the other fields belonging for the entry.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_IDENTIFIER" id="bm_id3154107" localize="false"/>
-<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="5">Short name</paragraph>
-<paragraph role="paragraph" id="par_id3145582" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_AUTH_FIELD_IDENTIFIER">Displays the short name for the bibliography entry. You can only enter a name here if you are creating a new bibliography entry.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154097" role="heading" level="2" l10n="U" oldref="5">Short name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145582" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_AUTH_FIELD_IDENTIFIER">Displays the short name for the bibliography entry. You can only enter a name here if you are creating a new bibliography entry.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_AUTHOR" id="bm_id3153538" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_YEAR" id="bm_id3153666" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_ADDRESS" id="bm_id3153670" localize="false"/>
@@ -82,13 +77,10 @@
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_URL" id="bm_id3154193" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_CUSTOM2" id="bm_id3154197" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_CUSTOM4" id="bm_id3154201" localize="false"/>
-<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_AUTH_FIELD_CUSTOM4">This is where you select the desired entry data for your bibliography.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153527" role="paragraph" l10n="U" oldref="11"><ahelp hid="HID_AUTH_FIELD_CUSTOM4">This is where you select the desired entry data for your bibliography.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTH_FIELD_AUTHORITY_TYPE" id="bm_id3143277" localize="false"/>
-<paragraph role="heading" id="hd_id3155185" xml-lang="en-US" level="3" l10n="U" oldref="7">Type</paragraph>
-<paragraph role="paragraph" id="par_id3143283" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_AUTH_FIELD_AUTHORITY_TYPE">Select the source for the bibliography entry.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="9">The entries in the bibliography database have the following names:</paragraph>
-<paragraph role="paragraph" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="10">"Identifier"; "BibliographyType"; "Author"; "Title"; "Year"; "ISBN"; "Booktitle"; "Chapter"; "Edition"; "Editor"; "Howpublished"; "Institution"; "Journal"; "Month"; "Note"; "Annote"; "Number"; "Organizations"; "Pages"; "Publisher"; "Address"; "School"; "Series";"ReportType"; "Volume"; "URL"; "Custom1"; "Custom2"; "Custom3"; "Custom4"; "Custom5"</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3147091" xml-lang="en-US" l10n="U" oldref="12"><link href="text/swriter/01/04120227.xhp" name="Formatting bibliography entries">Formatting bibliography entries</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3155185" role="heading" level="2" l10n="U" oldref="7">Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143283" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_AUTH_FIELD_AUTHORITY_TYPE">Select the source for the bibliography entry.</ahelp></paragraph><comment>removed two paras</comment><embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3147091" role="paragraph" l10n="U" oldref="12"><link href="text/swriter/01/04120227.xhp" name="Formatting bibliography entries">Formatting bibliography entries</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/04120250.xhp b/helpcontent2/source/text/swriter/01/04120250.xhp
index a8e06de406..aa72e7fa2a 100644
--- a/helpcontent2/source/text/swriter/01/04120250.xhp
+++ b/helpcontent2/source/text/swriter/01/04120250.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120250.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04120300.xhp b/helpcontent2/source/text/swriter/01/04120300.xhp
index bddff9e2b0..96e6e53c2c 100644
--- a/helpcontent2/source/text/swriter/01/04120300.xhp
+++ b/helpcontent2/source/text/swriter/01/04120300.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04120300.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04130000.xhp b/helpcontent2/source/text/swriter/01/04130000.xhp
index c1a426f509..c1e94cd8c3 100644
--- a/helpcontent2/source/text/swriter/01/04130000.xhp
+++ b/helpcontent2/source/text/swriter/01/04130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 25bd7255e4..d2decbf782 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04130100.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 <paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
 <paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
 <paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01050100.xhp" name="Text document - Grid">%PRODUCTNAME Writer - Grid</link></emph>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp
index 41b0d556a2..430c027849 100644
--- a/helpcontent2/source/text/swriter/01/04150000.xhp
+++ b/helpcontent2/source/text/swriter/01/04150000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04150000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,37 +62,37 @@ dedr: reviewed</lastedited>
 <paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW">To insert a table into a table, click in a cell in the table and choose <emph>Table - Insert - Table</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
 <embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
 <paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="2" l10n="U" oldref="4">Name</paragraph>
 <paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:EDIT:DLG_INSERT_TABLE:ED_NAME">Enter a name for the table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149806" xml-lang="en-US" level="2" l10n="U" oldref="9">Table size</paragraph>
 <paragraph role="paragraph" id="par_id3153533" xml-lang="en-US" l10n="U" oldref="10">Specify the number of columns and rows in the new table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_COL" id="bm_id3154569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:ED_COL" id="bm_id3154569" localize="false"/>
 <paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="3" l10n="U" oldref="11">Columns</paragraph>
 <paragraph role="paragraph" id="par_id3154576" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_COL">Enter the number of columns that you want in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_ROW" id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:ED_ROW" id="bm_id3154470" localize="false"/>
 <paragraph role="heading" id="hd_id3152954" xml-lang="en-US" level="3" l10n="U" oldref="13">Rows</paragraph>
 <paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:NUMERICFIELD:DLG_INSERT_TABLE:ED_ROW">Enter the number of rows that you want in the table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155903" xml-lang="en-US" level="2" l10n="U" oldref="37">Options</paragraph>
 <paragraph role="paragraph" id="par_id3149694" xml-lang="en-US" l10n="U" oldref="41">Set the options for the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_HEADER" id="bm_id3155181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER" id="bm_id3155181" localize="false"/>
 <paragraph role="heading" id="hd_id3154198" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Heading</paragraph>
 <paragraph role="paragraph" id="par_id3155188" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_HEADER">Includes a heading row in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_REPEAT_HEADER" id="bm_id3143283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER" id="bm_id3143283" localize="false"/>
 <paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="CHG" oldref="38">Repeat heading</paragraph>
 <paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_REPEAT_HEADER">Repeats the heading of the table at the top of subsequent page if the table spans more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_INSERT_TABLE_NF_REPEAT_HEADER" id="bm_id227973" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER" id="bm_id227973" localize="false"/>
 <paragraph role="heading" id="par_idN10754" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
 <paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER">Select the number of rows that you want to use for the heading.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_DONT_SPLIT" id="bm_id3149100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT" id="bm_id3149100" localize="false"/>
 <paragraph role="heading" id="hd_id3149821" xml-lang="en-US" level="3" l10n="U" oldref="39">Do not split the table</paragraph>
 <paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_DONT_SPLIT">Prevents the table from spanning more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_INSERT_TABLE:CB_BORDER" id="bm_id3147097" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER" id="bm_id3147097" localize="false"/>
 <paragraph role="heading" id="hd_id3154838" xml-lang="en-US" level="3" l10n="U" oldref="40">Border</paragraph>
 <paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:CHECKBOX:DLG_INSERT_TABLE:CB_BORDER">Adds a border to the table cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT" id="bm_id3147226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT" id="bm_id3147226" localize="false"/>
 <paragraph role="heading" id="hd_id3147213" xml-lang="en-US" level="2" l10n="U" oldref="35">AutoFormat</paragraph>
 <paragraph role="paragraph" id="par_id3149036" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="autoformattext"><ahelp hid="SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp>
 </variable></paragraph>
@@ -107,6 +104,6 @@ dedr: reviewed</lastedited>
 <embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
 <embed href="text/shared/guide/border_table.xhp#border_table"/>
 <paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="U" oldref="52"><link href="text/swriter/01/05090300.xhp" name="Format - Table - Text Flow">Table - Table Properties - Text Flow</link></paragraph>
-<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Writer - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Writer - Table">%PRODUCTNAME Writer - Table</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04180400.xhp b/helpcontent2/source/text/swriter/01/04180400.xhp
index a08111a05d..68aeb25675 100644
--- a/helpcontent2/source/text/swriter/01/04180400.xhp
+++ b/helpcontent2/source/text/swriter/01/04180400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04180400.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,12 +58,12 @@
 <paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="U" oldref="8">For example, if you inserting address fields in a form letter from an address database, you can then exchange the database with another address database to insert different addresses.</paragraph>
 <paragraph role="heading" id="hd_id3149130" xml-lang="en-US" level="2" l10n="U" oldref="3">Exchanging Databases</paragraph>
 <paragraph role="paragraph" id="par_id3154651" xml-lang="en-US" l10n="U" oldref="4">You can only change one database at a time in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MODALDIALOG_DLG_CHANGE_DB" id="bm_id3149048" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_CHANGE_DB" id="bm_id3149048" localize="false"/>
 <paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="3" l10n="U" oldref="5">Databases in Use</paragraph>
 <paragraph role="paragraph" id="par_id3149053" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_MODALDIALOG_DLG_CHANGE_DB">Lists the databases that are currently in use.</ahelp> The current document contains at least one data field from each of the databases in the list.</paragraph><comment>UFI: removed double help id</comment>
 <paragraph role="heading" id="hd_id3147300" xml-lang="en-US" level="3" l10n="U" oldref="6">Available Databases</paragraph>
 <paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_MODALDIALOG_DLG_CHANGE_DB">Lists the databases that are registered in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CHANGE_DB_PB_ADDDB" id="bm_id9902035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CHANGE_DB:PB_ADDDB" id="bm_id9902035" localize="false"/>
 <paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="NEW"><ahelp hid="1419596301">Opens a file open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149349" xml-lang="en-US" level="2" l10n="U" oldref="7">Define</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04190000.xhp b/helpcontent2/source/text/swriter/01/04190000.xhp
index 67f1ca7788..d92407352e 100644
--- a/helpcontent2/source/text/swriter/01/04190000.xhp
+++ b/helpcontent2/source/text/swriter/01/04190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04190000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index 33bba3a007..49bcde53ed 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04200000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,47 +32,49 @@
  
 	
 <meta>
-<topic id="textswriter0104200000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Insert Script</title>
-<filename>/text/swriter/01/04200000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
+      <topic id="textswriter0104200000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Insert Script</title>
+         <filename>/text/swriter/01/04200000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertScript" id="bm_id3146320" localize="false"/>
-<paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Script</paragraph>
-<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="2"><variable id="scripttext"><ahelp hid=".uno:InsertScript">Inserts a script at the current cursor position in an HTML or text document.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3147402" role="heading" level="1" l10n="U" oldref="1">Insert Script</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155620" role="paragraph" l10n="U" oldref="2"><variable id="scripttext"><ahelp hid=".uno:InsertScript">Inserts a script at the current cursor position in an HTML or text document.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-<embed href="text/swriter/00/00000404.xhp#einfscript"/>
-</section>
-<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="U" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - HTML Document</emph> - <link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Notes </emph>check box. To edit a script, double-click the green rectangle.</paragraph>
-<paragraph role="paragraph" id="par_id3150572" xml-lang="en-US" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
-<paragraph role="paragraph" id="par_id0903200802541668" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
-<embed href="text/swriter/00/00000004.xhp#nopfli"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
-<paragraph role="paragraph" id="par_id0903200802541770" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
-<embed href="text/swriter/00/00000004.xhp#nopfre"/>
-<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="6">To specify if the script is printed at the end of the page or at the end of the document, choose <emph>File - Print - Options</emph>, and select the appropriate check box.</paragraph>
-<paragraph role="heading" id="hd_id3154644" xml-lang="en-US" level="2" l10n="U" oldref="7">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
-<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="3" l10n="U" oldref="9">Script Type</paragraph>
-<paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_TYPE">Enter the type of script that you want to insert.</ahelp> The script is identified in the HTML source code by the tag &lt;SCRIPT LANGUAGE="JavaScript"&gt;.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_JAVAEDIT:RB_URL" id="bm_id3149800" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_JAVAEDIT:ED_URL" id="bm_id3149803" localize="false"/>
-<paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="13">URL</paragraph>
-<paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_URL">Adds a link to a script file. Click the <emph>URL </emph>radio button, and then enter the link in the box. You can also click the browse button (<emph>...</emph>), locate the file, and then click <emph>Insert</emph>.</ahelp> The linked script file is identified in the HTML source code by the following tags:</paragraph>
-<paragraph role="paragraph" id="par_id3152963" xml-lang="en-US" l10n="U" oldref="15">&lt;SCRIPT LANGUAGE="JavaScript" SRC="url"&gt;</paragraph>
-<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="U" oldref="16">/* ignore all text here */</paragraph>
-<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="17">&lt;/SCRIPT&gt;</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_JAVAEDIT:PB_URL" id="bm_id3149692" localize="false"/>
-<paragraph role="heading" id="hd_id3155903" xml-lang="en-US" level="3" l10n="U" oldref="19">...</paragraph>
-<paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:DLG_JAVAEDIT:PB_URL">Locate the script file that you want to link to, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MULTILINEEDIT:DLG_JAVAEDIT:ED_EDIT" id="bm_id3149489" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_JAVAEDIT:RB_EDIT" id="bm_id3149493" localize="false"/>
-<paragraph role="heading" id="hd_id3155184" xml-lang="en-US" level="3" l10n="U" oldref="11">Text</paragraph>
-<paragraph role="paragraph" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_JAVAEDIT:RB_EDIT">Enter the script code that you want to insert.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000404.xhp#einfscript"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - <link href="text/shared/optionen/01040200.xhp" name="View">View</link></emph>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150572" role="paragraph" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0903200802541668" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
+      <embed href="text/swriter/00/00000004.xhp#nopfli"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0903200802541770" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
+      <embed href="text/swriter/00/00000004.xhp#nopfre"/>
+      <paragraph xml-lang="en-US" id="hd_id3154644" role="heading" level="2" l10n="U" oldref="7">Contents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Script Type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145413" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_TYPE">Enter the type of script that you want to insert.</ahelp> The script is identified in the HTML source code by the tag &lt;SCRIPT LANGUAGE="JavaScript"&gt;.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_JAVAEDIT:RB_URL" id="bm_id3149800" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_JAVAEDIT:ED_URL" id="bm_id3149803" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154097" role="heading" level="2" l10n="U"
+                 oldref="13">URL</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149810" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_URL">Adds a link to a script file. Click the <emph>URL </emph>radio button, and then enter the link in the box. You can also click the browse button (<emph>...</emph>), locate the file, and then click <emph>Insert</emph>.</ahelp> The linked script file is identified in the HTML source code by the following tags:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152963" role="paragraph" l10n="U" oldref="15">&lt;SCRIPT LANGUAGE="JavaScript" SRC="url"&gt;</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153678" role="paragraph" l10n="U" oldref="16">/* ignore all text here */</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154574" role="paragraph" l10n="U" oldref="17">&lt;/SCRIPT&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_JAVAEDIT:PB_URL" id="bm_id3149692" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155903" role="heading" level="2" l10n="U"
+                 oldref="19">...</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:DLG_JAVAEDIT:PB_URL">Locate the script file that you want to link to, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT" id="bm_id3149489" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_JAVAEDIT:RB_EDIT" id="bm_id3149493" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155184" role="heading" level="2" l10n="U"
+                 oldref="11">Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143272" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_JAVAEDIT:RB_EDIT">Enter the script code that you want to insert.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/04210000.xhp b/helpcontent2/source/text/swriter/01/04210000.xhp
index 12a448fc70..2d25e3a14e 100644
--- a/helpcontent2/source/text/swriter/01/04210000.xhp
+++ b/helpcontent2/source/text/swriter/01/04210000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04210000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,13 +35,13 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textswriter0104210000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Horizontal Ruler</title>
+<title id="tit" xml-lang="en-US">Insert Horizontal Rule</title>
 <filename>/text/swriter/01/04210000.xhp</filename>
 </topic>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/FN_INSERT_HRULER" id="bm_id7123888" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertGraphicRuler" id="bm_id3148768" localize="false"/><paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Insert Horizontal Ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertGraphicRuler" id="bm_id3148768" localize="false"/><paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Insert Horizontal Rule</paragraph>
 <paragraph role="paragraph" id="par_id3150758" xml-lang="en-US" l10n="U" oldref="2"><variable id="horizontaltext"><ahelp hid=".uno:InsertGraphicRuler">Inserts a horizontal line at the current cursor position.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/04220000.xhp b/helpcontent2/source/text/swriter/01/04220000.xhp
index c397708edd..b89cdc6edf 100644
--- a/helpcontent2/source/text/swriter/01/04220000.xhp
+++ b/helpcontent2/source/text/swriter/01/04220000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04220000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04230000.xhp b/helpcontent2/source/text/swriter/01/04230000.xhp
index 1c67d604ce..f997e8674e 100644
--- a/helpcontent2/source/text/swriter/01/04230000.xhp
+++ b/helpcontent2/source/text/swriter/01/04230000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04230000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/04990000.xhp b/helpcontent2/source/text/swriter/01/04990000.xhp
index b931b23608..06df5429c2 100755
--- a/helpcontent2/source/text/swriter/01/04990000.xhp
+++ b/helpcontent2/source/text/swriter/01/04990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04990000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05030200.xhp b/helpcontent2/source/text/swriter/01/05030200.xhp
index 1b8a1c8037..4580af1ab6 100755
--- a/helpcontent2/source/text/swriter/01/05030200.xhp
+++ b/helpcontent2/source/text/swriter/01/05030200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030200.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,52 +55,52 @@
 </section>
 <paragraph role="heading" id="hd_id3149882" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyphenation</paragraph>
 <paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="4">Specify the <link href="text/swriter/guide/using_hyphen.xhp" name="hyphenation">hyphenation</link> options for text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
 <paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
 <paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
 <paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
 <paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
 <paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
 <paragraph role="paragraph" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
 <paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
 <paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="43">Breaks</paragraph>
 <paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="44">Specify the page or column <link href="text/swriter/guide/page_break.xhp" name="break">break</link> options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
 <paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
 <paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK">Select this check box, and then select the break type that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
 <paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
 <paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE">Select the break type that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
 <paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
 <paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION">Select where you want to insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
 <paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
 <paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL">Select this check box, and then select the page style that you want to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
 <paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
 <paragraph role="paragraph" id="par_id3154837" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL">Select the formatting style to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
 <paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
 <paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM">Enter the page number that you want to appear on the first page after the break. If you want to use the current page numbering, select "0".</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3148978" xml-lang="en-US" level="2" l10n="U" oldref="13">Options</paragraph>
 <paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="14">Specify the text flow options for paragraphs that appear before and after a page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
 <paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER">Shifts the entire paragraph to the next page or column after a break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
 <paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3152779" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER">Keeps the current paragraph and the following paragraph together when a break or column break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
 <paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
 <paragraph role="paragraph" id="par_id3156279" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS">Specifies the minimum number of lines in a paragraph before a page break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the end of the page is less than the amount specified in the <emph>Lines </emph>box, the paragraph is shifted to the next page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
 <paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
 <paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS">Specifies the minimum number of lines in a paragraph in the first page after the break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the top of the page is less than the amount specified in the <emph>Lines </emph>box, the position of the break is adjusted.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05030400.xhp b/helpcontent2/source/text/swriter/01/05030400.xhp
index 0d0537e30f..d159127f85 100755
--- a/helpcontent2/source/text/swriter/01/05030400.xhp
+++ b/helpcontent2/source/text/swriter/01/05030400.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05030400.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,26 +55,26 @@
   <embed href="text/swriter/00/00000405.xhp#initialen"/>
 </section>
 <paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_DROPCAPS_CB_SWITCH" id="bm_id3146322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_DROPCAPS:CB_SWITCH" id="bm_id3146322" localize="false"/>
 <paragraph role="heading" id="hd_id3147295" xml-lang="en-US" level="3" l10n="U" oldref="5">Show Drop Caps</paragraph>
 <paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_DROPCAPS_CB_SWITCH">Applies the drop cap settings to the selected paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_DROPCAPS_CB_WORD" id="bm_id3145824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_DROPCAPS:CB_WORD" id="bm_id3145824" localize="false"/>
 <paragraph role="heading" id="hd_id3155626" xml-lang="en-US" level="3" l10n="U" oldref="19">Whole word</paragraph>
 <paragraph role="paragraph" id="par_id3154554" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_CHECKBOX_TP_DROPCAPS_CB_WORD">Displays the first letter of the first word in the paragraph as a drop cap, and the remaining letters of the word as large type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_DROPCAPS_FLD_DROPCAPS" id="bm_id3150020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS" id="bm_id3150020" localize="false"/>
 <paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="3" l10n="U" oldref="7">Number of characters</paragraph>
 <paragraph role="paragraph" id="par_id3149881" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_NUMERICFIELD_TP_DROPCAPS_FLD_DROPCAPS">Enter the number of characters to convert to drop caps. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_DROPCAPS_FLD_LINES" id="bm_id3148775" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_DROPCAPS:FLD_LINES" id="bm_id3148775" localize="false"/>
 <paragraph role="heading" id="hd_id3150932" xml-lang="en-US" level="3" l10n="U" oldref="9">Lines</paragraph>
 <paragraph role="paragraph" id="par_id3148391" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SW_NUMERICFIELD_TP_DROPCAPS_FLD_LINES">Enter the number of lines that you want the drop cap to extend downward from the first line of the paragraph. Shorter paragraphs will not get drop caps.</ahelp> The selection is limited to 2-9 lines.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_DROPCAPS_FLD_DISTANCE" id="bm_id3153920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_DROPCAPS:FLD_DISTANCE" id="bm_id3153920" localize="false"/>
 <paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="3" l10n="U" oldref="11">Distance from text</paragraph>
 <paragraph role="paragraph" id="par_id3153926" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_METRICFIELD_TP_DROPCAPS_FLD_DISTANCE">Enter the amount of space to leave between the drop caps and the rest of the text in the paragraph.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153723" xml-lang="en-US" level="2" l10n="U" oldref="13">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_DROPCAPS_EDT_TEXT" id="bm_id3147564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_DROPCAPS:EDT_TEXT" id="bm_id3147564" localize="false"/>
 <paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="3" l10n="U" oldref="15">Text</paragraph>
 <paragraph role="paragraph" id="par_id3147569" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_EDIT_TP_DROPCAPS_EDT_TEXT">Enter the text that you want to display as drop caps instead of the first letters of the paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_DROPCAPS_BOX_TEMPLATE" id="bm_id3156321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE" id="bm_id3156321" localize="false"/>
 <paragraph role="heading" id="hd_id3150763" xml-lang="en-US" level="3" l10n="U" oldref="17">Character Style</paragraph>
 <paragraph role="paragraph" id="par_id3151181" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_DROPCAPS_BOX_TEMPLATE">Select the formatting style that you want to apply to the drop caps.</ahelp> To use the formatting style of the current paragraph, select [None].</paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/swriter/01/05030800.xhp b/helpcontent2/source/text/swriter/01/05030800.xhp
index bb5b34e37b..1a51508da2 100755
--- a/helpcontent2/source/text/swriter/01/05030800.xhp
+++ b/helpcontent2/source/text/swriter/01/05030800.xhp
@@ -1,44 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
- ***********************************************************************
+***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    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.
- *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriter0105030800xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Outline &amp; Numbering</title>
@@ -57,50 +49,46 @@
       </section>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3153536" role="listitem" l10n="CHG" oldref="14">To change the numbering options for paragraphs that use the same paragraph style, choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles </emph>icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the<emph> Numbering</emph> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153536" role="listitem" l10n="CHG" oldref="14">To change the numbering options for paragraphs that use the same paragraph style, choose <emph>Format - Styles and </emph>Formatting, and then click the <emph>Paragraph Styles </emph>icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the<emph> Outline &amp; Numbering</emph> tab.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3154470" role="listitem" l10n="CHG" oldref="26">To change the numbering options for selected paragraphs, choose <emph>Format -</emph><link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link>, and then click the<emph> Numbering</emph> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154470" role="listitem" l10n="CHG" oldref="26">To change the numbering options for selected paragraphs, choose <emph>Format -</emph><link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link>, and then click the<emph> Outline &amp; Numbering</emph> tab.</paragraph>
          </listitem>
-      </list><comment>id="par_idN1067A" l10n="NEW"Link paragraph
-id="par_idN1067E" l10n="NEW"Select the outline level and numbering style that will be applied to the selected paragraphs.
-id="par_idN10681" l10n="NEW"Outline level
-id="par_idN10685" l10n="NEW"&lt;AVIS hid="."&gt;Select the outline level that you want to apply to the paragraph.&lt;/AVIS&gt;</comment>
-<bookmark xml-lang="en-US" branch="hid/878857741" id="bm_id1209200804144764" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="3" l10n="NEW">Outline level</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id120920080437117" role="paragraph" l10n="NEW">The paragraphs will be included in a <link href="text/swriter/01/04120211.xhp">table of contents</link> if you enable the <emph>Outline</emph> checkbox.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1209200804371134" role="paragraph" l10n="NEW">If you already assigned an <link href="text/swriter/01/06060100.xhp">outline numbering</link> to the paragraph or Paragraph Style, the <emph>Outline level</emph> list box is not available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="3" l10n="CHG"
+      </list>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_NUMPARA_LB_OUTLINE_LEVEL" id="bm_id1209200804144764" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2" l10n="NEW">Outline level</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
+      <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
+      <bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="CHG"
                  oldref="3">Numbering Style</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
+
       <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="7">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="3" l10n="U" oldref="8">Restart at this paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2" l10n="U" oldref="8">Restart at this paragraph</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="3" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2" l10n="U"
                  oldref="24">Start with</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="3" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="2" l10n="U"
                  oldref="10">"Start with" spin button</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START">Enter the number that you want to assign to the paragraph.</ahelp> The following paragraphs are numbered consecutively from the number that you enter here.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="2" l10n="U"
                  oldref="15">Line numbering</paragraph>
       <paragraph xml-lang="en-US" id="par_id3152771" role="paragraph" l10n="U" oldref="16">Specify the <link href="text/swriter/01/06180000.xhp" name="Line numbering">Line numbering</link> options. To add line numbers to your document, choose <emph>Tools - Line Numbering</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="3" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="2" l10n="U"
                  oldref="17">Include this paragraph in line numbering</paragraph>
       <paragraph xml-lang="en-US" id="par_id3156267" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA">Includes the current paragraph in the line numbering.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="3" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="2" l10n="U"
                  oldref="19">Restart at this paragraph</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="3" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="2" l10n="U"
                  oldref="21">Start with</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA">Enter the number at which to restart the line numbering</ahelp></paragraph>
    </body>
diff --git a/helpcontent2/source/text/swriter/01/05040000.xhp b/helpcontent2/source/text/swriter/01/05040000.xhp
index 81ad6bf375..bee26c8835 100644
--- a/helpcontent2/source/text/swriter/01/05040000.xhp
+++ b/helpcontent2/source/text/swriter/01/05040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05040500.xhp b/helpcontent2/source/text/swriter/01/05040500.xhp
index 6a6ee02e7b..04c7d95392 100644
--- a/helpcontent2/source/text/swriter/01/05040500.xhp
+++ b/helpcontent2/source/text/swriter/01/05040500.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040500.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,100 +32,116 @@
  
 	
 <meta>
-<topic id="textswriter0105040500xml" indexer="include">
-<title id="tit" xml-lang="en-US">Columns</title>
-<filename>/text/swriter/01/05040500.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="spalten">
+      <topic id="textswriter0105040500xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Columns</title>
+         <filename>/text/swriter/01/05040500.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="spalten">
 <bookmark xml-lang="en-US" branch="hid/FN_FORMAT_COLUMN" id="bm_id7831291" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormatColumns" id="bm_id3151243" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_TABLE_COLUMN" id="bm_id3150212" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_COLUMN" id="bm_id3153246" localize="false"/>
-<paragraph role="heading" id="hd_id3149875" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040500.xhp" name="Columns">Columns</link></paragraph>
-<paragraph role="paragraph" id="par_id3151392" xml-lang="en-US" l10n="U" oldref="2"><variable id="spaltentext"><ahelp hid="HID_COLUMN">Specifies the number of columns and the column layout for a page style, frame, or section.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/FN_FORMAT_PAGE_COLUMN_DLG" id="bm_id121220080934019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:PageColumnDialog" id="bm_id1212200809342598" localize="false"/><comment>added two Help IDs, see i97180</comment>
+<paragraph xml-lang="en-US" id="hd_id3149875" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040500.xhp" name="Columns">Columns</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151392" role="paragraph" l10n="U" oldref="2"><variable id="spaltentext"><ahelp hid="HID_COLUMN">Specifies the number of columns and the column layout for a page style, frame, or section.</ahelp>
 </variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#spaltens"/>
-</section>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">Default settings</paragraph>
-<paragraph role="paragraph" id="par_id3149352" xml-lang="en-US" l10n="U" oldref="4">You can select from predefined column layouts, or create your own. When you apply a layout to a page style, all pages that use the style are updated. Similarly, when you apply a column layout to a frame style, all frames that use that style are updated. You can also change the column layout for a single frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_COLUMN_ED_NUMBER" id="bm_id3154502" localize="false"/>
-<paragraph role="heading" id="hd_id3154562" xml-lang="en-US" level="3" l10n="U" oldref="5">Columns</paragraph>
-<paragraph role="paragraph" id="par_id3154508" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_NUMERICFIELD_TP_COLUMN_ED_NUMBER">Enter the number of columns that you want in the page, frame, or section.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149884" xml-lang="en-US" l10n="U" oldref="47">You can also select one of the predefined column layouts.</paragraph>
-<paragraph role="heading" id="hd_id3150933" xml-lang="en-US" level="3" l10n="U" oldref="45">Selection fields</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_COLUMN_CB_BALANCECOLS" id="bm_id3150568" localize="false"/>
-<paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="3" l10n="CHG" oldref="52">Evenly distribute contents to all columns</paragraph>
-<paragraph role="paragraph" id="par_id3149024" xml-lang="en-US" l10n="CHG" oldref="53"><ahelp hid="." visibility="hidden">Distributes the text in multi-column sections. The text flows into all columns to the same height. The height of the section adjusts automatically.</ahelp>Evenly distributes the text in <link href="text/swriter/01/04020000.xhp" name="multi-column sections">multi-column sections</link>.</paragraph>
-<paragraph role="heading" id="hd_id3153924" xml-lang="en-US" level="2" l10n="U" oldref="19">Width and spacing</paragraph>
-<paragraph role="paragraph" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="20">If the <emph>Automatic width</emph> check box is selected, enter the width and spacing options for the columns.</paragraph>
-<paragraph role="heading" id="hd_id3147562" xml-lang="en-US" level="3" l10n="U" oldref="21">(Column number)</paragraph>
-<paragraph role="paragraph" id="par_id3145206" xml-lang="en-US" l10n="U" oldref="22">Displays the column number, as well as width and distance to the adjacent columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_COLUMN_BTN_DOWN" id="bm_id3151189" localize="false"/>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="23">Left Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3150761" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_DOWN">Moves the column display one column to the left.</ahelp></paragraph>
-<table id="tbl_id3150256">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="E">
-<image id="img_id3149750" src="res/sc06301.png" width="0.564cm" height="0.564cm"><alt id="alt_id3149750" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#spaltens"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3155625" role="heading" level="2" l10n="U" oldref="3">Default settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149352" role="paragraph" l10n="U" oldref="4">You can select from predefined column layouts, or create your own. When you apply a layout to a page style, all pages that use the style are updated. Similarly, when you apply a column layout to a frame style, all frames that use that style are updated. You can also change the column layout for a single frame.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_COLUMN:ED_NUMBER" id="bm_id3154502" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_COLUMN_VALUESET" id="bm_id1212200810184474" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154562" role="heading" level="3" l10n="U" oldref="5">Columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154508" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW_NUMERICFIELD_TP_COLUMN_ED_NUMBER">Enter the number of columns that you want in the page, frame, or section.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="47">You can also select one of the predefined column layouts.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150933" role="heading" level="3" l10n="U"
+                 oldref="45">Selection fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_COLUMN:CB_BALANCECOLS" id="bm_id3150568" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148386" role="heading" level="3" l10n="CHG"
+                 oldref="52">Evenly distribute contents to all columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149024" role="paragraph" l10n="CHG" oldref="53"><ahelp hid="." visibility="hidden">Distributes the text in multi-column sections. The text flows into all columns to the same height. The height of the section adjusts automatically.</ahelp>Evenly distributes the text in <link href="text/swriter/01/04020000.xhp" name="multi-column sections">multi-column sections</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153924" role="heading" level="2" l10n="U"
+                 oldref="19">Width and spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147176" role="paragraph" l10n="CHG" oldref="20">If the <emph>Automatic width</emph> check box is not selected, enter the width and spacing options for the columns.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147562" role="heading" level="3" l10n="U"
+                 oldref="21">(Column number)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145206" role="paragraph" l10n="U" oldref="22">Displays the column number, as well as width and distance to the adjacent columns.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_COLUMN:BTN_DOWN" id="bm_id3151189" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="3" l10n="U"
+                 oldref="23">Left Arrow</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150761" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_DOWN">Moves the column display one column to the left.</ahelp></paragraph>
+      <table id="tbl_id3150256">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149287" role="paragraph" l10n="E">
+<image id="img_id3149750" src="res/sc06301.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149750">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154694" xml-lang="en-US" l10n="U" oldref="48">Left Arrow</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154694" role="paragraph" l10n="U" oldref="48">Left Arrow</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_COLUMN_BTN_UP" id="bm_id3147515" localize="false"/>
-<paragraph role="heading" id="hd_id3145421" xml-lang="en-US" level="3" l10n="U" oldref="25">Right Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3153576" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_UP">Moves the column display one column to the right.</ahelp></paragraph>
-<table id="tbl_id3154279">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="E">
-<image id="img_id3152948" src="res/sc06300.png" width="0.564cm" height="0.564cm"><alt id="alt_id3152948" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_COLUMN:BTN_UP" id="bm_id3147515" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145421" role="heading" level="3" l10n="U"
+                 oldref="25">Right Arrow</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153576" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW_IMAGEBUTTON_TP_COLUMN_BTN_UP">Moves the column display one column to the right.</ahelp></paragraph>
+      <table id="tbl_id3154279">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152938" role="paragraph" l10n="E">
+<image id="img_id3152948" src="res/sc06300.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3152948">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153540" xml-lang="en-US" l10n="U" oldref="49">Right Arrow</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153540" role="paragraph" l10n="U" oldref="49">Right Arrow</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_1" id="bm_id3154481" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_2" id="bm_id3152953" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_3" id="bm_id3152956" localize="false"/>
-<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="42">Width</paragraph>
-<paragraph role="paragraph" id="par_id3152963" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_3">Enter the width of the column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_DIST1" id="bm_id3151319" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_DIST2" id="bm_id3153665" localize="false"/>
-<paragraph role="heading" id="hd_id3151308" xml-lang="en-US" level="3" l10n="U" oldref="7">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_DIST2">Enter the amount of space that you want to leave between the columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_COLUMN_CB_AUTO_WIDTH" id="bm_id3154573" localize="false"/>
-<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="CHG" oldref="9">AutoWidth</paragraph>
-<paragraph role="paragraph" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_COLUMN_CB_AUTO_WIDTH">Creates columns of equal width.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="44">The column layout preview only shows the columns and not the surrounding page.</paragraph>
-<paragraph role="heading" id="hd_id3149685" xml-lang="en-US" level="2" l10n="U" oldref="11">Separator line</paragraph>
-<paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="12">This area is only available if your layout contains more than one column.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_STYLE" id="bm_id3155786" localize="false"/>
-<paragraph role="heading" id="hd_id3155775" xml-lang="en-US" level="3" l10n="U" oldref="13">Line</paragraph>
-<paragraph role="paragraph" id="par_id3159190" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_STYLE">Select the formatting style for the column separator line. If you do not want a separator line, choose "None".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_COLUMN_ED_HEIGHT" id="bm_id3149303" localize="false"/>
-<paragraph role="heading" id="hd_id3155184" xml-lang="en-US" level="3" l10n="U" oldref="15">Height</paragraph>
-<paragraph role="paragraph" id="par_id3149309" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_HEIGHT">Enter the length of the separator line as a percentage of the height of the column area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_POSITION" id="bm_id3143283" localize="false"/>
-<paragraph role="heading" id="hd_id3143271" xml-lang="en-US" level="3" l10n="U" oldref="17">Position</paragraph>
-<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_POSITION">Select the vertical alignment of the separator line. This option is only available if <emph>Height</emph> value of the line is less than 100%.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO" id="bm_id3151258" localize="false"/>
-<paragraph role="heading" id="hd_id3151248" xml-lang="en-US" level="2" l10n="U" oldref="50">Apply to</paragraph>
-<paragraph role="paragraph" id="par_id3154827" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO">Select the item that you want to apply the column layout to.</ahelp> This option is only available if you access this dialog by choosing <emph>Format - Columns</emph>.</paragraph>
-<section id="textflow">
-<embed href="text/shared/01/05030700.xhp#textflow"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_1" id="bm_id3154481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_2" id="bm_id3152953" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_3" id="bm_id3152956" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154470" role="heading" level="3" l10n="U"
+                 oldref="42">Width</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152963" role="paragraph" l10n="U" oldref="43"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_3">Enter the width of the column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_DIST1" id="bm_id3151319" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_DIST2" id="bm_id3153665" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151308" role="heading" level="3" l10n="U" oldref="7">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153672" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_DIST2">Enter the amount of space that you want to leave between the columns.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH" id="bm_id3154573" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147530" role="heading" level="3" l10n="CHG"
+                 oldref="9">AutoWidth</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150986" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_COLUMN_CB_AUTO_WIDTH">Creates columns of equal width.</ahelp></paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+      <paragraph xml-lang="en-US" id="par_id3155892" role="paragraph" l10n="U" oldref="44">The column layout preview only shows the columns and not the surrounding page.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149685" role="heading" level="2" l10n="U"
+                 oldref="11">Separator line</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="12">This area is only available if your layout contains more than one column.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_COLUMN:LB_STYLE" id="bm_id3155786" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155775" role="heading" level="3" l10n="U"
+                 oldref="13">Line</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159190" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_STYLE">Select the formatting style for the column separator line. If you do not want a separator line, choose "None".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_COLUMN:ED_HEIGHT" id="bm_id3149303" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155184" role="heading" level="3" l10n="U"
+                 oldref="15">Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149309" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW_METRICFIELD_TP_COLUMN_ED_HEIGHT">Enter the length of the separator line as a percentage of the height of the column area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_COLUMN:LB_POSITION" id="bm_id3143283" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3143271" role="heading" level="3" l10n="U"
+                 oldref="17">Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_COLUMN_LB_POSITION">Select the vertical alignment of the separator line. This option is only available if <emph>Height</emph> value of the line is less than 100%.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_COLUMN:LB_APPLY_TO" id="bm_id3151258" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151248" role="heading" level="2" l10n="U"
+                 oldref="50">Apply to</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154827" role="paragraph" l10n="U" oldref="51"><ahelp hid="SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO">Select the item that you want to apply the column layout to.</ahelp> This option is only available if you access this dialog by choosing <emph>Format - Columns</emph>.</paragraph>
+      <section id="textflow">
+         <embed href="text/shared/01/05030700.xhp#textflow"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05040501.xhp b/helpcontent2/source/text/swriter/01/05040501.xhp
index 0a8640793f..53d0a3eabd 100755
--- a/helpcontent2/source/text/swriter/01/05040501.xhp
+++ b/helpcontent2/source/text/swriter/01/05040501.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040501.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05040600.xhp b/helpcontent2/source/text/swriter/01/05040600.xhp
index c3410d17bf..c16b1d09ba 100644
--- a/helpcontent2/source/text/swriter/01/05040600.xhp
+++ b/helpcontent2/source/text/swriter/01/05040600.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05040600.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,58 +27,59 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
 <meta>
-<topic id="textswriter0105040600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Footnote</title>
-<filename>/text/swriter/01/05040600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-04-28T11:07:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="fussnote">
+      <topic id="textswriter0105040600xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Footnote</title>
+         <filename>/text/swriter/01/05040600.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="fussnote">
 <bookmark xml-lang="en-US" branch="hid/HID_FOOTNOTE_PAGE" id="bm_id3151390" localize="false"/>
-<paragraph role="heading" id="hd_id3154767" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040600.xhp" name="Footnote">Footnote</link></paragraph>
-<paragraph role="paragraph" id="par_id3149351" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FOOTNOTE_PAGE">Specifies the layout options for footnotes, including the line that separates the footnote from the main body of document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#fussnoteform"/>
-</section>
-<paragraph role="note" id="par_id3151185" xml-lang="en-US" l10n="U" oldref="23">This tab is not available in <link href="text/swriter/01/03130000.xhp" name="Print Layout">Print Layout</link> view.</paragraph>
-
-<paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="2" l10n="U" oldref="3">Footnote area</paragraph>
-<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="U" oldref="4">Set the height of the footnote area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE" id="bm_id3147509" localize="false"/>
-<paragraph role="heading" id="hd_id3145412" xml-lang="en-US" level="3" l10n="U" oldref="5">Not larger than page area</paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
-<paragraph role="heading" id="hd_id3154099" xml-lang="en-US" level="3" l10n="U" oldref="7">Maximum Footnote Height</paragraph>
-<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT">Sets a maximum height for the footnote area. Select this check box, and then enter the height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
-<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="9">Maximum Footnote Height</paragraph>
-<paragraph role="paragraph" id="par_id3154568" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT">Enter the maximum height for the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
-<paragraph role="heading" id="hd_id3151318" xml-lang="en-US" level="3" l10n="U" oldref="11">Distance from text</paragraph>
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155897" xml-lang="en-US" level="2" l10n="U" oldref="13">Separator Line</paragraph>
-<paragraph role="paragraph" id="par_id3149689" xml-lang="en-US" l10n="U" oldref="14">Specifies the position and length of the separator line.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS" id="bm_id3155177" localize="false"/>
-<paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="3" l10n="U" oldref="15">Position</paragraph>
-<paragraph role="paragraph" id="par_id3155184" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS">Select the horizontal alignment for the line that separates the main text from the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH" id="bm_id3149492" localize="false"/>
-<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="3" l10n="U" oldref="17">Length</paragraph>
-<paragraph role="paragraph" id="par_id3154827" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH">Enter the length of the separator line as a percentage of the page width area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098" localize="false"/>
-<paragraph role="heading" id="hd_id3151253" xml-lang="en-US" level="3" l10n="U" oldref="19">Weight</paragraph>
-<paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the formatting style for the separator line. If you do not want a separator line, choose "0.0 pt".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098" localize="false"/>
-<paragraph role="heading" id="hd_id3149828" xml-lang="en-US" level="3" l10n="U" oldref="21">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST">Enter the amount of space to leave between the separator line and the first line of the footnote area.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3155145" xml-lang="en-US" l10n="U" oldref="24">To specify the spacing between two footnotes, choose <emph>Format - Paragraph, and then click the Indents and Spacing </emph>tab.</paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154767" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040600.xhp" name="Footnote">Footnote</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149351" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FOOTNOTE_PAGE">Specifies the layout options for footnotes, including the line that separates the footnote from the main body of document.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#fussnoteform"/>
+      </section><comment>removed a note</comment>
+<paragraph xml-lang="en-US" id="hd_id3154646" role="heading" level="2" l10n="U" oldref="3">Footnote area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151168" role="paragraph" l10n="U" oldref="4">Set the height of the footnote area.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE" id="bm_id3147509" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145412" role="heading" level="2" l10n="U" oldref="5">Not larger than page area</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147514" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154099" role="heading" level="2" l10n="U" oldref="7">Maximum Footnote Height</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid=".">Sets a maximum height for the footnote area. Enable this option, then enter the height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT">Enter the maximum height for the footnote area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151318" role="heading" level="2" l10n="U"
+                 oldref="11">Distance from text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155897" role="heading" level="2" l10n="U"
+                 oldref="13">Separator Line</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149689" role="paragraph" l10n="U" oldref="14">Specifies the position and length of the separator line.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS" id="bm_id3155177" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154194" role="heading" level="2" l10n="U"
+                 oldref="15">Position</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155184" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS">Select the horizontal alignment for the line that separates the main text from the footnote area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH" id="bm_id3149492" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3143284" role="heading" level="2" l10n="U"
+                 oldref="17">Length</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154827" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH">Enter the length of the separator line as a percentage of the page width area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="2" l10n="U"
+                 oldref="19">Weight</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the formatting style for the separator line. If you do not want a separator line, choose "0.0 pt".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149828" role="heading" level="2" l10n="U"
+                 oldref="21">Spacing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148970" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST">Enter the amount of space to leave between the separator line and the first line of the footnote area.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155145" role="tip" l10n="CHG" oldref="24">To specify the spacing between two footnotes, choose <item type="menuitem">Format - Paragraph</item>, and then click the <emph>Indents &amp; Spacing</emph> tab.</paragraph>
+      <embed href="text/shared/00/00000001.xhp#vorschau"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05040700.xhp b/helpcontent2/source/text/swriter/01/05040700.xhp
index dccac58c23..6196beb60f 100644
--- a/helpcontent2/source/text/swriter/01/05040700.xhp
+++ b/helpcontent2/source/text/swriter/01/05040700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040700.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,34 +50,34 @@
 </section>
   <paragraph xml-lang="en-US" role="note" id="par_id3149800" l10n="U" oldref="3">This tab is not available in <link href="text/swriter/01/03130000.xhp" name="Print Layout">Print Layout</link> view.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3153538" l10n="U" xml-lang="en-US" oldref="4">Footnotes</paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" xml-lang="en-US" id="bm_id3154572"/><paragraph role="heading" level="3" id="hd_id3154480" l10n="U" xml-lang="en-US" oldref="5">Collect at end of text</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" xml-lang="en-US" id="bm_id3154572"/><paragraph role="heading" level="3" id="hd_id3154480" l10n="U" xml-lang="en-US" oldref="5">Collect at end of text</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3151309" xml-lang="en-US" oldref="11"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND" visibility="visible">Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear.</ahelp></paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" xml-lang="en-US" id="bm_id3153671"/><paragraph role="heading" level="3" id="hd_id3152960" l10n="U" xml-lang="en-US" oldref="6">Restart numbering</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" xml-lang="en-US" id="bm_id3153671"/><paragraph role="heading" level="3" id="hd_id3152960" l10n="U" xml-lang="en-US" oldref="6">Restart numbering</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153677" xml-lang="en-US" oldref="12"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM" visibility="visible">Restarts the footnote numbering at the number that you specify.</ahelp></paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" xml-lang="en-US" id="bm_id3154190"/><paragraph role="heading" level="3" id="hd_id3149688" l10n="U" xml-lang="en-US" oldref="13">Start at</paragraph>
+  <bookmark branch="hid/sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" xml-lang="en-US" id="bm_id3154190"/><paragraph role="heading" level="3" id="hd_id3149688" l10n="U" xml-lang="en-US" oldref="13">Start at</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3154196" xml-lang="en-US" oldref="14"><ahelp hid="SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET" visibility="visible">Enter the number that you want to assign the footnote.</ahelp></paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" xml-lang="en-US" id="bm_id3143277"/><paragraph role="heading" level="3" id="hd_id3155185" l10n="U" xml-lang="en-US" oldref="15">Custom format</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" xml-lang="en-US" id="bm_id3143277"/><paragraph role="heading" level="3" id="hd_id3155185" l10n="U" xml-lang="en-US" oldref="15">Custom format</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3143283" oldref="16"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT" visibility="visible">Specifies a custom numbering format for footnotes.</ahelp> This check box is only available if the <emph>Restart numbering</emph> check box is selected.</paragraph>
-  <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" xml-lang="en-US" id="bm_id3149821"/><paragraph role="heading" level="3" id="hd_id3151258" l10n="U" xml-lang="en-US" oldref="17">Before</paragraph>
+  <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" xml-lang="en-US" id="bm_id3149821"/><paragraph role="heading" level="3" id="hd_id3151258" l10n="U" xml-lang="en-US" oldref="17">Before</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149827" xml-lang="en-US" oldref="18"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX" visibility="visible">Enter the text that you want to display in front of the footnote number.</ahelp></paragraph>
-  <bookmark branch="hid/SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" xml-lang="en-US" id="bm_id3154839"/><paragraph role="heading" level="3" id="hd_id3154827" l10n="U" xml-lang="en-US" oldref="19">Spin button own format</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" xml-lang="en-US" id="bm_id3154839"/><paragraph role="heading" level="3" id="hd_id3154827" l10n="U" xml-lang="en-US" oldref="19">Spin button own format</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147092" xml-lang="en-US" oldref="20"><ahelp hid="SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW" visibility="visible">Select the numbering style for the footnotes.</ahelp></paragraph>
-  <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" xml-lang="en-US" id="bm_id3147215"/><paragraph role="heading" level="3" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="21">After</paragraph>
+  <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" xml-lang="en-US" id="bm_id3147215"/><paragraph role="heading" level="3" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="21">After</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147221" xml-lang="en-US" oldref="22"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX" visibility="visible">Enter the text that you want to display after the footnote number.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3149044" l10n="U" xml-lang="en-US" oldref="7">Endnotes</paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" xml-lang="en-US" id="bm_id3147579"/><paragraph role="heading" level="3" id="hd_id3153639" l10n="U" xml-lang="en-US" oldref="8">Collect at end of section</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" xml-lang="en-US" id="bm_id3147579"/><paragraph role="heading" level="3" id="hd_id3153639" l10n="U" xml-lang="en-US" oldref="8">Collect at end of section</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147585" xml-lang="en-US" oldref="24"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND" visibility="visible">Adds endnotes at the end of the section.</ahelp></paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM" xml-lang="en-US" id="bm_id3155145"/><paragraph role="heading" level="3" id="hd_id3152780" l10n="U" xml-lang="en-US" oldref="9">Restart numbering</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM" xml-lang="en-US" id="bm_id3155145"/><paragraph role="heading" level="3" id="hd_id3152780" l10n="U" xml-lang="en-US" oldref="9">Restart numbering</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3153345" xml-lang="en-US" oldref="25"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM" visibility="visible">Restarts the endnote numbering at the number that you specify.</ahelp></paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3149166" l10n="U" xml-lang="en-US" oldref="26">Start at</paragraph>
+  <bookmark branch="hid/sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3149166" l10n="U" xml-lang="en-US" oldref="26">Start at</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3156270" xml-lang="en-US" oldref="27"><ahelp hid="SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET" visibility="visible">Enter the number that you want to assign the endnote.</ahelp></paragraph>
-  <bookmark branch="hid/SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" xml-lang="en-US" id="bm_id3151040"/><paragraph role="heading" level="3" id="hd_id3151027" l10n="U" xml-lang="en-US" oldref="28">Custom format</paragraph>
+  <bookmark branch="hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" xml-lang="en-US" id="bm_id3151040"/><paragraph role="heading" level="3" id="hd_id3151027" l10n="U" xml-lang="en-US" oldref="28">Custom format</paragraph>
   <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3145776" oldref="29"><ahelp hid="SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT" visibility="visible">Specifies a custom numbering format for endnotes.</ahelp> This check box is only available if you the <emph>Restart numbering</emph> check box is selected.</paragraph>
-  <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" xml-lang="en-US" id="bm_id3155915"/><paragraph role="heading" level="3" id="hd_id3151383" l10n="U" xml-lang="en-US" oldref="30">Before</paragraph>
+  <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" xml-lang="en-US" id="bm_id3155915"/><paragraph role="heading" level="3" id="hd_id3151383" l10n="U" xml-lang="en-US" oldref="30">Before</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155921" xml-lang="en-US" oldref="31"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_PREFIX" visibility="visible">Enter the text that you want to display in front of the endnote number</ahelp></paragraph>
-  <bookmark branch="hid/SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" xml-lang="en-US" id="bm_id3150118"/><paragraph role="heading" level="3" id="hd_id3150699" l10n="U" xml-lang="en-US" oldref="32">Spin button own format</paragraph>
+  <bookmark branch="hid/sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" xml-lang="en-US" id="bm_id3150118"/><paragraph role="heading" level="3" id="hd_id3150699" l10n="U" xml-lang="en-US" oldref="32">Spin button own format</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150123" xml-lang="en-US" oldref="33"><ahelp hid="SW:LISTBOX:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW" visibility="visible">Select the numbering style for the endnotes.</ahelp></paragraph>
-  <bookmark branch="hid/SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" xml-lang="en-US" id="bm_id3147419"/><paragraph role="heading" level="3" id="hd_id3155871" l10n="U" xml-lang="en-US" oldref="34">After</paragraph>
+  <bookmark branch="hid/sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" xml-lang="en-US" id="bm_id3147419"/><paragraph role="heading" level="3" id="hd_id3155871" l10n="U" xml-lang="en-US" oldref="34">After</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147425" xml-lang="en-US" oldref="35"><ahelp hid="SW:EDIT:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX" visibility="visible">Enter the text that you want to display after the endnote number.</ahelp></paragraph>
   
  </body>
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index bf75bf9aaa..f59dabfd5f 100755
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05040800.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,46 +36,42 @@
 <title id="tit" xml-lang="en-US">Text Grid</title>
 <filename>/text/swriter/01/05040800.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T10:22:55">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="textraster">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3150760" xml-lang="en-US" level="1" l10n="U" oldref="18"><link href="text/swriter/01/05040800.xhp" name="Text Grid">Text Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Tools - Options - Language Settings - Languages</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Language Settings - Languages</emph> in the Options dialog box.</ahelp></paragraph>
 </section>
 <embed href="text/shared/00/00000007.xhp#asiahinweis"/>
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#textraster"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_NOGRID" id="bm_id3145579" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_LINESGRID" id="bm_id3145584" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_CHARSGRID" id="bm_id3145588" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID" id="bm_id3145579" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID" id="bm_id3145584" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID" id="bm_id3145588" localize="false"/>
 <paragraph role="heading" id="hd_id3154101" xml-lang="en-US" level="2" l10n="U" oldref="16">Grid</paragraph>
 <paragraph role="paragraph" id="par_id3149805" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW_RADIOBUTTON_TP_TEXTGRID_PAGE_RB_CHARSGRID">Adds or removes a text grid for lines or characters to the current page style.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153537" xml-lang="en-US" level="2" l10n="U" oldref="14">Grid layout</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_LINESPERPAGE" id="bm_id3154570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE" id="bm_id3154570" localize="false"/>
 <paragraph role="heading" id="hd_id3154478" xml-lang="en-US" level="3" l10n="U" oldref="12">Lines per page</paragraph>
 <paragraph role="paragraph" id="par_id3151308" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_LINESPERPAGE">Enter the maximum number of lines that you want on a page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_CHARSPERLINE" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE" id="bm_id3153668" localize="false"/>
 <paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="U" oldref="10">Characters per line</paragraph>
 <paragraph role="paragraph" id="par_id3153674" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_NUMERICFIELD_TP_TEXTGRID_PAGE_NF_CHARSPERLINE">Enter the maximum number of characters that you want on a line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_TEXTSIZE" id="bm_id3149696" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE" id="bm_id3149696" localize="false"/>
 <paragraph role="heading" id="hd_id3149684" xml-lang="en-US" level="3" l10n="U" oldref="8">Max. base text size</paragraph>
 <paragraph role="paragraph" id="par_id3154193" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_TEXTSIZE">Enter the maximum base text size. A large value results in less characters per line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_RUBYSIZE" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE" id="bm_id3143276" localize="false"/>
 <paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="6">Max. Ruby text size</paragraph>
 <paragraph role="paragraph" id="par_id3143283" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW_METRICFIELD_TP_TEXTGRID_PAGE_MF_RUBYSIZE">Enter the font size for the Ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_RUBYBELOW" id="bm_id3151259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW" id="bm_id3151259" localize="false"/>
 <paragraph role="heading" id="hd_id3149496" xml-lang="en-US" level="3" l10n="U" oldref="4">Ruby text below/left from base text</paragraph>
 <paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_RUBYBELOW">Displays Ruby text to the left of or below the base text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_DISPLAY" id="bm_id3154828" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TEXTGRID_PAGE_CB_PRINT" id="bm_id3154832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_TEXTGRID_PAGE_LB_COLOR" id="bm_id3154836" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY" id="bm_id3154828" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT" id="bm_id3154832" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR" id="bm_id3154836" localize="false"/>
 <paragraph role="heading" id="hd_id3149100" xml-lang="en-US" level="2" l10n="U" oldref="2">Grid display</paragraph>
 <paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="1"><ahelp hid="SW_LISTBOX_TP_TEXTGRID_PAGE_LB_COLOR">Specifies the printing and color options of the text grid.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05060000.xhp b/helpcontent2/source/text/swriter/01/05060000.xhp
index 62e8d71206..24833d0e83 100644
--- a/helpcontent2/source/text/swriter/01/05060000.xhp
+++ b/helpcontent2/source/text/swriter/01/05060000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05060100.xhp b/helpcontent2/source/text/swriter/01/05060100.xhp
index 8136edad04..8dcf7f9a44 100644
--- a/helpcontent2/source/text/swriter/01/05060100.xhp
+++ b/helpcontent2/source/text/swriter/01/05060100.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 05060100.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,18 +29,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0105060100xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Type</title>
 <filename>/text/swriter/01/05060100.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-26T15:24:37">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
-YJ:checked</lastedited>
-</history>
 </meta>
 <body>
 <section id="typ">
@@ -58,86 +50,86 @@ YJ:checked</lastedited>
   <embed href="text/swriter/00/00000405.xhp#grafiktyp"/>
 </section>
 <paragraph role="heading" id="hd_id3147168" xml-lang="en-US" level="2" l10n="U" oldref="3">Size</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_WIDTH" id="bm_id3150761" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_WIDTH" id="bm_id9134495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_WIDTH" id="bm_id3150761" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH" id="bm_id9134495" localize="false"/>
 <paragraph role="heading" id="hd_id3147567" xml-lang="en-US" level="3" l10n="U" oldref="5">Width</paragraph>
 <paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_WIDTH">Enter the width that you want for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH" id="bm_id3151177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH" id="bm_id3151177" localize="false"/>
 <paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
 <paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH">Calculates the width of the selected object as a percentage of the width of the page text area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT" id="bm_id3152948" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HEIGHT" id="bm_id9007232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_HEIGHT" id="bm_id3152948" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT" id="bm_id9007232" localize="false"/>
 <paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="3" l10n="U" oldref="9">Height</paragraph>
 <paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT">Enter the height that you want for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT" id="bm_id3153535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT" id="bm_id3153535" localize="false"/>
 <paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="11">Relative</paragraph>
 <paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT">Calculates the height of the selected object as a percentage of the height of the page text area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_FIXEDRATIO" id="bm_id3153668" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_KEEPRATIO" id="bm_id7496566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO" id="bm_id3153668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO" id="bm_id7496566" localize="false"/>
 <paragraph role="heading" id="hd_id3151313" xml-lang="en-US" level="3" l10n="U" oldref="13">Keep ratio</paragraph>
 <paragraph role="paragraph" id="par_id3153675" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_FIXEDRATIO">Maintains the height and width ratio when you change the width or the height setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_FRM_STD:BT_REALSIZE" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FRM_STD:BT_REALSIZE" id="bm_id3154482" localize="false"/>
 <paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="41">Original Size</paragraph>
 <paragraph role="paragraph" id="par_id3155898" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:PUSHBUTTON:TP_FRM_STD:BT_REALSIZE">Resets the size settings of the selected object to the original values.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="44">This option is not available for frames.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_AUTOHEIGHT" id="bm_id3151255" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_AUTOWIDTH" id="bm_id358592" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT" id="bm_id3151255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH" id="bm_id358592" localize="false"/>
 <paragraph role="heading" id="hd_id3149824" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_AUTOHEIGHT">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</ahelp></paragraph>
 <paragraph role="note" id="par_id3152773" xml-lang="en-US" l10n="CHG" oldref="43">The <emph>Automatic</emph> option is only available when you select a frame.</paragraph>
 <paragraph role="heading" id="hd_id3155144" xml-lang="en-US" level="2" l10n="U" oldref="17">Anchor</paragraph>
 <paragraph role="paragraph" id="par_id3153352" xml-lang="en-US" l10n="CHG" oldref="18">Specify the anchoring options for the selected object or frame. The anchor options are not available when you open the dialog from the Styles and Formatting window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PAGE" id="bm_id3156280" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPAGE" id="bm_id8638874" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE" id="bm_id3156280" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE" id="bm_id8638874" localize="false"/>
 <paragraph role="heading" id="hd_id3156269" xml-lang="en-US" level="3" l10n="U" oldref="45">To page</paragraph>
 <paragraph role="paragraph" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PAGE">Anchors the selection to the current page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PARA" id="bm_id3145771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPARA" id="bm_id5567796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA" id="bm_id3145771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA" id="bm_id5567796" localize="false"/>
 <paragraph role="heading" id="hd_id3151028" xml-lang="en-US" level="3" l10n="U" oldref="60">To paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3145777" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_PARA">Anchors the selection to the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AT_CHAR" id="bm_id3151370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOCHAR" id="bm_id89419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR" id="bm_id3151370" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR" id="bm_id89419" localize="false"/>
 <paragraph role="heading" id="hd_id3155913" xml-lang="en-US" level="3" l10n="U" oldref="62">To character</paragraph>
 <paragraph role="paragraph" id="par_id3151377" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AT_CHAR">Anchors the selection to a character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AS_CHAR" id="bm_id3155856" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_ASCHAR" id="bm_id2176274" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR" id="bm_id3155856" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR" id="bm_id2176274" localize="false"/>
 <paragraph role="heading" id="hd_id3150115" xml-lang="en-US" level="3" l10n="U" oldref="47">As character</paragraph>
 <paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_RADIOBUTTON_TP_FRM_STD_RB_ANCHOR_AS_CHAR">Anchors the selection as character. The height of the current line is resized to match the height of the selection.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="25">Position</paragraph>
 <paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="U" oldref="26">Specify the location of the selected object on the current page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:DLB_HORIZONTAL" id="bm_id3147500" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORI" id="bm_id2376781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL" id="bm_id3147500" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI" id="bm_id2376781" localize="false"/>
 <paragraph role="heading" id="hd_id3147488" xml-lang="en-US" level="3" l10n="U" oldref="27">Horizontal</paragraph>
 <paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FRM_STD:DLB_HORIZONTAL">Select the horizontal alignment option for the object.</ahelp> This option is not available if you chose "anchor as character".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS" id="bm_id3149565" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HORIBY" id="bm_id8156682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS" id="bm_id3149565" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY" id="bm_id8156682" localize="false"/>
 <paragraph role="heading" id="hd_id3149554" xml-lang="en-US" level="3" l10n="U" oldref="29">by</paragraph>
 <paragraph role="paragraph" id="par_id3145258" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS">Enter the amount of space to leave between the left edge of the selected object and the reference point that you select in the <emph>To</emph> box.</ahelp> This option is only available if you select "From Left" in the <emph>Horizontal</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION" id="bm_id3150556" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORITO" id="bm_id3423566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:LB_HORI_RELATION" id="bm_id3150556" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO" id="bm_id3423566" localize="false"/>
 <paragraph role="heading" id="hd_id3150545" xml-lang="en-US" level="3" l10n="U" oldref="48">to</paragraph>
 <paragraph role="paragraph" id="par_id3149213" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION">Select the reference point for the selected horizontal alignment option.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149230" xml-lang="en-US" l10n="U" oldref="51">You can see the result of the alignments options that you select in the Preview box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_MIRROR" id="bm_id3146331" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_HORIMIRROR" id="bm_id1756950" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_MIRROR" id="bm_id3146331" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR" id="bm_id1756950" localize="false"/>
 <paragraph role="heading" id="hd_id3147746" xml-lang="en-US" level="3" l10n="U" oldref="52">Mirror on even pages</paragraph>
 <paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_MIRROR">Reverses the current horizontal alignment settings on even pages.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3148446" xml-lang="en-US" l10n="U" oldref="54">You can also use the <link href="text/swriter/01/05060300.xhp" name="Graphics"><emph>Graphics</emph></link> flip options to adjust the layout of objects on even and odd pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:DLB_VERTICAL" id="bm_id3145321" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERT" id="bm_id7322305" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:DLB_VERTICAL" id="bm_id3145321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT" id="bm_id7322305" localize="false"/>
 <paragraph role="heading" id="hd_id3145310" xml-lang="en-US" level="3" l10n="U" oldref="31">Vertical</paragraph>
 <paragraph role="paragraph" id="par_id3150161" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:LISTBOX:TP_FRM_STD:DLB_VERTICAL">Select the vertical alignment option for the object.</ahelp></paragraph>
 <paragraph role="note" id="par_id3150463" xml-lang="en-US" l10n="U" oldref="59">If you anchor an object to a frame with a fixed height, only the "Bottom" and "Center" alignment options are available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_AT_VERT_POS" id="bm_id3156123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_VERTBY" id="bm_id8157292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS" id="bm_id3156123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY" id="bm_id8157292" localize="false"/>
 <paragraph role="heading" id="hd_id3154724" xml-lang="en-US" level="3" l10n="U" oldref="33">by</paragraph>
 <paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_AT_VERT_POS">Enter the amount of space to leave between the top edge of the selected object and the reference point that you select in the <emph>To</emph> box.</ahelp> This option is only available if you select "From Top" or "From Bottom" (as character) in the <emph>Vertical</emph> box. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION" id="bm_id3150923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERTTO" id="bm_id1466719" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_STD:LB_VERT_RELATION" id="bm_id3150923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO" id="bm_id1466719" localize="false"/>
 <paragraph role="heading" id="hd_id3150912" xml-lang="en-US" level="3" l10n="U" oldref="56">to</paragraph>
 <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION">Select the reference point for the selected vertical alignment option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FRM_STD_CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_FOLLOW" id="bm_id4516434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW" id="bm_id611285" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW" id="bm_id4516434" localize="false"/>
 <paragraph role="heading" id="par_idN10A8E" xml-lang="en-US" level="3" l10n="NEW">Follow text flow</paragraph>
 <paragraph role="paragraph" id="par_idN10A92" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW">Keeps the selected object within the layout boundaries of the text that the object is anchored to. To place the selected object anywhere in your document, do not select this option.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">By default, the <emph>Follow text flow</emph> option is selected when you open a document that was created in a version of %PRODUCTNAME older than %PRODUCTNAME %PRODUCTVERSION. However, this option is not selected when you create a document or when you open a document in Microsoft Word format (*.doc).</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05060200.xhp b/helpcontent2/source/text/swriter/01/05060200.xhp
index 7657c504ff..bf039d73dd 100644
--- a/helpcontent2/source/text/swriter/01/05060200.xhp
+++ b/helpcontent2/source/text/swriter/01/05060200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060200.xhp,v $
- * $Revision: 1.9.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
 <paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_NOWRAP" id="bm_id6970184" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapOff" id="bm_id3148982" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_NO_WRAP" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP" id="bm_id3147090" localize="false"/>
 <paragraph role="heading" id="hd_id3148971" xml-lang="en-US" level="3" l10n="U" oldref="5">None</paragraph>
 <paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="6"><variable id="keinumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_NO_WRAP">Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object.</ahelp>
 </variable></paragraph>
@@ -65,7 +62,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149038" xml-lang="en-US" l10n="E">
-<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -74,14 +71,14 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT" id="bm_id3149164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT" id="bm_id3149164" localize="false"/>
 <paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="CHG" oldref="17">Before</paragraph>
 <paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT">Wraps text on the left side of the object if there is enough space.</ahelp></paragraph>
 <table id="tbl_id3151031">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145774" xml-lang="en-US" l10n="E">
-<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.82cm" height="0.82cm"><alt id="alt_id3145780" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.82cm" height="0.82cm"><alt id="alt_id3145780" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -90,14 +87,14 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT" id="bm_id3150694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT" id="bm_id3150694" localize="false"/>
 <paragraph role="heading" id="hd_id3155870" xml-lang="en-US" level="3" l10n="CHG" oldref="19">After</paragraph>
 <paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT">Wraps text on the right side of the object if there is enough space.</ahelp></paragraph>
 <table id="tbl_id3147426">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="E">
-<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149567" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149567" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -107,7 +104,7 @@
 </table>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id3149224" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP" id="bm_id0801200803382855" localize="false"/>
 <paragraph role="heading" id="hd_id3149213" xml-lang="en-US" level="3" l10n="U" oldref="21">Parallel</paragraph>
 <paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="22"><variable id="seitenumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL">Wraps text on all four sides of the border frame of the object.</ahelp>
@@ -116,7 +113,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148845" xml-lang="en-US" l10n="E">
-<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.82cm" height="0.82cm"><alt id="alt_id3148851" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.82cm" height="0.82cm"><alt id="alt_id3148851" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -127,7 +124,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU" id="bm_id622670" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapThrough" id="bm_id3151092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_THROUGH" id="bm_id3151096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH" id="bm_id3151096" localize="false"/>
 <paragraph role="heading" id="hd_id3151081" xml-lang="en-US" level="3" oldref="11">Through</paragraph>
 <paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U" oldref="12"><variable id="durchlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_THROUGH">Places the object in front of the text.</ahelp>
 </variable></paragraph>
@@ -135,7 +132,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150162" xml-lang="en-US" l10n="E">
-<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150169" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150169" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -144,7 +141,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_IDEAL" id="bm_id3150463" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL" id="bm_id3150463" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_IDEAL" id="bm_id5276" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapIdeal" id="bm_id3150462" localize="false"/>
 <paragraph role="heading" id="hd_id3150451" xml-lang="en-US" level="3" l10n="U" oldref="23">Optimal</paragraph>
@@ -154,7 +151,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150904" xml-lang="en-US" l10n="E">
-<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150910" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150910" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -165,39 +162,39 @@
 
 <paragraph role="heading" id="hd_id3146940" xml-lang="en-US" level="2" l10n="U" oldref="26">Options</paragraph>
 <paragraph role="paragraph" id="par_id3146953" xml-lang="en-US" l10n="U" oldref="27">Specify the text wrap options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_ANCHOR_ONLY" id="bm_id3153240" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY" id="bm_id3153240" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_WRAP_ANCHOR_ONLY" id="bm_id7795797" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id3154324" localize="false"/>
 <paragraph role="heading" id="hd_id3153229" xml-lang="en-US" level="3" l10n="U" oldref="28">First Paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_TRANSPARENT" id="bm_id3150086" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT" id="bm_id3150086" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU_TRANSP" id="bm_id7503356" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id3150090" localize="false"/>
 <paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3" l10n="U" oldref="30">In Background</paragraph>
 <paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_CONTOUR" id="bm_id2682094" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id3149372" localize="false"/>
 <paragraph role="heading" id="hd_id3149358" xml-lang="en-US" level="3" l10n="U" oldref="47">Contour</paragraph>
 <paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>. 
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_ONLYOUTSIDE" id="bm_id3154632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE" id="bm_id3154632" localize="false"/>
 <paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3" l10n="U" oldref="51">Only outside</paragraph>
 <paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SW:CHECKBOX:TP_FRM_WRAP:CB_ONLYOUTSIDE">Wraps text only around the contour of the object, but not in open areas within the object shape.</ahelp> This option is not available for frames.</paragraph>
 <paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="33">Gaps</paragraph>
 <paragraph role="paragraph" id="par_id3149637" xml-lang="en-US" l10n="U" oldref="34">Specify the amount of space to leave between the selected object and the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_LEFT_MARGIN" id="bm_id3150671" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN" id="bm_id3150671" localize="false"/>
 <paragraph role="heading" id="hd_id3150659" xml-lang="en-US" level="3" l10n="U" oldref="35">Left</paragraph>
 <paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_LEFT_MARGIN">Enter the amount of space that you want between the left edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN" id="bm_id3149949" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN" id="bm_id3149949" localize="false"/>
 <paragraph role="heading" id="hd_id3154032" xml-lang="en-US" level="3" l10n="U" oldref="37">Right</paragraph>
 <paragraph role="paragraph" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN">Enter the amount of space that you want between the right edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN" id="bm_id3147277" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN" id="bm_id3147277" localize="false"/>
 <paragraph role="heading" id="hd_id3149974" xml-lang="en-US" level="3" l10n="U" oldref="39">Top</paragraph>
 <paragraph role="paragraph" id="par_id3147284" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN">Enter the amount of space that you want between the top edge of the object and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN" id="bm_id3149621" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN" id="bm_id3149621" localize="false"/>
 <paragraph role="heading" id="hd_id3149609" xml-lang="en-US" level="3" l10n="U" oldref="41">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3157884" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN">Enter the amount of space that you want between the bottom edge of the object and the text.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index 6f29d8bf06..fcff3de090 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060201.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SVX:FLOATINGWINDOW:RID_SVXDLG_CONTOUR" id="bm_id3151318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:FloatingWindow:RID_SVXDLG_CONTOUR" id="bm_id3151318" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SID_CONTOUR_DLG" id="bm_id8126690" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ContourDialog" id="bm_id3154564" localize="false"/>
 <paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1">Contour Editor</paragraph>
@@ -278,7 +275,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" localize="false"/>
 <paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="45">Tolerance</paragraph>
 <paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_CONTOUR:MTF_TOLERANCE">Enter the color tolerance for the eyedropper as a percentage. To increase the color range that the eyedropper selects, enter a high percentage.</ahelp></paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/01/05060300.xhp b/helpcontent2/source/text/swriter/01/05060300.xhp
index 77cf43fec7..195515d8b8 100644
--- a/helpcontent2/source/text/swriter/01/05060300.xhp
+++ b/helpcontent2/source/text/swriter/01/05060300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,32 +51,32 @@
 <paragraph role="heading" id="hd_id3154191" xml-lang="en-US" level="2" l10n="U" oldref="3">Flip</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_FLIP_HORZ_GRAFIC" id="bm_id8328881" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:FlipHorizontal" id="bm_id3155185" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_GRF_EXT:CB_VERT" id="bm_id3143270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_GRF_EXT:CB_VERT" id="bm_id3143270" localize="false"/>
 <paragraph role="heading" id="hd_id3155174" xml-lang="en-US" level="3" l10n="U" oldref="7">Vertically<comment>see bug 106420;Writer uses VERT for HOR and HORZ for VERT</comment></paragraph>
 <paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="8"><variable id="vertikaltext"><ahelp hid="SW:CHECKBOX:TP_GRF_EXT:CB_VERT">Flips the selected graphic vertically.</ahelp>
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_FLIP_VERT_GRAFIC" id="bm_id9859908" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:FlipVertical" id="bm_id3151248" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_GRF_EXT:CB_HOR" id="bm_id3151251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_GRF_EXT:CB_HOR" id="bm_id3151251" localize="false"/>
 <paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="3" l10n="U" oldref="5">Horizontally</paragraph>
 <paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="U" oldref="6"><variable id="horizontaltext"><ahelp hid="SW:CHECKBOX:TP_GRF_EXT:CB_HOR">Flips the selected graphic horizontally.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_ALL_PAGES" id="bm_id3148979" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES" id="bm_id3148979" localize="false"/>
 <paragraph role="heading" id="hd_id3147101" xml-lang="en-US" level="3" l10n="U" oldref="15">On all pages</paragraph>
 <paragraph role="paragraph" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_ALL_PAGES">Flips the selected graphic horizontally on all pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_LEFT_PAGES" id="bm_id3153644" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES" id="bm_id3153644" localize="false"/>
 <paragraph role="heading" id="hd_id3153632" xml-lang="en-US" level="3" l10n="U" oldref="17">On left pages</paragraph>
 <paragraph role="paragraph" id="par_id3149037" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_LEFT_PAGES">Flips the selected graphic horizontally only on even pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_RIGHT_PAGES" id="bm_id3152769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES" id="bm_id3152769" localize="false"/>
 <paragraph role="heading" id="hd_id3147580" xml-lang="en-US" level="3" l10n="U" oldref="19">On right pages</paragraph>
 <paragraph role="paragraph" id="par_id3152775" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_RADIOBUTTON_TP_GRF_EXT_RB_MIRROR_RIGHT_PAGES">Flips the selected graphic horizontally only on odd pages.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#vorschau"/>
 <paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="9">Link</paragraph>
 <paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="10">Inserts the graphic as a link.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_GRF_EXT:ED_CONNECT" id="bm_id3156272" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_GRF_EXT:ED_CONNECT" id="bm_id3156272" localize="false"/>
 <paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="3" l10n="U" oldref="11">File name</paragraph>
 <paragraph role="paragraph" id="par_id3156278" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_GRF_EXT:ED_CONNECT">Displays the path to the linked graphic file. To change the link, click the browse button (<emph>...</emph>) and then locate the file that you want to link to. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_GRF_EXT:PB_BROWSE" id="bm_id3145786" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_GRF_EXT:PB_BROWSE" id="bm_id3145786" localize="false"/>
 <paragraph role="heading" id="hd_id3145776" xml-lang="en-US" level="3" l10n="U" oldref="13">...</paragraph>
 <paragraph role="paragraph" id="par_id3151373" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:PUSHBUTTON:TP_GRF_EXT:PB_BROWSE">Locate the new graphic file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05060700.xhp b/helpcontent2/source/text/swriter/01/05060700.xhp
index 99b2aef534..0e2e59d717 100644
--- a/helpcontent2/source/text/swriter/01/05060700.xhp
+++ b/helpcontent2/source/text/swriter/01/05060700.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060700.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 </meta>
 <body>
 <section id="makro">
-<bookmark xml-lang="en-US" branch="hid/SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN" id="bm_id3148770" localize="false"/>
+<!-- removed HID SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN -->
 <paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060700.xhp" name="Macro">Macro</link></paragraph>
 <paragraph role="paragraph" id="par_id3158429" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN">Specifies the macro to run when you click a graphic, frame, or an OLE object.</ahelp></paragraph>
 </section>
@@ -382,12 +379,12 @@
 <bookmark xml-lang="en-US" branch="hid/HID_MACRO_MACROS" id="bm_id3767815" localize="false"/>
 <paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="3" l10n="U" oldref="9">Macro name</paragraph>
 <paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:TABPAGE:RID_SFX_TP_MACROASSIGN">Lists the available macros. Select the macro that you want to assign to the selected event, and then click <emph>Assign</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_ASSIGN" id="bm_id3145185" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN" id="bm_id3145184" localize="false"/>
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_ASSIGN -->
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN -->
 <paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="11">Assign</paragraph>
-<paragraph role="paragraph" id="par_id3145197" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN">Assigns the selected to the selected event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_DELETE" id="bm_id3150824" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE" id="bm_id3150822" localize="false"/>
+<paragraph role="paragraph" id="par_id3145197" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_ASSIGN">Assigns the selected macro to the selected event.</ahelp></paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_TP_MACROASSIGN:PB_DELETE -->
+<!-- removed HID SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE -->
 <paragraph role="heading" id="hd_id3150811" xml-lang="en-US" level="2" l10n="U" oldref="15">Remove</paragraph>
 <paragraph role="paragraph" id="par_id3150882" xml-lang="en-US" l10n="U" oldref="16"><variable id="aufheb"><ahelp hid="SFX2:PUSHBUTTON:RID_SFX_SMALLTP_MACROASSIGN:PB_DELETE">Removes the macro assignment from the selected entry.</ahelp>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05060800.xhp b/helpcontent2/source/text/swriter/01/05060800.xhp
index 4671d5fa32..a171a350dd 100755
--- a/helpcontent2/source/text/swriter/01/05060800.xhp
+++ b/helpcontent2/source/text/swriter/01/05060800.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060800.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,56 +27,57 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0105060800xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink</title>
-<filename>/text/swriter/01/05060800.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-07T08:38:17">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
+      <topic id="textswriter0105060800xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Hyperlink</title>
+         <filename>/text/swriter/01/05060800.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="hyperlink">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150980"><bookmark_value>objects; defining hyperlinks</bookmark_value>
-<bookmark_value>frames; defining hyperlinks</bookmark_value>
-<bookmark_value>pictures; defining hyperlinks</bookmark_value>
-<bookmark_value>hyperlinks; for objects</bookmark_value>
+         <bookmark_value>frames; defining hyperlinks</bookmark_value>
+         <bookmark_value>pictures; defining hyperlinks</bookmark_value>
+         <bookmark_value>hyperlinks; for objects</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_FRM_URL" id="bm_id3153671" localize="false"/>
-<paragraph role="heading" id="hd_id3150980" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060800.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-<paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FRM_URL">Specify the properties of the hyperlink for the selected graphic, frame or OLE object.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#grahyper"/>
-</section>
-<paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="2" l10n="U" oldref="3">Link to</paragraph>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="4">Set the link properties.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_URL:ED_URL" id="bm_id3154825" localize="false"/>
-<paragraph role="heading" id="hd_id3149485" xml-lang="en-US" level="3" l10n="U" oldref="5">URL</paragraph>
-<paragraph role="paragraph" id="par_id3154831" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_URL">Enter the complete path to the file that you want to open, for example, http://www.sun.com, or file:///c|/Office/Document/Internet.sdw.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCH" id="bm_id3149103" localize="false"/>
-<paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="3" l10n="U" oldref="17">Browse</paragraph>
-<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCH">Locate the file that you want the hyperlink to open, and then click <emph>Open</emph>.</ahelp> The target file can be on your machine or on an <link href="text/shared/00/00000002.xhp#ftp" name="FTP server">FTP server</link> in the Internet.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_URL:ED_NAME" id="bm_id3148983" localize="false"/>
-<paragraph role="heading" id="hd_id3148972" xml-lang="en-US" level="3" l10n="U" oldref="19">Name</paragraph>
-<paragraph role="paragraph" id="par_id3147217" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_NAME">Enter a name for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_FRM_URL:CB_FRAME" id="bm_id3149035" localize="false"/>
-<paragraph role="heading" id="hd_id3153636" xml-lang="en-US" level="3" l10n="U" oldref="7">Frame</paragraph>
-<paragraph role="paragraph" id="par_id3149042" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:COMBOBOX:TP_FRM_URL:CB_FRAME">Specify the name of the frame where you want to open the targeted file.</ahelp> The predefined target frame names are described <link href="text/shared/01/01100500.xhp" name="here">here</link>.</paragraph>
-<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2" l10n="U" oldref="9">Image Map</paragraph>
-<paragraph role="paragraph" id="par_id3155138" xml-lang="en-US" l10n="U" oldref="10">Select the type of <link href="text/shared/00/00000002.xhp#imagemap" name="ImageMap">ImageMap</link> that you want to use. The ImageMap settings override the hyperlink settings that you enter on this page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_URL:CB_SERVER" id="bm_id3149170" localize="false"/>
-<paragraph role="heading" id="hd_id3153357" xml-lang="en-US" level="3" l10n="U" oldref="13">Server-side image map</paragraph>
-<paragraph role="paragraph" id="par_id3149176" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_SERVER">Uses a server-side image map.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_URL:CB_CLIENT" id="bm_id3151029" localize="false"/>
-<paragraph role="heading" id="hd_id3156278" xml-lang="en-US" level="3" l10n="U" oldref="15">Client-side image map</paragraph>
-<paragraph role="paragraph" id="par_id3151036" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_CLIENT">Uses the <link href="text/shared/01/02220000.xhp" name="image map">image map</link> that you created for the selected object.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3150980" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060800.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FRM_URL">Specify the properties of the hyperlink for the selected graphic, frame or OLE object.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#grahyper"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3155180" role="heading" level="2" l10n="U" oldref="3">Link to</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3143275" role="paragraph" l10n="U" oldref="4">Set the link properties.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_URL:ED_URL" id="bm_id3154825" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149485" role="heading" level="2" l10n="U" oldref="5">URL</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_URL">Enter the complete path to the file that you want to open.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FRM_URL:PB_SEARCH" id="bm_id3149103" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151260" role="heading" level="2" l10n="U"
+                 oldref="17">Browse</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149109" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCH">Locate the file that you want the hyperlink to open, and then click <emph>Open</emph>.</ahelp> The target file can be on your machine or on an <link href="text/shared/00/00000002.xhp#ftp" name="FTP server">FTP server</link> in the Internet.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_URL:ED_NAME" id="bm_id3148983" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148972" role="heading" level="2" l10n="U"
+                 oldref="19">Name</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147217" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_FRM_URL:ED_NAME">Enter a name for the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_FRM_URL:CB_FRAME" id="bm_id3149035" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153636" role="heading" level="2" l10n="U" oldref="7">Frame</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149042" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:COMBOBOX:TP_FRM_URL:CB_FRAME">Specify the name of the frame where you want to open the targeted file.</ahelp> The predefined target frame names are described <link href="text/shared/01/01100500.xhp" name="here">here</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152772" role="heading" level="2" l10n="U" oldref="9">Image Map</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155138" role="paragraph" l10n="U" oldref="10">Select the type of <link href="text/shared/00/00000002.xhp#imagemap" name="ImageMap">ImageMap</link> that you want to use. The ImageMap settings override the hyperlink settings that you enter on this page.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_URL:CB_SERVER" id="bm_id3149170" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153357" role="heading" level="2" l10n="U"
+                 oldref="13">Server-side image map</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149176" role="paragraph" l10n="U" oldref="14"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_SERVER">Uses a server-side image map.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_URL:CB_CLIENT" id="bm_id3151029" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156278" role="heading" level="2" l10n="U"
+                 oldref="15">Client-side image map</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151036" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW:CHECKBOX:TP_FRM_URL:CB_CLIENT">Uses the <link href="text/shared/01/02220000.xhp" name="image map">image map</link> that you created for the selected object.</ahelp></paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3151380" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05060900.xhp b/helpcontent2/source/text/swriter/01/05060900.xhp
index 09e5079d3d..75f003c7a6 100644
--- a/helpcontent2/source/text/swriter/01/05060900.xhp
+++ b/helpcontent2/source/text/swriter/01/05060900.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05060900.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,43 +49,43 @@
 </section>
 <paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
 <paragraph role="paragraph" id="par_id3147568" xml-lang="en-US" l10n="U" oldref="4">Specifies the name of the selected item, and associated links.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_NAME" id="bm_id3145419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_ADD:ED_NAME" id="bm_id3145419" localize="false"/>
 <paragraph role="heading" id="hd_id3151178" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
 <paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_FRM_ADD:ED_NAME">Enter a name for the selected item.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3154565" xml-lang="en-US" l10n="U" oldref="7">Assign an object, graphic or frame a meaningful name, so that you can quickly locate it afterwards in long documents.</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_ALT_NAME" id="bm_id3150352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FRM_ADD:ED_ALT_NAME" id="bm_id3150352" localize="false"/>
 <paragraph role="heading" id="hd_id3153674" xml-lang="en-US" level="3" l10n="U" oldref="15">Alternative text (floating frames, graphics, and objects only)</paragraph>
 <paragraph role="paragraph" id="par_id3150977" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FRM_ADD:ED_ALT_NAME">Enter the text to display in a web browser when the selected item is unavailable. Alternate text is also used to assist people with disabilities.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_PREV" id="bm_id3149692" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_PREV" id="bm_id3149695" localize="false"/>
+<!-- removed HID SW:EDIT:TP_FRM_ADD:ED_PREV -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_PREV" id="bm_id3149695" localize="false"/>
 <paragraph role="heading" id="hd_id3155903" xml-lang="en-US" level="3" l10n="U" oldref="23">Previous link</paragraph>
 <paragraph role="paragraph" id="par_id3154192" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_PREV">Displays the item (object, graphic, or frame) that comes before the current item in a linked sequence. To add or change the previous link, select a name from the list. If you are linking frames, the current frame and the target frame must be empty.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FRM_ADD:ED_NEXT" id="bm_id3155181" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_NEXT" id="bm_id3155185" localize="false"/>
+<!-- removed HID SW:EDIT:TP_FRM_ADD:ED_NEXT -->
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_NEXT" id="bm_id3155185" localize="false"/>
 <paragraph role="heading" id="hd_id3159198" xml-lang="en-US" level="3" l10n="U" oldref="25">Next link</paragraph>
 <paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_NEXT">Displays the item (object, graphic, or frame) that comes after the current item in a linked sequence. To add or change the next link, select a name from the list. If you are a linking frames, the target frame must be empty.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="2" l10n="U" oldref="27">Protect</paragraph>
 <paragraph role="paragraph" id="par_id3154834" xml-lang="en-US" l10n="U" oldref="28">Specifies protection options for the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_CONTENT" id="bm_id3149098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT" id="bm_id3149098" localize="false"/>
 <paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="3" l10n="U" oldref="9">Protect Contents</paragraph>
 <paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_CONTENT">Prevents changes to the contents of the selected item.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147099" xml-lang="en-US" l10n="U" oldref="29">You can still copy the contents of the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_FRAME" id="bm_id3147218" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME" id="bm_id3147218" localize="false"/>
 <paragraph role="heading" id="hd_id3148979" xml-lang="en-US" level="3" l10n="U" oldref="10">Protect Position</paragraph>
 <paragraph role="paragraph" id="par_id3147225" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_FRAME">Locks the position of the selected item in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_SIZE" id="bm_id3153640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE" id="bm_id3153640" localize="false"/>
 <paragraph role="heading" id="hd_id3153629" xml-lang="en-US" level="3" l10n="U" oldref="12">Protect Size</paragraph>
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PROTECT_SIZE">Locks the size of the selected item.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152770" xml-lang="en-US" level="2" l10n="U" oldref="8">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="U" oldref="16">Specifies print and text options for the selected item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY" id="bm_id3153357" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_EDIT_IN_READONLY" id="bm_id3153357" localize="false"/>
 <paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="18">Editable in read-only document (frames only)</paragraph>
 <paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY">Allows you to edit the contents of a frame in a document that is read-only (write-protected).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_ADD:CB_PRINT_FRAME" id="bm_id3156281" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME" id="bm_id3156281" localize="false"/>
 <paragraph role="heading" id="hd_id3156269" xml-lang="en-US" level="3" l10n="U" oldref="14">Print</paragraph>
 <paragraph role="paragraph" id="par_id3151028" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_FRM_ADD:CB_PRINT_FRAME">Includes the selected item when you print the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FRM_ADD_LB_TEXTFLOW" id="bm_id3145787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW" id="bm_id3145787" localize="false"/>
 <paragraph role="heading" id="hd_id3145776" xml-lang="en-US" level="3" l10n="U" oldref="33">Text flow</paragraph>
 <paragraph role="paragraph" id="par_id3151374" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_LISTBOX_TP_FRM_ADD_LB_TEXTFLOW">Specifies the preferred text flow direction in a frame. To use the default text flow settings for the page, select <emph>Use superordinate object settings </emph>from the list.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05080000.xhp b/helpcontent2/source/text/swriter/01/05080000.xhp
index 22866df43f..28f142eb81 100644
--- a/helpcontent2/source/text/swriter/01/05080000.xhp
+++ b/helpcontent2/source/text/swriter/01/05080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05080000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05090000.xhp b/helpcontent2/source/text/swriter/01/05090000.xhp
index ae67c906d8..6d42fed3fd 100644
--- a/helpcontent2/source/text/swriter/01/05090000.xhp
+++ b/helpcontent2/source/text/swriter/01/05090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05090100.xhp b/helpcontent2/source/text/swriter/01/05090100.xhp
index a67ba9d5f6..d021992a83 100644
--- a/helpcontent2/source/text/swriter/01/05090100.xhp
+++ b/helpcontent2/source/text/swriter/01/05090100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,46 +54,46 @@
   <embed href="text/swriter/00/00000405.xhp#tabformat"/>
 </section>
 <paragraph role="heading" id="hd_id3154560" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FORMAT_TABLE:ED_NAME" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FORMAT_TABLE:ED_NAME" id="bm_id3150019" localize="false"/>
 <paragraph role="heading" id="hd_id3149881" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
 <paragraph role="paragraph" id="par_id3145244" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_FORMAT_TABLE:ED_NAME">Enter an internal name for the table. You can use this name to quickly locate the table in the Navigator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_WIDTH" id="bm_id3148773" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH" id="bm_id3148773" localize="false"/>
 <paragraph role="heading" id="hd_id3150567" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149026" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_WIDTH">Enter the width of the table.</ahelp> This check box is only available if the <emph>Automatic</emph> option in the <emph>Alignment</emph> area is not selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FORMAT_TABLE:CB_REL_WIDTH" id="bm_id3150764" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH" id="bm_id3150764" localize="false"/>
 <paragraph role="heading" id="hd_id3154644" xml-lang="en-US" level="3" l10n="U" oldref="9">Relative</paragraph>
 <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_FORMAT_TABLE:CB_REL_WIDTH">Displays the width of the table as a percentage of the page width.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3151168" xml-lang="en-US" level="2" l10n="U" oldref="13">Alignment</paragraph>
 <paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="14">Set the alignment options for the selected table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FULL" id="bm_id3154101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FULL" id="bm_id3154101" localize="false"/>
 <paragraph role="heading" id="hd_id3147511" xml-lang="en-US" level="3" l10n="U" oldref="15">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3154108" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FULL">Extends the table horizontally to the left and to the right page margins.</ahelp> This is the recommended setting for tables in HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_LEFT" id="bm_id3153533" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT" id="bm_id3153533" localize="false"/>
 <paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="17">Left</paragraph>
 <paragraph role="paragraph" id="par_id3153540" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_LEFT">Aligns the left edge of the table to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FROM_LEFT" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT" id="bm_id3153666" localize="false"/>
 <paragraph role="heading" id="hd_id3151311" xml-lang="en-US" level="3" l10n="U" oldref="36">Left margin</paragraph>
 <paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FROM_LEFT">Aligns the left edge of the table to the indent that you enter in the <emph>Left </emph>box in the <emph>Spacing </emph>area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_RIGHT" id="bm_id3154480" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT" id="bm_id3154480" localize="false"/>
 <paragraph role="heading" id="hd_id3150982" xml-lang="en-US" level="3" l10n="U" oldref="19">Right</paragraph>
 <paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_RIGHT">Aligns the right edge of the table to the right page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_CENTER" id="bm_id3149689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER" id="bm_id3149689" localize="false"/>
 <paragraph role="heading" id="hd_id3155899" xml-lang="en-US" level="3" l10n="U" oldref="21">Centered</paragraph>
 <paragraph role="paragraph" id="par_id3149696" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_CENTER">Centers the table horizontally on the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FREE" id="bm_id3159201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FORMAT_TABLE:RB_FREE" id="bm_id3159201" localize="false"/>
 <paragraph role="heading" id="hd_id3159188" xml-lang="en-US" level="3" l10n="U" oldref="23">Manual</paragraph>
 <paragraph role="paragraph" id="par_id3155180" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:TP_FORMAT_TABLE:RB_FREE">Horizontally aligns the table based on the values that you enter in the <emph>Left</emph> and <emph>Right</emph> boxes in the<emph> Spacing</emph> area.</ahelp> $[officename] automatically calculates the table width. Select this option if you want to specify the individual <link href="text/swriter/01/05090200.xhp" name="column widths">column widths</link>.</paragraph>
 <paragraph role="heading" id="hd_id3149824" xml-lang="en-US" level="2" l10n="U" oldref="25">Spacing</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_LEFT_DIST" id="bm_id3154829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST" id="bm_id3154829" localize="false"/>
 <paragraph role="heading" id="hd_id3149102" xml-lang="en-US" level="3" l10n="U" oldref="27">Left</paragraph>
 <paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_LEFT_DIST">Enter the amount of space that you want to leave between the left page margin and the edge of the table.</ahelp> This option is not available if the <emph>Automatic </emph>or the <emph>Left</emph> option is selected in the <emph>Alignment</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_RIGHT_DIST" id="bm_id3147214" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST" id="bm_id3147214" localize="false"/>
 <paragraph role="heading" id="hd_id3147094" xml-lang="en-US" level="3" l10n="U" oldref="29">Right</paragraph>
 <paragraph role="paragraph" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_RIGHT_DIST">Enter the amount of space that you want to leave between the right page margin and the edge of the table.</ahelp> This option is not available if the <emph>Automatic </emph>or the <emph>Right</emph> option is selected in the <emph>Alignment</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_TOP_DIST" id="bm_id3147587" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST" id="bm_id3147587" localize="false"/>
 <paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="31">Above</paragraph>
 <paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_TOP_DIST">Enter the amount of space that you want to leave between the top edge of the table and the text above the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FORMAT_TABLE:ED_BOTTOM_DIST" id="bm_id3145757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST" id="bm_id3145757" localize="false"/>
 <paragraph role="heading" id="hd_id3155142" xml-lang="en-US" level="3" l10n="U" oldref="33">Below</paragraph>
 <paragraph role="paragraph" id="par_id3145763" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:METRICFIELD:TP_FORMAT_TABLE:ED_BOTTOM_DIST">Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table.</ahelp></paragraph>
 <paragraph role="tip" id="par_id3145782" xml-lang="en-US" l10n="U" oldref="35">To insert a paragraph before a table at the beginning of a document, header or footer, place the cursor before any content in the first cell, and then press Enter.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05090200.xhp b/helpcontent2/source/text/swriter/01/05090200.xhp
index 4aec33bfc4..360fea6ac9 100755
--- a/helpcontent2/source/text/swriter/01/05090200.xhp
+++ b/helpcontent2/source/text/swriter/01/05090200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,29 +47,29 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#spaltentab"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_COLUMN:CB_MOD_TBL" id="bm_id3154273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL" id="bm_id3154273" localize="false"/>
 <paragraph role="heading" id="hd_id3147510" xml-lang="en-US" level="2" l10n="U" oldref="3">Adapt table width</paragraph>
 <paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_MOD_TBL">Maintains the current width of the table when you change the width of a column.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_COLUMN:CB_PROP" id="bm_id3149809" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_PROP" id="bm_id3149809" localize="false"/>
 <paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="2" l10n="U" oldref="5">Adjust columns proportionally</paragraph>
 <paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_PROP">Resizes the table width in relation to the column width that you enter.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:ED_SPACE" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:ED_SPACE" id="bm_id3154564" localize="false"/>
 <paragraph role="heading" id="hd_id3150349" xml-lang="en-US" level="2" l10n="U" oldref="7">Remaining space</paragraph>
 <paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:ED_SPACE">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="2" l10n="U" oldref="9">Column width</paragraph>
 <paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="10">Specify the column widths for the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_1" id="bm_id3149690" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_2" id="bm_id3149694" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_3" id="bm_id3154188" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_4" id="bm_id3154193" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_5" id="bm_id3154197" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_6" id="bm_id3154202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_1" id="bm_id3149690" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_2" id="bm_id3149694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_3" id="bm_id3154188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_4" id="bm_id3154193" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_5" id="bm_id3154197" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_6" id="bm_id3154202" localize="false"/>
 <paragraph role="heading" id="hd_id3155899" xml-lang="en-US" level="3" l10n="U" oldref="11">Column widths</paragraph>
 <paragraph role="paragraph" id="par_id3159193" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_6">Enter the width that you want for the column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_DOWN" id="bm_id3149487" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN" id="bm_id3149487" localize="false"/>
 <paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="13">Left Arrow</paragraph>
 <paragraph role="paragraph" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_DOWN">Displays the table columns found to the left of the current column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_UP" id="bm_id3149826" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP" id="bm_id3149826" localize="false"/>
 <paragraph role="heading" id="hd_id3149814" xml-lang="en-US" level="3" l10n="U" oldref="15">Right Arrow</paragraph>
 <paragraph role="paragraph" id="par_id3149099" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_UP">Displays the table columns found to the right of the current column.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index dbf511c3ae..6f12b8e24d 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090201.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,7 +75,7 @@
 <paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></emph>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="16"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05090300.xhp b/helpcontent2/source/text/swriter/01/05090300.xhp
index 13eee1d961..89a443a177 100644
--- a/helpcontent2/source/text/swriter/01/05090300.xhp
+++ b/helpcontent2/source/text/swriter/01/05090300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05090300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,31 +59,31 @@ UFI: sw.features "Vertical formatting of individual table cells"; dedr: reviewed
   <embed href="text/swriter/00/00000405.xhp#tabelletextfluss"/>
 </section>
 <paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="3">Text flow</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK" id="bm_id3147174" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK" id="bm_id3147174" localize="false"/>
 <paragraph role="heading" id="hd_id3153720" xml-lang="en-US" level="3" l10n="U" oldref="4">Break</paragraph>
 <paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK">Select this check box, and then select the type of break that you want to associate with the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKPAGE" id="bm_id3147567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE" id="bm_id3147567" localize="false"/>
 <paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="3" l10n="U" oldref="6">Page</paragraph>
 <paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKPAGE">Inserts a page break before or after the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN" id="bm_id3154479" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN" id="bm_id3154479" localize="false"/>
 <paragraph role="heading" id="hd_id3150981" xml-lang="en-US" level="3" l10n="U" oldref="8">Column</paragraph>
 <paragraph role="paragraph" id="par_id3151310" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN">Inserts a column break before or after the table on a multi-column page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE" id="bm_id3149689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE" id="bm_id3149689" localize="false"/>
 <paragraph role="heading" id="hd_id3155898" xml-lang="en-US" level="3" l10n="U" oldref="10">Before</paragraph>
 <paragraph role="paragraph" id="par_id3149695" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE">Inserts a page or column break before the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER" id="bm_id3159201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER" id="bm_id3159201" localize="false"/>
 <paragraph role="heading" id="hd_id3159189" xml-lang="en-US" level="3" l10n="U" oldref="12">After</paragraph>
 <paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER">Inserts a page or column break after the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL" id="bm_id3143276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL" id="bm_id3143276" localize="false"/>
 <paragraph role="heading" id="hd_id3149490" xml-lang="en-US" level="3" l10n="U" oldref="14">With Page Style</paragraph>
 <paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL">Applies the page style that you specify to the first page that follows the page break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL" id="bm_id3151258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL" id="bm_id3151258" localize="false"/>
 <paragraph role="heading" id="hd_id3154839" xml-lang="en-US" level="3" l10n="U" oldref="16">Page Style</paragraph>
 <paragraph role="paragraph" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL">Select the page style that you want to apply to the first page that follows the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM" id="bm_id3148972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM" id="bm_id3148972" localize="false"/>
 <paragraph role="heading" id="hd_id3149819" xml-lang="en-US" level="3" l10n="U" oldref="18">Page number</paragraph>
 <paragraph role="paragraph" id="par_id3148978" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM">Enter the page number for the first page that follows the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_SPLIT" id="bm_id3147221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT" id="bm_id3147221" localize="false"/>
 <paragraph role="heading" id="hd_id3147100" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Allow table to split across pages and columns</paragraph>
 <paragraph role="paragraph" id="par_id3153629" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_SPLIT">Allows a page break or column break between the rows of a table.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW" id="bm_id3669240" localize="false"/>
@@ -94,13 +91,13 @@ UFI: sw.features "Vertical formatting of individual table cells"; dedr: reviewed
 <bookmark xml-lang="en-US" branch="hid/.uno:RowSplit" id="bm_id6725669" localize="false"/>
 <paragraph role="heading" id="par_idN108D6" xml-lang="en-US" level="3" l10n="NEW">Allow row to break across pages and columns</paragraph>
 <paragraph role="paragraph" id="par_idN108DA" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW">Allows a page break or column break inside a row of the table.</ahelp> This option is not applied to the first row in a table if the <emph>Repeat Heading</emph> option is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_KEEP" id="bm_id3149046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP" id="bm_id3149046" localize="false"/>
 <paragraph role="heading" id="hd_id3149034" xml-lang="en-US" level="3" l10n="U" oldref="35">Keep with next paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3147577" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_KEEP">Keeps the table and the following paragraph together when you insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE" id="bm_id3155137" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE" id="bm_id3155137" localize="false"/>
 <paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="3" l10n="U" oldref="19">Repeat heading</paragraph>
 <paragraph role="paragraph" id="par_id3153350" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE">Repeats the table heading on a new page when the table spans more than one page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_TP_TABLE_TEXTFLOW_NF_REPEAT_HEADER" id="bm_id3560289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER" id="bm_id3560289" localize="false"/>
 <paragraph role="heading" id="par_idN1091C" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
 <paragraph role="paragraph" id="par_idN10920" xml-lang="en-US" l10n="NEW"><ahelp hid="sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER">Enter the number of rows to include in the heading.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION" id="bm_id2659993" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05100000.xhp b/helpcontent2/source/text/swriter/01/05100000.xhp
index 93afce75b5..e847d829d0 100755
--- a/helpcontent2/source/text/swriter/01/05100000.xhp
+++ b/helpcontent2/source/text/swriter/01/05100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100000.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05100300.xhp b/helpcontent2/source/text/swriter/01/05100300.xhp
index 6cad99b772..21307fc661 100644
--- a/helpcontent2/source/text/swriter/01/05100300.xhp
+++ b/helpcontent2/source/text/swriter/01/05100300.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,30 +27,27 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+ 
+	
 <meta>
-<topic id="textswriter0105100300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Protect</title>
-<filename>/text/swriter/01/05100300.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-03T11:28:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="schuetzen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SET_READ_ONLY_CELLS" id="bm_id7637302" localize="false"/><!-- HID added by script -->
+      <topic id="textswriter0105100300xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Protect</title>
+         <filename>/text/swriter/01/05100300.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="schuetzen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SET_READ_ONLY_CELLS" id="bm_id7637302" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Protect" id="bm_id3155626" localize="false"/>
-<paragraph role="heading" id="hd_id3146322" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100300.xhp" name="Protect">Protect</link></paragraph>
-<paragraph role="paragraph" id="par_id3145822" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Protect">Prevents the contents of the selected cells from being modified.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#schtzenze"/>
-</section>
-<paragraph role="note" id="par_id3154641" xml-lang="en-US" l10n="U" oldref="3">When the cursor is in a read-only cell, a note appears on the <emph>Status Bar</emph>.</paragraph>
-
-<paragraph role="paragraph" id="par_id3149292" xml-lang="en-US" l10n="U" oldref="4">To remove cell protection, select the cell(s), and then choose <link href="text/swriter/01/05100400.xhp" name="Format - Cell - Remove Protection"><emph>Format - Cell - Remove Protection</emph></link>.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3146322" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100300.xhp" name="Protect">Protect</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145822" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:Protect">Prevents the contents of the selected cells from being modified.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#schtzenze"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3154641" role="note" l10n="U" oldref="3">When the cursor is in a read-only cell, a note appears on the <emph>Status Bar</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149292" role="paragraph" l10n="CHG" oldref="4">To remove cell protection, select the cell(s), right-click, and then choose <link href="text/swriter/01/05100400.xhp" name="Cell - Unprotect"><emph>Cell - Unprotect</emph></link>.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05100400.xhp b/helpcontent2/source/text/swriter/01/05100400.xhp
index 688cab60a5..97b6872dcf 100644
--- a/helpcontent2/source/text/swriter/01/05100400.xhp
+++ b/helpcontent2/source/text/swriter/01/05100400.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05100400.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,34 +27,29 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+ 
+	
 <meta>
-<topic id="textswriter0105100400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Unprotect</title>
-<filename>/text/swriter/01/05100400.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-03T11:48:03">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="aufheben">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_UNSET_READ_ONLY_CELLS" id="bm_id3818873" localize="false"/><!-- HID added by script -->
+      <topic id="textswriter0105100400xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Unprotect</title>
+         <filename>/text/swriter/01/05100400.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="aufheben">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_UNSET_READ_ONLY_CELLS" id="bm_id3818873" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:UnsetCellsReadOnly" id="bm_id3147402" localize="false"/>
-<paragraph role="heading" id="hd_id3149052" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100400.xhp" name="Unprotect">Unprotect</link></paragraph>
-<paragraph role="paragraph" id="par_id3083450" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:UnsetCellsReadOnly">Removes the cell protection for all of the cells in the current table.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#schutzaufhz"/>
-</section>
-<paragraph role="paragraph" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="3">To remove the protection from several tables at once, select the tables, and then press <switchinline select="sys">
-<caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T. To remove the protection from all of the tables in a document, click anywhere in the document, and then press <switchinline select="sys">
-<caseinline select="MAC">Command
+<paragraph xml-lang="en-US" id="hd_id3149052" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100400.xhp" name="Unprotect">Unprotect</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3083450" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:UnsetCellsReadOnly">Removes the cell protection for all selected cells in the current table.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#schutzaufhz"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3154558" role="paragraph" l10n="U" oldref="3">To remove the protection from several tables at once, select the tables, and then press <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T. To remove the protection from all of the tables in a document, click anywhere in the document, and then press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T.</paragraph>
-<paragraph role="tip" id="par_id3150765" xml-lang="en-US" l10n="U" oldref="4">You can also remove cell protection from a table in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link>.</paragraph>
-
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150765" role="tip" l10n="U" oldref="4">You can also remove cell protection from a table in the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link>.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05110000.xhp b/helpcontent2/source/text/swriter/01/05110000.xhp
index 92c8b20c9a..8b89c48407 100755
--- a/helpcontent2/source/text/swriter/01/05110000.xhp
+++ b/helpcontent2/source/text/swriter/01/05110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05110100.xhp b/helpcontent2/source/text/swriter/01/05110100.xhp
index 0ab797c886..cea0321989 100644
--- a/helpcontent2/source/text/swriter/01/05110100.xhp
+++ b/helpcontent2/source/text/swriter/01/05110100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,12 +48,12 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#hoehez"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:DLG_ROW_HEIGHT:ED_HEIGHT" id="bm_id3145823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT" id="bm_id3145823" localize="false"/>
 <paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
 <paragraph role="paragraph" id="par_id3154554" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:METRICFIELD:DLG_ROW_HEIGHT:ED_HEIGHT">Enter the height that you want for the selected row(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_ROW_HEIGHT:CB_AUTOHEIGHT" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT" id="bm_id3150019" localize="false"/>
 <paragraph role="heading" id="hd_id3149878" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit to size</paragraph>
 <paragraph role="paragraph" id="par_id3145244" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:DLG_ROW_HEIGHT:CB_AUTOHEIGHT">Automatically adjusts the row height to match the contents of the cells.</ahelp></paragraph>
-<paragraph role="note" id="par_id3154646" xml-lang="en-US" l10n="U" oldref="7">You can also right-click in a cell, and then choose <link href="text/swriter/01/05110200.xhp" name="Format - Row - Optimal Height"><emph>Format - Row - Optimal Height</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3154646" xml-lang="en-US" l10n="CHG" oldref="7">You can also right-click in a cell, and then choose <link href="text/swriter/01/05110200.xhp" name="Row - Optimal Height"><emph>Row - Optimal Height</emph></link>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05110200.xhp b/helpcontent2/source/text/swriter/01/05110200.xhp
index fc30ba88a0..946dda8af9 100644
--- a/helpcontent2/source/text/swriter/01/05110200.xhp
+++ b/helpcontent2/source/text/swriter/01/05110200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05110300.xhp b/helpcontent2/source/text/swriter/01/05110300.xhp
index b17518d6ea..71c49cd349 100644
--- a/helpcontent2/source/text/swriter/01/05110300.xhp
+++ b/helpcontent2/source/text/swriter/01/05110300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05110500.xhp b/helpcontent2/source/text/swriter/01/05110500.xhp
index 8881a0b36e..769cf3db5e 100644
--- a/helpcontent2/source/text/swriter/01/05110500.xhp
+++ b/helpcontent2/source/text/swriter/01/05110500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05110500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05120000.xhp b/helpcontent2/source/text/swriter/01/05120000.xhp
index 9851b6389c..e899a99204 100755
--- a/helpcontent2/source/text/swriter/01/05120000.xhp
+++ b/helpcontent2/source/text/swriter/01/05120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05120100.xhp b/helpcontent2/source/text/swriter/01/05120100.xhp
index 44a642b355..906e175f55 100644
--- a/helpcontent2/source/text/swriter/01/05120100.xhp
+++ b/helpcontent2/source/text/swriter/01/05120100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,10 +51,10 @@
   <embed href="text/swriter/00/00000405.xhp#breites"/>
 </section>
 <paragraph role="heading" id="hd_id3083452" xml-lang="en-US" level="2" l10n="U" oldref="3">Width</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_COL_WIDTH:ED_COL" id="bm_id3149350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_COL_WIDTH:ED_COL" id="bm_id3149350" localize="false"/>
 <paragraph role="heading" id="hd_id3146323" xml-lang="en-US" level="3" l10n="U" oldref="4">Columns</paragraph>
 <paragraph role="paragraph" id="par_id3145822" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:DLG_COL_WIDTH:ED_COL">Enter the column number of the column you want to change the width of.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:DLG_COL_WIDTH:ED_WIDTH" id="bm_id3150019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_COL_WIDTH:ED_WIDTH" id="bm_id3150019" localize="false"/>
 <paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="3" l10n="U" oldref="6">Width</paragraph>
 <paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:METRICFIELD:DLG_COL_WIDTH:ED_WIDTH">Enter the width that you want for the selected column(s).</ahelp><comment>removed 2 sentences, see #i64155</comment></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05120200.xhp b/helpcontent2/source/text/swriter/01/05120200.xhp
index 978ed0b20f..9c30409bfc 100644
--- a/helpcontent2/source/text/swriter/01/05120200.xhp
+++ b/helpcontent2/source/text/swriter/01/05120200.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120200.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05120300.xhp b/helpcontent2/source/text/swriter/01/05120300.xhp
index 49890ed1f1..99409c28d8 100644
--- a/helpcontent2/source/text/swriter/01/05120300.xhp
+++ b/helpcontent2/source/text/swriter/01/05120300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120300.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05120400.xhp b/helpcontent2/source/text/swriter/01/05120400.xhp
index 34a478c61e..4750691c87 100644
--- a/helpcontent2/source/text/swriter/01/05120400.xhp
+++ b/helpcontent2/source/text/swriter/01/05120400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,22 +46,22 @@
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_COL_DLG" id="bm_id6403933" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertColumnDialog" id="bm_id3149874" localize="false"/>
 <paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a column into the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_INS_ROW_COL" id="bm_id3150250" localize="false"/>
+<!-- removed HID SW:MODALDIALOG:DLG_INS_ROW_COL -->
 <paragraph role="heading" id="hd_id3148489" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Columns/Rows</paragraph>
 <paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="2"><variable id="einfuegentext"><ahelp hid="SW:MODALDIALOG:DLG_INS_ROW_COL">Inserts a row or column into the table.</ahelp> This command is only available when the cursor is in a table.
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#einfgens"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT" id="bm_id3146324" localize="false"/>
+<!-- removed HID SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT -->
 <paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="2" l10n="U" oldref="3">Insert</paragraph>
 <paragraph role="paragraph" id="par_id3155626" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:DLG_INS_ROW_COL:ED_COUNT">Enter the number of columns or rows that you want.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145829" xml-lang="en-US" level="2" l10n="U" oldref="6">Position</paragraph>
 <paragraph role="paragraph" id="par_id3154504" xml-lang="en-US" l10n="U" oldref="11">Specifies where to insert the columns or rows.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE" id="bm_id3145245" localize="false"/>
+<!-- removed HID SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE -->
 <paragraph role="heading" id="hd_id3150015" xml-lang="en-US" level="3" l10n="U" oldref="7">Before</paragraph>
 <paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_BEFORE">Adds new columns to the left of the current column, or adds new rows above the current row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER" id="bm_id3153924" localize="false"/>
+<!-- removed HID SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER -->
 <paragraph role="heading" id="hd_id3149024" xml-lang="en-US" level="3" l10n="U" oldref="9">After</paragraph>
 <paragraph role="paragraph" id="par_id3153718" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_INS_ROW_COL:CB_POS_AFTER">Adds new columns to the right of the current column, or adds new rows below the current row.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05120500.xhp b/helpcontent2/source/text/swriter/01/05120500.xhp
index aec03de4ee..fbd8bb837d 100644
--- a/helpcontent2/source/text/swriter/01/05120500.xhp
+++ b/helpcontent2/source/text/swriter/01/05120500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05120500.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05130000.xhp b/helpcontent2/source/text/swriter/01/05130000.xhp
index a5efdaacd2..711f9bf33a 100644
--- a/helpcontent2/source/text/swriter/01/05130000.xhp
+++ b/helpcontent2/source/text/swriter/01/05130000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05130000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@ DEDR: Reviewed</lastedited>
 <paragraph role="paragraph" id="par_id3149052" xml-lang="en-US" l10n="CHG" oldref="2">The following information concerns Writer styles that you can apply using the <link href="text/swriter/01/05140000.xhp">Styles and Formatting</link> window.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="62">If you want, you can edit the styles of the current document, and then save the document as a template. To save the document as template, choose <emph>File - </emph><link href="text/shared/01/01110300.xhp" name="Templates - Save"><emph>Templates - Save</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:RID_STYLECATALOG:BT_TOOL" id="bm_id3153921" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:RID_STYLECATALOG:BT_TOOL" id="bm_id3153921" localize="false"/>
 <paragraph role="heading" id="hd_id3150572" xml-lang="en-US" level="2" l10n="U" oldref="4">Style Category</paragraph>
 <paragraph role="paragraph" id="par_id3153721" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:LISTBOX:RID_STYLECATALOG:BT_TOOL">These are the different categories of formatting styles.</ahelp></paragraph>
 <table id="tbl_id3154642">
diff --git a/helpcontent2/source/text/swriter/01/05130002.xhp b/helpcontent2/source/text/swriter/01/05130002.xhp
index 7a730d135e..b599def854 100755
--- a/helpcontent2/source/text/swriter/01/05130002.xhp
+++ b/helpcontent2/source/text/swriter/01/05130002.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05130002.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05130004.xhp b/helpcontent2/source/text/swriter/01/05130004.xhp
index b26edaa2b2..29d89f7bea 100755
--- a/helpcontent2/source/text/swriter/01/05130004.xhp
+++ b/helpcontent2/source/text/swriter/01/05130004.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05130004.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,8 @@
 <embed href="text/shared/01/06050100.xhp#bullets"/>
 <embed href="text/shared/01/06050200.xhp#numerierungsart"/>
 <embed href="text/shared/01/06050300.xhp#numerierung"/>
-<embed href="text/shared/01/06050600.xhp#position"/>
+<embed href="text/shared/01/06050400.xhp#graphics"/>
+<embed href="text/shared/01/06050600.xhp#position_s"/>
 <embed href="text/shared/01/06050500.xhp#optionen"/>
 <embed href="text/shared/00/00000001.xhp#zurueck2"/>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05130100.xhp b/helpcontent2/source/text/swriter/01/05130100.xhp
index 7f1c31c770..88a73e98b9 100644
--- a/helpcontent2/source/text/swriter/01/05130100.xhp
+++ b/helpcontent2/source/text/swriter/01/05130100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05130100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -67,7 +64,7 @@
 <paragraph role="listitem" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="24">In <emph>Context</emph>, select the header entry and under <emph>Paragraph Styles</emph> select the style for the header in your business letter; for example, the default Paragraph Style "Header". You also can select your own style.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="25">You can apply the Paragraph Style to the context by double-clicking the selected entry in the <emph>Paragraph Styles</emph> list box or by using <emph>Assign</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="25">You can apply the Paragraph Style to the context by double-clicking the selected entry in the <emph>Paragraph Styles</emph> list box or by using <emph>Apply</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3149753" xml-lang="en-US" l10n="CHG" oldref="26">Click <emph>OK</emph> to close the Paragraph Style dialog, and then format all paragraphs in your business letter, including the header, with the new "Business letter" conditional Paragraph Style. (When you click in the header, you may need to display <item type="literal">All Styles</item> or <item type="literal">Custom Styles</item> in the style list to use the new business letter style.)</paragraph>
@@ -76,7 +73,7 @@
 <paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="27">The header text now has the attributes you specified in the Header Paragraph Style, while the other parts of the document have the attributes defined in the business letter conditional Paragraph Style.</paragraph>
 <paragraph role="tip" id="par_id3154473" xml-lang="en-US" l10n="U" oldref="13">The "Text body" Style was created as a conditional style. Therefore, any styles you derive from it can be used as conditional styles.</paragraph>
 <paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="14">The Paragraph Style applied to the context is used when exporting to other formats (RTF, HTML, and so on).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONDCOLL:CB_CONDITION" id="bm_id3152963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONDCOLL:CB_CONDITION" id="bm_id3152963" localize="false"/>
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="3">Conditional style</paragraph>
 <paragraph role="paragraph" id="par_id3150974" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:CHECKBOX:TP_CONDCOLL:CB_CONDITION">Check this box to define a new style as a conditional style.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_COND_COLL_TABLIST" id="bm_id3147524" localize="false"/>
@@ -84,14 +81,14 @@
 <paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_COND_COLL_TABLIST">Here you can see the $[officename] predefined contexts, including outline levels 1 to 10, numbering/bullets levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="2" l10n="U" oldref="5">Applied Style</paragraph>
 <paragraph role="paragraph" id="par_id3149689" xml-lang="en-US" l10n="U" oldref="17">Here you can see the list of all Paragraph Styles applied to a context.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
 <paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
 <paragraph role="paragraph" id="par_id3159195" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_CONDCOLL:LB_STYLE">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</ahelp></paragraph>
 <embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
 <paragraph role="heading" id="hd_id3149306" xml-lang="en-US" level="2" l10n="U" oldref="8">Remove</paragraph>
 <paragraph role="paragraph" id="par_id3151335" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE">Click here to remove the current context assigned to the selected style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_ASSIGN" id="bm_id3149494" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CONDCOLL:PB_ASSIGN" id="bm_id3149494" localize="false"/>
 <paragraph role="heading" id="hd_id3149483" xml-lang="en-US" level="2" l10n="U" oldref="9">Assign</paragraph>
 <paragraph role="paragraph" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_ASSIGN">Click <emph>Assign</emph> to apply the <emph>selected Paragraph Style</emph> to the defined <emph>context</emph>.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05140000.xhp b/helpcontent2/source/text/swriter/01/05140000.xhp
index 1ec60f62b8..f3d4f4e9c5 100644
--- a/helpcontent2/source/text/swriter/01/05140000.xhp
+++ b/helpcontent2/source/text/swriter/01/05140000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05140000.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,188 +29,166 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriter0105140000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Styles and Formatting</title>
-<filename>/text/swriter/01/05140000.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  <section id="gestalter">
-   
-   
+      <topic id="textswriter0105140000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Styles and Formatting</title>
+         <filename>/text/swriter/01/05140000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="gestalter">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3907589"><bookmark_value>Styles and Formatting window;applying styles</bookmark_value>
-</bookmark>
-   <comment>mw deleted "applying;."</comment>
-   
+</bookmark><comment>mw deleted "applying;."</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLATE_FMT" id="bm_id7354350" localize="false"/>
-<paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
-<paragraph role="paragraph" id="par_id3148391" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Use the Styles and Formatting window to apply, create, edit, add, and remove formatting styles. Double-click an entry to apply the style.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#gestalter"/>
-</section>
-<paragraph role="paragraph" id="par_idN106EF" xml-lang="en-US" l10n="CHG">To <link href="text/shared/00/00000005.xhp#andocken" name="dock">dock</link> the Styles and Formatting window, drag its title bar to the left or to the right side of the workspace. To undock the window, double-click a free space on its toolbar.</paragraph>
-<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="2" l10n="U" oldref="37">How to apply a style:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151264" xml-lang="en-US" l10n="U" oldref="38">Select the text. To apply a Character Style to one word, click the word. To apply a Paragraph Style, click the paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150756" xml-lang="en-US" l10n="CHG" oldref="39">Double-click the style in the Styles and Formatting window.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN1071D" xml-lang="en-US" l10n="NEW">You can assign shortcut keys to Styles on the <emph>Tools - Customize - Keyboard</emph> tab page.</paragraph>
-<paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="CHG" oldref="4">The Styles and Formatting toolbar contains icons for formatting your documents:</paragraph>
-<paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Style Category</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154505" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148391" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Use the Styles and Formatting window to apply, create, edit, add, and remove formatting styles. Double-click an entry to apply the style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditStyle" id="bm_id0122200903162640" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200903183687" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose Edit Paragraph Style in the context menu of a paragraph to edit the style of all paragraphs of the same style.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00040500.xhp#gestalter"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN106EF" role="paragraph" l10n="CHG">To <link href="text/shared/00/00000005.xhp#andocken" name="dock">dock</link> the Styles and Formatting window, drag its title bar to the left or to the right side of the workspace. To undock the window, double-click a free space on its toolbar.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147167" role="heading" level="2" l10n="U"
+                 oldref="37">How to apply a style:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151264" role="listitem" l10n="U" oldref="38">Select the text. To apply a Character Style to one word, click the word. To apply a Paragraph Style, click the paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150756" role="listitem" l10n="CHG" oldref="39">Double-click the style in the Styles and Formatting window.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1071D" role="tip" l10n="NEW">You can assign shortcut keys to Styles on the <emph>Tools - Customize - Keyboard</emph> tab page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154643" role="paragraph" l10n="CHG" oldref="4">The Styles and Formatting toolbar contains icons for formatting your documents:</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153146" role="heading" level="2" l10n="CHG"
+                 oldref="5">Style Category</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY2" id="bm_id5183654" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:ParaStyle" id="bm_id3149811" localize="false"/>
-  <table id="tbl_id3149753">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147506" role="paragraph" l10n="E"> 
-<image id="img_id3147512" src="sfx2/res/styfam2.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147512">Icon</alt>
+<table id="tbl_id3149753">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147506" role="paragraph" l10n="E">
+<image id="img_id3147512" src="sfx2/res/styfam2.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147512">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154106" role="tablehead" l10n="U" oldref="6">Paragraph Styles</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3149800" role="paragraph" l10n="U" oldref="7"><ahelp hid=".uno:ParaStyle">Displays formatting styles for paragraphs.</ahelp> Use paragraph styles to apply the same <link href="text/shared/00/00000005.xhp#formatierung" name="formatting">formatting</link>, such as font, numbering, and layout to the paragraphs in your document.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154106" role="tablehead" l10n="U" oldref="6">Paragraph Styles</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149800" role="paragraph" l10n="U" oldref="7"><ahelp hid=".uno:ParaStyle">Displays formatting styles for paragraphs.</ahelp> Use paragraph styles to apply the same <link href="text/shared/00/00000005.xhp#formatierung" name="formatting">formatting</link>, such as font, numbering, and layout to the paragraphs in your document.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY1" id="bm_id8801201" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:CharStyle" id="bm_id3155897" localize="false"/>
-  <table id="tbl_id3153673">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3151319" role="paragraph" l10n="E"> 
-<image id="img_id3152955" src="sfx2/res/styfam1.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152955">Icon</alt>
+<table id="tbl_id3153673">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151319" role="paragraph" l10n="E">
+<image id="img_id3152955" src="sfx2/res/styfam1.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152955">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150351" role="tablehead" l10n="U" oldref="8">Character Styles</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3154570" role="paragraph" l10n="U" oldref="9"><ahelp hid=".uno:CharStyle">Displays formatting styles for characters.</ahelp> Use character styles to apply font styles to selected text in a paragraph.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150351" role="tablehead" l10n="U" oldref="8">Character Styles</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154570" role="paragraph" l10n="U" oldref="9"><ahelp hid=".uno:CharStyle">Displays formatting styles for characters.</ahelp> Use character styles to apply font styles to selected text in a paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY3" id="bm_id9644609" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:FrameStyle" id="bm_id3149490" localize="false"/>
-  <table id="tbl_id3149688">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3159194" role="paragraph" l10n="E"> 
-<image id="img_id3159200" src="sw/imglst/sf03.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3159200">Icon</alt>
+<table id="tbl_id3149688">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3159194" role="paragraph" l10n="E">
+<image id="img_id3159200" src="sw/imglst/sf03.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159200">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3151332" role="tablehead" l10n="U" oldref="10">Frame Styles</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3143282" role="paragraph" l10n="U" oldref="11"><ahelp hid=".uno:FrameStyle">Displays formatting styles for frames.</ahelp> Use frame styles to format frame layouts and position.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151332" role="tablehead" l10n="U" oldref="10">Frame Styles</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3143282" role="paragraph" l10n="U" oldref="11"><ahelp hid=".uno:FrameStyle">Displays formatting styles for frames.</ahelp> Use frame styles to format frame layouts and position.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY4" id="bm_id1836178" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:PageStyle" id="bm_id3153633" localize="false"/>
-  <table id="tbl_id3154831">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="E"> 
-<image id="img_id3149826" src="sw/imglst/sf04.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3149826">Icon</alt>
+<table id="tbl_id3154831">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="E">
+<image id="img_id3149826" src="sw/imglst/sf04.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149826">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3148976" role="tablehead" l10n="U" oldref="12">Page Styles</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3147220" role="paragraph" l10n="U" oldref="13"><ahelp hid=".uno:PageStyle">Displays formatting styles for pages.</ahelp> Use page styles to determine page layouts, including the presence of headers and footers.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148976" role="tablehead" l10n="U" oldref="12">Page Styles</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147220" role="paragraph" l10n="U" oldref="13"><ahelp hid=".uno:PageStyle">Displays formatting styles for pages.</ahelp> Use page styles to determine page layouts, including the presence of headers and footers.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/SID_STYLE_FAMILY5" id="bm_id8443551" localize="false"/>
-  
 <bookmark xml-lang="en-US" branch="hid/.uno:TemplateFamily5" id="bm_id3146310" localize="false"/>
-  <table id="tbl_id3149034">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3152766" role="tablehead" l10n="E"> 
-<image id="img_id3152772" src="sw/imglst/sf05.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152772">Icon</alt>
+<table id="tbl_id3149034">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152766" role="tablehead" l10n="E">
+<image id="img_id3152772" src="sw/imglst/sf05.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152772">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154390" role="tablehead" l10n="CHG" oldref="28">List Styles</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3153361" role="paragraph" l10n="CHG" oldref="27"><ahelp hid=".uno:TemplateFamily5">Displays formatting styles for numbered and bulleted lists.</ahelp> Use list styles to format number and bullet characters and to specify indents.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154390" role="tablehead" l10n="CHG" oldref="28">List Styles</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153361" role="paragraph" l10n="CHG" oldref="27"><ahelp hid=".uno:TemplateFamily5">Displays formatting styles for numbered and bulleted lists.</ahelp> Use list styles to format number and bullet characters and to specify indents.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_WATERCAN" id="bm_id3151377" localize="false"/>
-  <table id="tbl_id3151030">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150576" role="paragraph" l10n="E"> 
-<image id="img_id3150590" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3150590">Icon</alt>
+<table id="tbl_id3151030">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150576" role="paragraph" l10n="E">
+<image id="img_id3150590" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150590">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3145786" role="tablehead" l10n="U" oldref="14">Fill Format Mode</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_TEMPLDLG_WATERCAN">Applies the selected style to the object or text that you select in the document. Click this icon, and then drag a selection in the document to apply the style.</ahelp> To exit this mode, click the icon again, or press Esc.</paragraph>
-     <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
-    </tablecell>
-   </tablerow>
-  </table>
-  <table id="tbl_id3155923">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150114" role="paragraph" l10n="E"> 
-<image id="img_id3150122" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3150122">Icon</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145786" role="tablehead" l10n="U" oldref="14">Fill Format Mode</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_TEMPLDLG_WATERCAN">Applies the selected style to the object or text that you select in the document. Click this icon, and then drag a selection in the document to apply the style.</ahelp> To exit this mode, click the icon again, or press Esc.</paragraph>
+               <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <table id="tbl_id3155923">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150114" role="paragraph" l10n="E">
+<image id="img_id3150122" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150122">Icon</alt>
 	</image></paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147490" role="tablehead" l10n="U" oldref="18">New Style from Selection</paragraph>
-     <paragraph xml-lang="en-US" id="par_idN109BB" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu with more commands.</ahelp></paragraph>
-     
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147490" role="tablehead" l10n="U" oldref="18">New Style from Selection</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN109BB" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu with more commands.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_NEWBYEXAMPLE" id="bm_id3149563" localize="false"/>
-     <paragraph xml-lang="en-US" id="par_idN109DA" role="paragraph" l10n="NEW">New style from selection</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3149552" role="paragraph" l10n="U" oldref="19"><ahelp hid=".">Creates a new style based on the formatting of the current paragraph, page, or selection.</ahelp></paragraph>
-     <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
-     
+<paragraph xml-lang="en-US" id="par_idN109DA" role="paragraph" l10n="NEW">New style from selection</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149552" role="paragraph" l10n="U" oldref="19"><ahelp hid=".">Creates a new style based on the formatting of the current paragraph, page, or selection.</ahelp></paragraph>
+               <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
 <bookmark xml-lang="en-US" branch="hid/HID_TEMPLDLG_UPDATEBYEXAMPLE" id="bm_id9001129" localize="false"/>
-     <paragraph xml-lang="en-US" id="par_idN10A04" role="paragraph" l10n="NEW">Update style</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3146333" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_TEMPLDLG_UPDATEBYEXAMPLE">Updates the style that is selected in the Styles and Formatting window to match the style of the current text selection.</ahelp></paragraph>
-     <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
-     <comment>UFI: removed help ids</comment>
-     <paragraph xml-lang="en-US" id="par_idN10A31" role="paragraph" l10n="NEW">Load style</paragraph>
-     <paragraph xml-lang="en-US" id="par_idN10A36" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Load Styles dialog to import styles from another document.</ahelp></paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <paragraph xml-lang="en-US" id="hd_id3148846" role="heading" level="2" l10n="CHG" oldref="24">Style List / Style Groups / Context Menu: New / Modify / Delete</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148860" role="paragraph" l10n="U" oldref="25">The commands offered in the Styles and Formatting window are the same as those found in the <link href="text/swriter/01/05130000.xhp" name="Style Catalog"><emph>Style Catalog</emph></link> dialog.<comment>UFI: Style Catalog may be removed, see Format Menu spec</comment></paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3155576" role="heading" level="2" l10n="U" oldref="26">Applied Styles</paragraph>
-  <embed href="text/shared/02/02010000.xhp#benvortext"/>
- </body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10A04" role="paragraph" l10n="NEW">Update style</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3146333" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_TEMPLDLG_UPDATEBYEXAMPLE">The manually formatted attributes of the text at the cursor position in the document will be added to the style that is selected in the Styles and Formatting window.</ahelp></paragraph>
+               <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/><comment>UFI: removed help ids</comment>
+<paragraph xml-lang="en-US" id="par_idN10A31" role="paragraph" l10n="NEW">Load style</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN10A36" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Load Styles dialog to import styles from another document.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3148860" role="tip" l10n="CHG" oldref="25">More information about <link href="text/swriter/01/05130000.xhp" name="styles">styles</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155576" role="heading" level="2" l10n="U"
+                 oldref="26">Applied Styles</paragraph>
+      <embed href="text/shared/02/02010000.xhp#benvortext"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index 9b956daeda..da8205e083 100755
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,27 +35,27 @@
  
 	
 <meta>
-<topic id="textswriter0105150000xml" indexer="include">
-<title id="tit" xml-lang="en-US">AutoCorrect</title>
-<filename>/text/swriter/01/05150000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="autoformat">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoFormat function; text documents</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3153925" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
-<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
-<emph> Options</emph></link>.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#autoformat1"/>
-</section>
-<embed href="text/swriter/01/05150100.xhp#eingabe"/>
-<embed href="text/swriter/01/05150200.xhp#dokument"/>
-<embed href="text/swriter/01/05150300.xhp#ananbe"/>
-<paragraph role="heading" id="hd_id1029200810080924" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
-<paragraph role="paragraph" id="par_id1029200810080924" xml-lang="en-US" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
-</body>
-</helpdocument>
+      <topic id="textswriter0105150000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">AutoCorrect</title>
+         <filename>/text/swriter/01/05150000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="autoformat">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153925"><bookmark_value>AutoCorrect function;text documents</bookmark_value>
+</bookmark><comment>MW changed AutoFormat to AutoCorrect</comment>
+<paragraph xml-lang="en-US" id="hd_id3153925" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151182" role="paragraph" l10n="U" oldref="2">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph>
+            <emph>Options</emph></link>.</paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#autoformat1"/>
+      </section>
+      <embed href="text/swriter/01/05150100.xhp#eingabe"/>
+      <embed href="text/swriter/01/05150200.xhp#dokument"/>
+      <embed href="text/swriter/01/05150300.xhp#ananbe"/>
+      <paragraph xml-lang="en-US" id="hd_id1029200810080924" role="heading" level="2" l10n="NEW"><link href="text/shared/01/06040000.xhp">AutoCorrect Options</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id1029200810080924" role="paragraph" l10n="NEW">Opens the AutoCorrect dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147570" role="paragraph" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150100.xhp b/helpcontent2/source/text/swriter/01/05150100.xhp
index 2f0fbdf8c8..fd028e3421 100644
--- a/helpcontent2/source/text/swriter/01/05150100.xhp
+++ b/helpcontent2/source/text/swriter/01/05150100.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05150101.xhp b/helpcontent2/source/text/swriter/01/05150101.xhp
index 952a46e109..b0b5c17ae4 100644
--- a/helpcontent2/source/text/swriter/01/05150101.xhp
+++ b/helpcontent2/source/text/swriter/01/05150101.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.
  * 
@@ -10,7 +10,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05150101.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
  * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
@@ -32,89 +32,95 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0105150101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoFormat for Tables</title>
-<filename>/text/swriter/01/05150101.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T13:54:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriter0105150101xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">AutoFormat for Tables</title>
+         <filename>/text/swriter/01/05150101.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id4963785" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTOFMT_TABLE" id="bm_id3150249" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value>
-<bookmark_value>AutoFormat function;applying to text tables</bookmark_value>
-<bookmark_value>styles;table styles</bookmark_value>
-</bookmark><comment>MW changed "tables styles;" to "styles;"</comment>
-<paragraph role="heading" id="hd_id3148485" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoFormat for Tables</paragraph>
-<paragraph role="paragraph" id="par_id3149500" xml-lang="en-US" l10n="U" oldref="2"><variable id="autoformattabelle"><ahelp hid="HID_AUTOFMT_TABLE">Automatically applies formats to the current table, including fonts, shading, and borders.</ahelp>
+      <bookmark_value>styles;table styles</bookmark_value>
+      <bookmark_value>AutoFormat function for tables</bookmark_value>
+</bookmark><comment>MW changed "tables styles;" to "styles;"</comment><comment>MW made "AutoFormat function;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3148485" role="heading" level="1" l10n="U" oldref="1">AutoFormat for Tables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><variable id="autoformattabelle"><ahelp hid="HID_AUTOFMT_TABLE">Automatically applies formats to the current table, including fonts, shading, and borders.</ahelp>
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#autoformattab"/>
-</section>
-<paragraph role="heading" id="hd_id3151388" xml-lang="en-US" level="2" l10n="U" oldref="3">Applying an AutoFormat to a Table</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145828" xml-lang="en-US" l10n="U" oldref="4">Click in a table cell, or select the cells that you want to format.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153006" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Table - AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145585" xml-lang="en-US" l10n="U" oldref="30">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT" id="bm_id3148770" localize="false"/>
-<paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="2" l10n="U" oldref="8">Format</paragraph>
-<paragraph role="paragraph" id="par_id3149022" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT">Lists the available formatting styles for tables. Click the format that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD" id="bm_id3147174" localize="false"/>
-<paragraph role="heading" id="hd_id3153722" xml-lang="en-US" level="2" l10n="U" oldref="10">Add</paragraph>
-<paragraph role="paragraph" id="par_id3151185" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD">Adds a new table style to the list.</ahelp></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154646" xml-lang="en-US" l10n="U" oldref="12">Format a table in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156320" xml-lang="en-US" l10n="CHG" oldref="13">Select the table, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153156" xml-lang="en-US" l10n="U" oldref="14">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151168" xml-lang="en-US" l10n="U" oldref="15">In the <link href="text/shared/01/05150101.xhp" name="Add AutoFormat"><emph>Add AutoFormat</emph></link> dialog, enter a name, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE" id="bm_id3154280" localize="false"/>
-<paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3150707" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE">Deletes the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE" id="bm_id3154103" localize="false"/>
-<paragraph role="heading" id="hd_id3152946" xml-lang="en-US" level="2" l10n="U" oldref="18">More</paragraph>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE">Displays more formatting options for tables. Click again to hide the options.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="31">Formatting</paragraph>
-<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="32">Select the formatting attributes that you to include in the selected table style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT" id="bm_id3147526" localize="false"/>
-<paragraph role="heading" id="hd_id3151317" xml-lang="en-US" level="3" l10n="U" oldref="33">Number format</paragraph>
-<paragraph role="paragraph" id="par_id3150970" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT">Includes numbering formats in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT" id="bm_id3152954" localize="false"/>
-<paragraph role="heading" id="hd_id3150350" xml-lang="en-US" level="3" l10n="U" oldref="24">Font</paragraph>
-<paragraph role="paragraph" id="par_id3152961" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT">Includes font formatting in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT" id="bm_id3153675" localize="false"/>
-<paragraph role="heading" id="hd_id3154575" xml-lang="en-US" level="3" l10n="U" oldref="20">Alignment</paragraph>
-<paragraph role="paragraph" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT">Includes alignment settings in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER" id="bm_id3154193" localize="false"/>
-<paragraph role="heading" id="hd_id3149690" xml-lang="en-US" level="3" l10n="U" oldref="22">Border</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER">Includes border styles in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN" id="bm_id3155184" localize="false"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="3" l10n="U" oldref="26">Pattern</paragraph>
-<paragraph role="paragraph" id="par_id3151325" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN">Includes background styles in the selected table style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME" id="bm_id3149483" localize="false"/>
-<paragraph role="heading" id="hd_id3149302" xml-lang="en-US" level="2" l10n="U" oldref="28">Rename</paragraph>
-<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style. You cannot rename the "Standard" table style.</ahelp></paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#autoformattab"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3151388" role="heading" level="2" l10n="U" oldref="3">Applying an AutoFormat to a Table</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145828" role="listitem" l10n="U" oldref="4">Click in a table cell, or select the cells that you want to format.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153006" role="listitem" l10n="CHG" oldref="5">Choose <emph>Table - AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145585" role="listitem" l10n="U" oldref="30">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT" id="bm_id3148770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148386" role="heading" level="2" l10n="U" oldref="8">Format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149022" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:DLG_AUTOFMT_TABLE:LB_FORMAT">Lists the available formatting styles for tables. Click the format that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD" id="bm_id3147174" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153722" role="heading" level="2" l10n="U"
+                 oldref="10">Add</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151185" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_ADD">Adds a new table style to the list.</ahelp></paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154646" role="listitem" l10n="U" oldref="12">Format a table in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156320" role="listitem" l10n="CHG" oldref="13">Select the table, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153156" role="listitem" l10n="U" oldref="14">Click <emph>Add</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151168" role="listitem" l10n="U" oldref="15">In the <link href="text/shared/01/05150101.xhp" name="Add AutoFormat"><emph>Add AutoFormat</emph></link> dialog, enter a name, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE" id="bm_id3154280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147516" role="heading" level="2" l10n="U"
+                 oldref="16">Delete</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150707" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE">Deletes the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE" id="bm_id3154103" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152946" role="heading" level="2" l10n="U"
+                 oldref="18">More</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149802" role="paragraph" l10n="U" oldref="19"><ahelp hid="SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE">Displays more formatting options for tables. Click again to hide the options.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153534" role="heading" level="2" l10n="U"
+                 oldref="31">Formatting</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154477" role="paragraph" l10n="U" oldref="32">Select the formatting attributes that you to include in the selected table style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT" id="bm_id3147526" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U"
+                 oldref="33">Number format</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150970" role="paragraph" l10n="U" oldref="34"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT">Includes numbering formats in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT" id="bm_id3152954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150350" role="heading" level="3" l10n="U"
+                 oldref="24">Font</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152961" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_FONT">Includes font formatting in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT" id="bm_id3153675" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154575" role="heading" level="3" l10n="U"
+                 oldref="20">Alignment</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155896" role="paragraph" l10n="U" oldref="21"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT">Includes alignment settings in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER" id="bm_id3154193" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149690" role="heading" level="3" l10n="U"
+                 oldref="22">Border</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154200" role="paragraph" l10n="U" oldref="23"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_BORDER">Includes border styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN" id="bm_id3155184" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="3" l10n="U"
+                 oldref="26">Pattern</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151325" role="paragraph" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN">Includes background styles in the selected table style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AUTOFMT_TABLE:BTN_RENAME" id="bm_id3149483" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149302" role="heading" level="2" l10n="U"
+                 oldref="28">Rename</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149490" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style. You cannot rename the "Standard" table style.</ahelp></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150104.xhp b/helpcontent2/source/text/swriter/01/05150104.xhp
index 827dde4af8..0573d28dda 100755
--- a/helpcontent2/source/text/swriter/01/05150104.xhp
+++ b/helpcontent2/source/text/swriter/01/05150104.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05150104.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3154502" xml-lang="en-US" level="1" l10n="U" oldref="1">Combine</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN" id="bm_id3145243" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_OFADLG_PRCNT_SET_ED_RIGHT_MARGIN" id="bm_id9093905" localize="false"/>
+<!-- removed HID OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN -->
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN" id="bm_id9093905" localize="false"/>
 <paragraph role="heading" id="hd_id3150020" xml-lang="en-US" level="2" l10n="U" oldref="2">Minimum Size</paragraph>
 <paragraph role="paragraph" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="OFFMGR:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN">Enter the minimum length for combining single-lined paragraphs as a percentage of the page width.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp
index aef854f350..1d557b5bf3 100644
--- a/helpcontent2/source/text/swriter/01/05150200.xhp
+++ b/helpcontent2/source/text/swriter/01/05150200.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,59 +35,60 @@
  
 	
 <meta>
-<topic id="textswriter0105150200xml" indexer="include">
-<title id="tit" xml-lang="en-US">Apply</title>
-<filename>/text/swriter/01/05150200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="dokument">
+      <topic id="textswriter0105150200xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Apply</title>
+         <filename>/text/swriter/01/05150200.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="dokument">
 <bookmark xml-lang="en-US" branch="hid/FN_AUTOFORMAT_APPLY" id="bm_id9349581" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatApply" id="bm_id3154656" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id5028839"><bookmark_value>automatic heading formatting</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="index" id="bm_id"><bookmark_value>AutoFormat function;headings</bookmark_value>
-<bookmark_value>headings;automatic</bookmark_value>
-<bookmark_value>separator lines;AutoFormat function</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
-<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#autoformat2"/>
-</section>
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
-<paragraph role="paragraph" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145241" xml-lang="en-US" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148386" xml-lang="en-US" l10n="U" oldref="20">paragraph does not end with a punctuation mark</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
-<paragraph role="paragraph" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
-<paragraph role="note" id="par_id3147507" xml-lang="en-US" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="10">AutoCorrect for Separator Lines</paragraph>
-<paragraph role="paragraph" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="13">Three underscore (_) yield a single line (1 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="14">Three equal signs (=) yield a double line (1.10 pt thick, gap 0.75 mm).</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="index" id="bm_id"><bookmark_value>AutoCorrect function;headings</bookmark_value>
+         <bookmark_value>headings;automatic</bookmark_value>
+         <bookmark_value>separator lines;AutoCorrect function</bookmark_value>
+</bookmark><comment>MW replaced AutoFormat by AutoCorrect (2 times)</comment>
+<paragraph xml-lang="en-US" id="hd_id3155962" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149871" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph>
+            <emph>Options</emph>.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000405.xhp#autoformat2"/>
+      </section>
+      <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+      <paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="15">When you apply automatic formats, the following rules apply:</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155625" role="heading" level="2" l10n="U" oldref="3">AutoCorrect for Headings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154505" role="paragraph" l10n="U" oldref="4">A paragraph is formatted as a heading when the following conditions are met:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145241" role="listitem" l10n="U" oldref="19">paragraph begins with a capital letter</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148386" role="listitem" l10n="U" oldref="20">paragraph does not end with a punctuation mark</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150564" role="listitem" l10n="U" oldref="21">empty paragraph above and below the paragraph</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149030" role="heading" level="2" l10n="U" oldref="8">AutoCorrect for Bullets / Numbering</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156316" role="paragraph" l10n="U" oldref="9">To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150763" role="paragraph" l10n="U" oldref="18">To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147507" role="note" l10n="U" oldref="16">Automatic numbering is only applied to paragraphs formatted with the <emph>Standard</emph>, <emph>Text body</emph> or <emph>Text body indent</emph> paragraph styles.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="2" l10n="U"
+                 oldref="10">AutoCorrect for Separator Lines</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154105" role="paragraph" l10n="U" oldref="11">If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the <link href="text/shared/01/05030500.xhp" name="lower border">lower border</link> of the preceding paragraph. The following rules apply:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153530" role="listitem" l10n="U" oldref="12">Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154477" role="listitem" l10n="U" oldref="13">Three underscore (_) yield a single line (1 pt thick, gap 0.75 mm).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150982" role="listitem" l10n="U" oldref="14">Three equal signs (=) yield a double line (1.10 pt thick, gap 0.75 mm).</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/05150300.xhp b/helpcontent2/source/text/swriter/01/05150300.xhp
index 7e960cc611..06c644a14e 100644
--- a/helpcontent2/source/text/swriter/01/05150300.xhp
+++ b/helpcontent2/source/text/swriter/01/05150300.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05170000.xhp b/helpcontent2/source/text/swriter/01/05170000.xhp
index f412ef0ae3..17d342483d 100644
--- a/helpcontent2/source/text/swriter/01/05170000.xhp
+++ b/helpcontent2/source/text/swriter/01/05170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05170000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,35 +48,35 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#vorlagenladen"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION" id="bm_id3154555" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_REGION" id="bm_id3154555" localize="false"/>
 <paragraph role="heading" id="hd_id3149354" xml-lang="en-US" level="2" l10n="U" oldref="6">Categories</paragraph>
 <paragraph role="paragraph" id="par_id3154561" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_REGION">Lists the available template categories. Click a category to view its contents in the <emph>Templates </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE" id="bm_id3145242" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE" id="bm_id3145242" localize="false"/>
 <paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="8">Templates</paragraph>
 <paragraph role="paragraph" id="par_id3145249" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATE">Lists the available templates for the selected category.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_TEXT" id="bm_id3148768" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_TEXT_STYLE" id="bm_id3148772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE" id="bm_id3148772" localize="false"/>
 <paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="2" l10n="U" oldref="10">Text</paragraph>
 <paragraph role="paragraph" id="par_id3149026" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_TEXT_STYLE">Loads the paragraph and the character styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_FRAME" id="bm_id3147170" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_FRAME_STYLE" id="bm_id3147174" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE" id="bm_id3147174" localize="false"/>
 <paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2" l10n="U" oldref="12">Frame</paragraph>
 <paragraph role="paragraph" id="par_id3156320" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_FRAME_STYLE">Loads the frame styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_PAGE" id="bm_id3151266" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_PAGE_STYLE" id="bm_id3151271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE" id="bm_id3151271" localize="false"/>
 <paragraph role="heading" id="hd_id3147565" xml-lang="en-US" level="2" l10n="U" oldref="14">Page</paragraph>
 <paragraph role="paragraph" id="par_id3154642" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_PAGE_STYLE">Loads the page styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_NUMBERING" id="bm_id3149752" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_NUM_STYLE" id="bm_id3149756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE" id="bm_id3149756" localize="false"/>
 <paragraph role="heading" id="hd_id3153147" xml-lang="en-US" level="2" l10n="U" oldref="18">Numbering</paragraph>
 <paragraph role="paragraph" id="par_id3152587" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_NUM_STYLE">Loads the numbering styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_LTEMPL_OVERRIDE" id="bm_id3145419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_DLG_NEW_FILE_CB_MERGE_STYLE" id="bm_id3147507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE" id="bm_id3147507" localize="false"/>
 <paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="16">Overwrite</paragraph>
 <paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2_CHECKBOX_DLG_NEW_FILE_CB_MERGE_STYLE">Replaces styles in the current document that have the same name as the styles you are loading.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="20">Styles with identical names are automatically overwritten.</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_DLG_NEW_FILE_PB_LOAD_FILE" id="bm_id3147520" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE" id="bm_id3147520" localize="false"/>
 <paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2" l10n="U" oldref="21">From file</paragraph>
 <paragraph role="paragraph" id="par_id3147526" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SFX2_PUSHBUTTON_DLG_NEW_FILE_PB_LOAD_FILE">Locate the file containing the styles that you want to load, and then click <emph>Open</emph>.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/05180000.xhp b/helpcontent2/source/text/swriter/01/05180000.xhp
index 2b0b7d1431..b75f2db987 100755
--- a/helpcontent2/source/text/swriter/01/05180000.xhp
+++ b/helpcontent2/source/text/swriter/01/05180000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05180000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05190000.xhp b/helpcontent2/source/text/swriter/01/05190000.xhp
index c6776c8197..cd19db9623 100644
--- a/helpcontent2/source/text/swriter/01/05190000.xhp
+++ b/helpcontent2/source/text/swriter/01/05190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05190000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_TABLE" id="bm_id3037041" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:SplitTable" id="bm_id3154654" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/20642" id="bm_id7706534" localize="false"/>
+<!-- removed HID 20642 -->
 <paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05190000.xhp" name="Split Table">Split Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3083450" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:SplitTable">Splits the current table into two separate tables at the cursor position.</ahelp> You can also access this command by right-clicking in a table cell.</paragraph>
 </section>
@@ -58,16 +55,16 @@
   <embed href="text/swriter/00/00000405.xhp#tabauf"/>
 </section>
 <paragraph role="heading" id="hd_id3149351" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT" id="bm_id3153002" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_CNTNT" id="bm_id3153002" localize="false"/>
 <paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="3" l10n="U" oldref="5">Copy heading</paragraph>
 <paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT">Includes the first row of the original table as the first row of the second table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA" id="bm_id3145247" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_PARA" id="bm_id3145247" localize="false"/>
 <paragraph role="heading" id="hd_id3149880" xml-lang="en-US" level="3" l10n="U" oldref="7">Custom heading (apply style)</paragraph>
 <paragraph role="paragraph" id="par_id3148389" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA" id="bm_id3148775" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_NOPARA" id="bm_id3148775" localize="false"/>
 <paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="9">Custom heading</paragraph>
 <paragraph role="paragraph" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA">Inserts an additional blank row in the second table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER" id="bm_id3147173" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SPLIT_TABLE:RB_BORDER" id="bm_id3147173" localize="false"/>
 <paragraph role="heading" id="hd_id3153720" xml-lang="en-US" level="3" l10n="U" oldref="11">No heading</paragraph>
 <paragraph role="paragraph" id="par_id3156318" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER">Splits the table without copying the header row.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="13">When you split a table that contains formulas, the formulas may be affected.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05200000.xhp b/helpcontent2/source/text/swriter/01/05200000.xhp
index b0c47b616b..f85d30eefb 100644
--- a/helpcontent2/source/text/swriter/01/05200000.xhp
+++ b/helpcontent2/source/text/swriter/01/05200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05200000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,8 +46,8 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_TABLE" id="bm_id6690819" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:MergeTable" id="bm_id3149048" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/20652" id="bm_id4696798" localize="false"/>
-<paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05200000.xhp" name="Merge Table">Merge Tables</link></paragraph>
+<!-- removed HID 20652 -->
+<paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05200000.xhp" name="Merge Table">Merge Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3147401" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:MergeTable">Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/05990000.xhp b/helpcontent2/source/text/swriter/01/05990000.xhp
index c0469a85e0..81c42bca45 100755
--- a/helpcontent2/source/text/swriter/01/05990000.xhp
+++ b/helpcontent2/source/text/swriter/01/05990000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 05990000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index 47259a6a3d..92c65a05a8 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,67 +27,72 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0106030000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Hyphenation</title>
 <filename>/text/swriter/01/06030000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-21T12:50:13">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="hyphenation">
 <bookmark xml-lang="en-US" branch="hid/SID_ENABLE_HYPHENATION" id="bm_id3267005" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:Hyphenate" id="bm_id3152361" localize="false"/>
 <paragraph role="heading" id="hd_id3154657" xml-lang="en-US" level="1" l10n="U" oldref="1">Hyphenation</paragraph>
-<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="2"><variable id="silben"><ahelp hid=".uno:Hyphenate">Inserts hyphens in words that are too long to fit at the end of a line.</ahelp> $[officename] searches the document and suggests hyphenation that you can accept or reject. 
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="2"><variable id="silben"><ahelp hid=".">Inserts hyphens in words that are too long to fit at the end of a line.</ahelp> $[officename] searches the document and suggests hyphenation that you can accept or reject. If text is selected, the Hyphenation dialog works on the selected text only. If no text is selected, the Hyphenation dialog works on the whole document.</variable></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000406.xhp#silbentrennung"/>
 </section>
 <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
-<paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="3">To automatically hyphenate the current or selected paragraphs, choose <emph>Format - Paragraph</emph>, and then click the <link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link> tab. You can also apply automatic hyphenation to a paragraph style.</paragraph>
+<paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="3">To automatically hyphenate the current or selected paragraphs, choose <emph>Format - Paragraph</emph>, and then click the <link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link> tab. You can also apply automatic hyphenation to a paragraph style. In text where automatic hyphenation is enabled, the Hyphenation dialog will not find any word to hyphenate.</paragraph>
 <paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="U" oldref="5">When $[officename] finds a word that requires hyphenation, do one of the following options:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3155622" xml-lang="en-US" l10n="U" oldref="36">To accept the suggestion, click <emph>Hyphenate</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155622" xml-lang="en-US" l10n="U" oldref="36">To accept the hyphenation of the displayed word, click <emph>Hyphenate</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="37">To change the hyphenation of the displayed word, click the left or right arrow below the word, and then click <emph>Hyphenate</emph>. The left and right buttons are enabled for words with multiple hyphenation points.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the hyphenation of the displayed word, click <emph>Skip</emph>. This word will not be hyphenated.</paragraph>
 </listitem>
+
 <listitem>
-<paragraph role="listitem" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="37">To accept one of the suggestions, click the hyphen, type an Equal sign (=), and then click <emph>Hyphenate</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="38">To automatically hyphenate the remaining part of the selection or the document, click <emph>Hyphenate All</emph> and answer "Yes" to the following question.</paragraph>
 </listitem>
+
 <listitem>
-<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the suggestion, click <emph>Remove</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150019" xml-lang="en-US" l10n="U" oldref="38">To end hyphenation, click <emph>Close</emph>. The hyphenation that is applied already will not be reverted. You can use <emph>Edit - Undo</emph> to undo all hyphenation that was applied while the Hyphenation dialog was open.</paragraph>
 </listitem>
+
 </list>
-<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation </emph>area.</paragraph>
-<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <link href="text/shared/optionen/01010400.xhp" name="Tools - Options - Language Settings - Writing Aids">Tools - Options - Language Settings - Writing Aids</link>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
-<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph</emph>, click the Text Flow tab, and then clear the <emph>Automatically</emph> check box in the Hyphenation area.</paragraph>
+<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To disable the Hyphenation dialog and always hyphenate automatically, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen directly in the document, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph>
-<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
-<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
 <paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
 <paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
 <paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD">Displays the hyphenation suggestion(s) for the selected word.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_LEFT" id="bm_id3159192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_RIGHT" id="bm_id3159196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT" id="bm_id3159192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT" id="bm_id3159196" localize="false"/>
 <paragraph role="heading" id="hd_id3154195" xml-lang="en-US" level="3" l10n="U" oldref="23">Left / Right Arrow</paragraph>
+
 <paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_RIGHT">Set the position of the hyphen. This option is only available if more than one hyphenation suggestion is displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" id="bm_id3149299" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" id="bm_id3149299" localize="false"/>
 <paragraph role="heading" id="hd_id3151327" xml-lang="en-US" level="2" l10n="U" oldref="25">Next</paragraph>
 <paragraph role="paragraph" id="par_id3149306" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE">Ignores the hyphenation suggestion and finds the next word to hyphenate.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HYPHENATE" id="bm_id3143280" localize="false"/>
 <paragraph role="heading" id="hd_id3149495" xml-lang="en-US" level="2" l10n="U" oldref="27">Hyphenate</paragraph>
 <paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_HYPHENATE">Inserts the hyphen at the indicated position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" id="bm_id3149815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" id="bm_id3149815" localize="false"/>
 <paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="29">Remove</paragraph>
-<paragraph role="paragraph" id="par_id3149821" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE">Rejects the hyphenation suggestion.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149821" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE">Removes the current hyphenation point from the displayed word.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/06040000.xhp b/helpcontent2/source/text/swriter/01/06040000.xhp
index 617bfaf093..0c7d2355b8 100755
--- a/helpcontent2/source/text/swriter/01/06040000.xhp
+++ b/helpcontent2/source/text/swriter/01/06040000.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,32 +27,30 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
 <meta>
-<topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Word Count</title>
-<filename>/text/swriter/01/06040000.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-24T16:24:52">UFI: new Writer menu entry Word Count</created>
-<lastedited date="2004-12-16T13:06:22">yj: checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Word Count</title>
+         <filename>/text/swriter/01/06040000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="hid/FN_WORDCOUNT_DIALOG" id="bm_id3698232" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLG_WORDCOUNT" id="bm_id6469313" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
 <section id="wordcount">
-<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
-<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000406.xhp#wordcount"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN1062D" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/01100400.xhp">Statistics</link></paragraph>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_idN10542" role="heading" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
+         <embed href="text/swriter/guide/words_count.xhp#how"/>
+      </section>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000406.xhp#wordcount"/>
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN1062D" role="paragraph" l10n="CHG"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/06060000.xhp b/helpcontent2/source/text/swriter/01/06060000.xhp
index 11d08fef57..14dd7e8aef 100644
--- a/helpcontent2/source/text/swriter/01/06060000.xhp
+++ b/helpcontent2/source/text/swriter/01/06060000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 <paragraph role="note" id="par_id3147567" xml-lang="en-US" l10n="U" oldref="55">To highlight the screen display of outline numbers, choose <emph>View -</emph>
 <emph>Field Shadings</emph>.</paragraph>
 <embed href="text/swriter/01/06060100.xhp#numerierung"/>
-<embed href="text/shared/01/06050600.xhp#position"/>
+<embed href="text/shared/01/06050600.xhp#position_s"/>
 <bookmark xml-lang="en-US" branch="hid/HID_OUTLINE_FORM" id="bm_id3147506" localize="false"/><paragraph role="heading" id="hd_id3151168" xml-lang="en-US" level="2" l10n="U" oldref="56">Format</paragraph>
 <paragraph role="paragraph" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_OUTLINE_FORM">Saves or loads an outline number format. A saved outline number format is available to all text documents.</ahelp></paragraph>
 <paragraph role="note" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="58">The <emph>Format</emph> button is only available for outline numbering. For numbered or bulleted list styles, modify the Numbering Styles of the paragraphs.</paragraph>
@@ -63,8 +60,8 @@
 <paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_NUM_OUTL_NAMED_NUMS">Select the predefined numbering style that you want to assign to the selected outline level.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_NUM_OUTL_NUM_SAVEAS" id="bm_id3152958" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="61">Save As</paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_NUM_OUTL_NUM_SAVEAS">Opens a dialog where you can save the current settings for the selected outline level. You can then load these settings from another document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_NUM_NAMES:ED_FORM" id="bm_id3154191" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_NUM_NAMES:LB_FORM" id="bm_id3154194" localize="false"/><paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="3" l10n="U" oldref="63">Save As</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_NUM_NAMES:ED_FORM" id="bm_id3154191" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_NUM_NAMES:LB_FORM" id="bm_id3154194" localize="false"/><paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="3" l10n="U" oldref="63">Save As</paragraph>
 <paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SW:LISTBOX:DLG_NUM_NAMES:LB_FORM">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/06060100.xhp b/helpcontent2/source/text/swriter/01/06060100.xhp
index 96529d02fd..9ed374e9d6 100755
--- a/helpcontent2/source/text/swriter/01/06060100.xhp
+++ b/helpcontent2/source/text/swriter/01/06060100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06060100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,15 +47,15 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000406.xhp#kapitelnumerierung1"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL" id="bm_id3154508" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL" id="bm_id3154508" localize="false"/>
 <paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
 <paragraph role="paragraph" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL">Click the outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for the paragraph style, to all of the levels, click "1-10".</paragraph>
 <paragraph role="heading" id="hd_id3145248" xml-lang="en-US" level="2" l10n="U" oldref="8">Numbering</paragraph>
 <paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="9">Specify the formatting for the select outline level.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_COLL" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="3" l10n="U" oldref="10">Paragraph Style</paragraph>
 <paragraph role="paragraph" id="par_id3153722" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL">Select the paragraph style that you want to assign to the selected outline level.</ahelp> If you click "None", the selected outline level is not defined.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OUTLINE_NUM:LB_NUMBER" id="bm_id3150766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER" id="bm_id3150766" localize="false"/>
 <paragraph role="heading" id="hd_id3151272" xml-lang="en-US" level="3" l10n="U" oldref="12">Number</paragraph>
 <paragraph role="paragraph" id="par_id3156319" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_NUMBER">Select the numbering style that you want to apply to the selected outline level.</ahelp></paragraph>
 <table id="tbl_id3154642">
@@ -140,19 +137,19 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT" id="bm_id3147218" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT" id="bm_id3147218" localize="false"/>
 <paragraph role="heading" id="hd_id3147098" xml-lang="en-US" level="3" l10n="U" oldref="40">Character Style</paragraph>
 <paragraph role="paragraph" id="par_id3147224" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT">Select the format of the numbering character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL" id="bm_id3149042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL" id="bm_id3149042" localize="false"/>
 <paragraph role="heading" id="hd_id3153643" xml-lang="en-US" level="3" l10n="U" oldref="28">Show sublevels</paragraph>
 <paragraph role="paragraph" id="par_id3147575" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_PREFIX" id="bm_id3155136" localize="false"/>
 <paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="3" l10n="U" oldref="30">Separator Before</paragraph>
 <paragraph role="paragraph" id="par_id3155142" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX">Enter the text that you want to display before the chapter number.</ahelp> For example, type "Chapter " to display "Chapter 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX" id="bm_id3153352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX" id="bm_id3153352" localize="false"/>
 <paragraph role="heading" id="hd_id3154386" xml-lang="en-US" level="3" l10n="U" oldref="32">Separator After</paragraph>
 <paragraph role="paragraph" id="par_id3153358" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX">Enter the text that you want to display after the chapter number.</ahelp> For example, type a period (.) to display "1."</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START" id="bm_id3149175" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:ED_START" id="bm_id3149175" localize="false"/>
 <paragraph role="heading" id="hd_id3150590" xml-lang="en-US" level="3" l10n="U" oldref="6">Start at</paragraph>
 <paragraph role="paragraph" id="par_id3151023" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START">Enter the number that you want to restart the chapter numbering at.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/06080000.xhp b/helpcontent2/source/text/swriter/01/06080000.xhp
index 8bafaa4ba9..f9d031dd4d 100644
--- a/helpcontent2/source/text/swriter/01/06080000.xhp
+++ b/helpcontent2/source/text/swriter/01/06080000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06080100.xhp b/helpcontent2/source/text/swriter/01/06080100.xhp
index 5d16ca061d..5b0dbc20d9 100644
--- a/helpcontent2/source/text/swriter/01/06080100.xhp
+++ b/helpcontent2/source/text/swriter/01/06080100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06080100.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 </section>
 <paragraph role="note" id="par_id3154560" xml-lang="en-US" l10n="U" oldref="47">To set additional option for footnotes and endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
 <paragraph role="heading" id="hd_id3149884" xml-lang="en-US" level="2" l10n="U" oldref="9">AutoNumbering</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW" id="bm_id3150929" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMVIEW" id="bm_id3150929" localize="false"/>
 <paragraph role="heading" id="hd_id3148394" xml-lang="en-US" level="3" l10n="U" oldref="11">Numbering</paragraph>
 <section id="endnotennumerierung">
 <paragraph role="paragraph" id="par_id3150568" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW">Select the numbering style that you want to use for footnotes or endnotes.</ahelp></paragraph>
@@ -125,7 +122,7 @@
 </table>
 
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMCOUNT" id="bm_id3155179" localize="false"/>
 <paragraph role="heading" id="hd_id3151330" xml-lang="en-US" level="3" l10n="U" oldref="25">Counting</paragraph>
 <paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT">Select the numbering option for the footnotes.</ahelp></paragraph>
 <table id="tbl_id3143284">
@@ -163,44 +160,44 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET" id="bm_id3149179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_FOOTNOTEOPTION:FLD_OFFSET" id="bm_id3149179" localize="false"/>
 <paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="33">Start at</paragraph>
 <paragraph role="paragraph" id="par_id3156268" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET">Enter the number for the first footnote in the document. This option is only available if you selected "Per Document" in the <emph>Counting </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX" id="bm_id3150580" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_PREFIX" id="bm_id3150580" localize="false"/>
 <paragraph role="heading" id="hd_id3151036" xml-lang="en-US" level="3" l10n="U" oldref="50">Before</paragraph>
 <paragraph role="paragraph" id="par_id3150587" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX">Enter the text that you want to display in front of the footnote number in the note text.</ahelp> For example, type "To " to display "To 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX" id="bm_id3156375" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_SUFFIX" id="bm_id3156375" localize="false"/>
 <paragraph role="heading" id="hd_id3156364" xml-lang="en-US" level="3" l10n="U" oldref="52">After</paragraph>
 <paragraph role="paragraph" id="par_id3155906" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX">Enter the text that you want to display after the footnote number in the note text.</ahelp> For example, type ")" to display "1)".</paragraph>
 <paragraph role="heading" id="hd_id3148875" xml-lang="en-US" level="3" l10n="U" oldref="3">Position</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE" id="bm_id3151380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE" id="bm_id3151380" localize="false"/>
 <paragraph role="heading" id="hd_id3148888" xml-lang="en-US" level="3" l10n="U" oldref="5">End of page</paragraph>
 <paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE">Displays footnotes at the bottom of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER" id="bm_id3150117" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER" id="bm_id3150117" localize="false"/>
 <paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="3" l10n="U" oldref="7">End of document</paragraph>
 <paragraph role="paragraph" id="par_id3150123" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER">Displays footnotes at the end of the document as endnotes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155871" xml-lang="en-US" level="2" l10n="U" oldref="35">Styles</paragraph>
 <paragraph role="paragraph" id="par_id3150695" xml-lang="en-US" l10n="U" oldref="36">To ensure a uniform appearance for the footnotes in your document, assign a paragraph style to the footnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147613" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147613" localize="false"/>
 <paragraph role="heading" id="hd_id3147418" xml-lang="en-US" level="3" l10n="U" oldref="37">Paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PARA_TEMPL">Select the paragraph style for the footnote text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3145122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3145122" localize="false"/>
 <paragraph role="heading" id="hd_id3147495" xml-lang="en-US" level="3" l10n="U" oldref="39">Page</paragraph>
 <paragraph role="paragraph" id="par_id3145128" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL">Select the page style that you want to use for footnotes.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149229" xml-lang="en-US" l10n="U" oldref="49">This option is only available if the <emph>End of Document</emph> check box is selected in the <emph>Position</emph> area.</paragraph>
 <paragraph role="heading" id="hd_id3147742" xml-lang="en-US" level="2" l10n="U" oldref="61">Character Styles</paragraph>
 <paragraph role="paragraph" id="par_id3146335" xml-lang="en-US" l10n="U" oldref="62">You can assign styles to footnote anchors and text. You can use the predefined footnote styles, or use a different style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3149846" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3149846" localize="false"/>
 <paragraph role="heading" id="hd_id3149834" xml-lang="en-US" level="3" l10n="U" oldref="63">Text area</paragraph>
 <paragraph role="paragraph" id="par_id3147592" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SW:LISTBOX:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT">Select the character style that you want to use for footnote anchors in the text area of your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FOOTNOTEOPTION_LB_TEXT_CHARFMT" id="bm_id3148857" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT" id="bm_id3148857" localize="false"/>
 <paragraph role="heading" id="hd_id3148845" xml-lang="en-US" level="3" l10n="U" oldref="55">Footnote area</paragraph>
 <paragraph role="paragraph" id="par_id3148863" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid="SW_LISTBOX_TP_FOOTNOTEOPTION_LB_TEXT_CHARFMT">Select the character style that you want to use for the footnote numbers in the footnote area.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155575" xml-lang="en-US" level="2" l10n="U" oldref="41">Continuation notice</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT" id="bm_id3151078" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_CONT" id="bm_id3151078" localize="false"/>
 <paragraph role="heading" id="hd_id3148445" xml-lang="en-US" level="3" l10n="U" oldref="43">End of Footnote</paragraph>
 <paragraph role="paragraph" id="par_id3151091" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT">Enter the text that you want to display when the footnotes are continued on the next page, for example, "Continued on Page ". $[officename] Writer automatically inserts the number of the following page. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT_FROM" id="bm_id3154082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FOOTNOTEOPTION:ED_CONT_FROM" id="bm_id3154082" localize="false"/>
 <paragraph role="heading" id="hd_id3154784" xml-lang="en-US" level="3" l10n="U" oldref="45">Start of next page</paragraph>
 <paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT_FROM">Enter the text that you want to display on the page where the footnotes are continued, for example, "Continued from Page ". $[officename] Writer automatically inserts the number of the previous page.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/06080200.xhp b/helpcontent2/source/text/swriter/01/06080200.xhp
index e30227c66b..13aabd2a8e 100755
--- a/helpcontent2/source/text/swriter/01/06080200.xhp
+++ b/helpcontent2/source/text/swriter/01/06080200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06080200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,32 +48,32 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000406.xhp#endnoten"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_NUMVIEW" id="bm_id3149757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW" id="bm_id3149757" localize="false"/>
 <paragraph role="heading" id="hd_id3149292" xml-lang="en-US" level="2" l10n="U" oldref="3">AutoNumbering</paragraph>
 <embed href="text/swriter/01/06080100.xhp#endnotennumerierung"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_ENDNOTEOPTION:FLD_OFFSET" id="bm_id3145421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET" id="bm_id3145421" localize="false"/>
 <paragraph role="heading" id="hd_id3151178" xml-lang="en-US" level="3" l10n="U" oldref="4">Start at</paragraph>
 <paragraph role="paragraph" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:NUMERICFIELD:TP_ENDNOTEOPTION:FLD_OFFSET">Enter the number for the first endnote in the document.</ahelp> This is useful if want the endnote numbering to span more than one document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_ENDNOTEOPTION:ED_PREFIX" id="bm_id3150714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX" id="bm_id3150714" localize="false"/>
 <paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="3" l10n="U" oldref="13">Before</paragraph>
 <paragraph role="paragraph" id="par_id3152943" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_ENDNOTEOPTION:ED_PREFIX">Enter the text that you want to display in front of the endnote number in the note text.</ahelp> For example, type "re: " to display "re: 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_ENDNOTEOPTION:ED_SUFFIX" id="bm_id3153529" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX" id="bm_id3153529" localize="false"/>
 <paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="15">After</paragraph>
 <paragraph role="paragraph" id="par_id3153535" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_ENDNOTEOPTION:ED_SUFFIX">Enter the text that you want to display after the endnote number in the note text.</ahelp> For example, type ")" to display "1)".</paragraph>
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
 <paragraph role="paragraph" id="par_id3150970" xml-lang="en-US" l10n="U" oldref="7">To ensure a uniform appearance for the endnotes in your document, assign a paragraph style to the footnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147520" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL" id="bm_id3147520" localize="false"/>
 <paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="3" l10n="U" oldref="8">Paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3147526" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_PARA_TEMPL">Select the paragraph style for the endnote text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL" id="bm_id3154482" localize="false"/>
 <paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="11">Page</paragraph>
 <paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_PAGE_TEMPL">Select the page style that you want to use for endnotes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155901" xml-lang="en-US" level="2" l10n="U" oldref="20">Character Styles</paragraph>
 <paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="21">You can assign styles to endnote anchors and text. You can use the predefined endnote styles, or use a different style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3159195" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT" id="bm_id3159195" localize="false"/>
 <paragraph role="heading" id="hd_id3154198" xml-lang="en-US" level="3" l10n="U" oldref="22">Text area</paragraph>
 <paragraph role="paragraph" id="par_id3159200" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:LISTBOX:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT">Select the character style that you want to use for endnote anchors in the text area of your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_ENDNOTEOPTION_LB_TEXT_CHARFMT" id="bm_id3155175" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT" id="bm_id3155175" localize="false"/>
 <paragraph role="heading" id="hd_id3151326" xml-lang="en-US" level="3" l10n="U" oldref="18">Endnote area</paragraph>
 <paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW_LISTBOX_TP_ENDNOTEOPTION_LB_TEXT_CHARFMT">Select the character style that you want to use for the endnote numbers in the endnote area.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp
index 18beb3247a..5cbefea005 100644
--- a/helpcontent2/source/text/swriter/01/06090000.xhp
+++ b/helpcontent2/source/text/swriter/01/06090000.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textswriter0106090000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Convert Text to Table</title>
@@ -56,41 +53,43 @@
 <paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="U" oldref="15">The options available in this dialog depending on the type of conversion.</paragraph>
 <paragraph role="heading" id="hd_id3145247" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Separate text at</paragraph>
 <paragraph role="paragraph" id="par_id3148388" xml-lang="en-US" l10n="U" oldref="4">A separator, such as a tab, marks the column boundaries in the selected text. Each paragraph in the selection is converted into a row in the table. Similarly, when you convert a table into text, the column markers are changed to the character that you specify, and each row is converted into a separate paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_TAB" id="bm_id3166468" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB" id="bm_id3166468" localize="false"/>
 <paragraph role="heading" id="hd_id3150936" xml-lang="en-US" level="3" l10n="U" oldref="6">Tabs</paragraph>
 <paragraph role="paragraph" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_TAB">Converts the text to a table using tabs as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_SEMI" id="bm_id3153722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI" id="bm_id3153722" localize="false"/>
 <paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="10">Semicolons</paragraph>
 <paragraph role="paragraph" id="par_id3147565" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_SEMI">Converts the text to a table using semi-colons (;) as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_PARA" id="bm_id3154638" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA" id="bm_id3154638" localize="false"/>
 <paragraph role="heading" id="hd_id3151273" xml-lang="en-US" level="3" l10n="U" oldref="12">Paragraph</paragraph>
 <paragraph role="paragraph" id="par_id3154645" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:CB_PARA">Converts the text to a table using paragraphs as column markers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER" id="bm_id3153151" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER" id="bm_id3153151" localize="false"/>
 <paragraph role="heading" id="hd_id3151184" xml-lang="en-US" level="3" l10n="U" oldref="16">Other:</paragraph>
 <paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER">Converts the text to a table using the character that you type in the box as a column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER" id="bm_id3151168" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER" id="bm_id3151168" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="20">Text box</paragraph>
 <paragraph role="paragraph" id="par_id3151175" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER">Type the character that you want to use as a column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN" id="bm_id3154273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN" id="bm_id3154273" localize="false"/>
 <paragraph role="heading" id="hd_id3147508" xml-lang="en-US" level="3" l10n="CHG" oldref="18">Equal width for all columns</paragraph>
 <paragraph role="paragraph" id="par_id3154278" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN">Creates columns of equal width, regardless of the position of the column marker.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
-<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="U" oldref="14">AutoCorrect</paragraph>
-<embed href="text/swriter/01/04150000.xhp#autoformattext"/>
+
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT" id="bm_id3152939" localize="false"/>
+<paragraph role="heading" id="hd_id3150703" xml-lang="en-US" level="2" l10n="CHG" oldref="14">AutoFormat</paragraph>
+<paragraph role="paragraph" id="par_id31542781" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".">Opens the <emph>AutoFormat</emph> dialog, where you can select a predefined layout for table.</ahelp></paragraph>
+
 <paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="2" l10n="U" oldref="22">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER" id="bm_id3153528" localize="false"/>
 <paragraph role="heading" id="hd_id3149802" xml-lang="en-US" level="3" l10n="U" oldref="23">Heading</paragraph>
 <paragraph role="paragraph" id="par_id3153535" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_HEADER">Formats the first row of the new table as a heading.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER" id="bm_id3152962" localize="false"/>
 <paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Repeat heading</paragraph>
 <paragraph role="paragraph" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER">Repeats the table header on each page that the table spans.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_CONV_TEXT_TABLE_NF_REPEAT_HEADER" id="bm_id6823328" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_CONV_TEXT_TABLE:NF_REPEAT_HEADER" id="bm_id6823328" localize="false"/>
 <paragraph role="heading" id="hd_id5971251" xml-lang="en-US" level="3" l10n="NEW">The first ... rows</paragraph>
 <paragraph role="paragraph" id="par_id4136478" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Repeats the first n rows as a header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT" id="bm_id3147524" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT" id="bm_id3147524" localize="false"/>
 <paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="3" l10n="CHG" oldref="25">Don't split table</paragraph>
 <paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT">Does not divide the table across pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_BORDER" id="bm_id3149123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER" id="bm_id3149123" localize="false"/>
 <paragraph role="heading" id="hd_id3154472" xml-lang="en-US" level="3" l10n="U" oldref="26">Border</paragraph>
 <paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_BORDER">Adds a border to the table and the table cells.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/06100000.xhp b/helpcontent2/source/text/swriter/01/06100000.xhp
index aebfc227f0..930574bb1a 100644
--- a/helpcontent2/source/text/swriter/01/06100000.xhp
+++ b/helpcontent2/source/text/swriter/01/06100000.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06100000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,95 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriter0106100000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sort    </title>
-<filename>/text/swriter/01/06100000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriter0106100000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Sort    </title>
+         <filename>/text/swriter/01/06100000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149353"><bookmark_value>tables;sorting rows</bookmark_value>
-<bookmark_value>sorting;paragraphs/table rows</bookmark_value>
-<bookmark_value>text; sorting paragraphs</bookmark_value>
-<bookmark_value>lines of text; sorting paragraphs</bookmark_value>
-<bookmark_value>sorting;paragraphs in special languages</bookmark_value>
-<bookmark_value>Asian languages;sorting paragraphs/table rows</bookmark_value>
+      <bookmark_value>sorting;paragraphs/table rows</bookmark_value>
+      <bookmark_value>text; sorting paragraphs</bookmark_value>
+      <bookmark_value>lines of text; sorting paragraphs</bookmark_value>
+      <bookmark_value>sorting;paragraphs in special languages</bookmark_value>
+      <bookmark_value>Asian languages;sorting paragraphs/table rows</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/FN_SORTING_DLG" id="bm_id849221" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id3145829" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_SORT_DIALOG" id="bm_id1702932" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/><paragraph role="heading" id="hd_id3149353" xml-lang="en-US" level="1" l10n="U" oldref="1">Sort</paragraph>
-<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys. 
+<bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149353" role="heading" level="1" l10n="U" oldref="1">Sort</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150015" role="paragraph" l10n="CHG" oldref="2"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys. 
 </variable></paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000406.xhp#sortieren"/>
-</section>
-<paragraph role="heading" id="hd_id3150931" xml-lang="en-US" level="2" l10n="U" oldref="3">Sort criteria</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY1" id="bm_id3153926" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY2" id="bm_id3166462" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_SORTING:CB_KEY3" id="bm_id3166466" localize="false"/><paragraph role="heading" id="hd_id3149029" xml-lang="en-US" level="3" l10n="U" oldref="4">Keys 1 to 3</paragraph>
-<paragraph role="paragraph" id="par_id3147170" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:CHECKBOX:DLG_SORTING:CB_KEY3">Specifies additional sorting criteria. You can also combine sort keys.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY1" id="bm_id3156318" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY2" id="bm_id3156322" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_SORTING:ED_KEY3" id="bm_id3154638" localize="false"/><paragraph role="heading" id="hd_id3147565" xml-lang="en-US" level="3" l10n="U" oldref="6">Column 1 to 3</paragraph>
-<paragraph role="paragraph" id="par_id3154644" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:NUMERICFIELD:DLG_SORTING:ED_KEY3">Enter the number of the table column that you want to use as a basis for sorting.</ahelp> The valid number range is 1 to 99.</paragraph>
-<paragraph role="paragraph" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="8">To sort paragraphs, select the <emph>Paragraph </emph>option in the <emph>Separator</emph> area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY1" id="bm_id3149286" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY2" id="bm_id3149289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_SORTING:DLB_KEY3" id="bm_id3149292" localize="false"/><paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="3" l10n="U" oldref="9">Key type 1 to 3</paragraph>
-<paragraph role="paragraph" id="par_id3149752" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:DLG_SORTING:DLB_KEY3">Select the sorting option that you want to use.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="2" l10n="U" oldref="16">Order</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP" id="bm_id3147506" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP2" id="bm_id3147509" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_UP3" id="bm_id3147513" localize="false"/><paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_UP3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN" id="bm_id3154101" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN2" id="bm_id3154104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_DN3" id="bm_id3152938" localize="false"/><paragraph role="heading" id="hd_id3150708" xml-lang="en-US" level="3" l10n="U" oldref="19">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3152946" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_DN3">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149812" xml-lang="en-US" level="2" l10n="U" oldref="11">Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_COL" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153540" xml-lang="en-US" level="3" l10n="U" oldref="12">Columns</paragraph>
-<paragraph role="paragraph" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_COL">Sorts the columns in the table according to the current sort options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_ROW" id="bm_id3153670" localize="false"/><paragraph role="heading" id="hd_id3147526" xml-lang="en-US" level="3" l10n="U" oldref="14">Rows</paragraph>
-<paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_ROW">Sorts the rows in the table or the paragraphs in the selection according to the current sort options.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="21">Separator</paragraph>
-<paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="22">Paragraphs are separated by nonprinting paragraph marks. You can also specify that tabs or a character act as separators when you sort paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_TAB" id="bm_id3155896" localize="false"/><paragraph role="heading" id="hd_id3154570" xml-lang="en-US" level="3" l10n="U" oldref="23">Tabs</paragraph>
-<paragraph role="paragraph" id="par_id3155902" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_TAB">If the selected paragraphs correspond to a list separated by tabs, select this option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_SORTING:RB_TABCH" id="bm_id3154201" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_SORTING:ED_TABCH" id="bm_id3159190" localize="false"/><paragraph role="heading" id="hd_id3154190" xml-lang="en-US" level="3" l10n="U" oldref="25">Character</paragraph>
-<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:EDIT:DLG_SORTING:ED_TABCH">Enter the character that you want to use as a separator in the selected area.</ahelp> By using the separator, $[officename] can determine the position of the sorting key in the selected paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_SORTING_PB_DELIM" id="bm_id3151335" localize="false"/><paragraph role="heading" id="hd_id3151324" xml-lang="en-US" level="3" l10n="U" oldref="31">...</paragraph>
-<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_PUSHBUTTON_DLG_SORTING_PB_DELIM">Opens the <emph>Special Characters</emph> dialog, where you can select the character that you want to use as a separator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_SORTING_LB_LANG" id="bm_id3149494" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="33">Language</paragraph>
-<paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_LISTBOX_DLG_SORTING_LB_LANG">Select the language that defines the sorting rules.</ahelp> Some languages sort special characters differently than other languages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SORTING_CB_CASE" id="bm_id3154832" localize="false"/><paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="35">Match case</paragraph>
-<paragraph role="paragraph" id="par_id3154838" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="SW_CHECKBOX_DLG_SORTING_CB_CASE">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10895" xml-lang="en-US" l10n="NEW">For Asian languages, select <emph>Match case </emph>to apply multi-level collation. In the multi-level collation, the primitive forms of the entries are first compared with the cases of the forms and diacritics ignored. If the forms are the same, the diacritics of the forms are compared. If the forms are still the same, the cases, character widths, and Japanese Kana differences of the forms are compared.<comment>UFI: see #112590# and #112507#</comment></paragraph>
-</body>
-</helpdocument>
+      <section id="howtoget">
+         <embed href="text/swriter/00/00000406.xhp#sortieren"/>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3150931" role="heading" level="2" l10n="U" oldref="3">Sort criteria</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY1" id="bm_id3153926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY2" id="bm_id3166462" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_KEY3" id="bm_id3166466" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149029" role="heading" level="2" l10n="U" oldref="4">Keys 1 to 3</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147170" role="paragraph" l10n="U" oldref="5"><ahelp hid="SW:CHECKBOX:DLG_SORTING:CB_KEY3">Specifies additional sorting criteria. You can also combine sort keys.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY1" id="bm_id3156318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY2" id="bm_id3156322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_SORTING:ED_KEY3" id="bm_id3154638" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147565" role="heading" level="2" l10n="U" oldref="6">Column 1 to 3</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154644" role="paragraph" l10n="CHG" oldref="7"><ahelp hid="SW:NUMERICFIELD:DLG_SORTING:ED_KEY3">Enter the number of the table column that you want to use as a basis for sorting.</ahelp></paragraph><comment>removed a para</comment>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY1" id="bm_id3149286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY2" id="bm_id3149289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:DLB_KEY3" id="bm_id3149292" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150254" role="heading" level="2" l10n="U" oldref="9">Key type 1 to 3</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149752" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:DLG_SORTING:DLB_KEY3">Select the sorting option that you want to use.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151177" role="heading" level="2" l10n="U"
+                 oldref="16">Order</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id072020090105453" role="heading" level="3" l10n="NEW">Ascending</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP" id="bm_id3147506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP2" id="bm_id3147509" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_UP3" id="bm_id3147513" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154270" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_UP3">Sorts in ascending order, (for example, 1, 2, 3 or a, b, c).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN" id="bm_id3154101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN2" id="bm_id3154104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_DN3" id="bm_id3152938" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150708" role="heading" level="2" l10n="U"
+                 oldref="19">Descending</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152946" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_DN3">Sorts in descending order (for example, 9, 8, 7 or z, y, x).</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149812" role="heading" level="2" l10n="U"
+                 oldref="11">Direction</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_COL" id="bm_id3152962" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153540" role="heading" level="2" l10n="U"
+                 oldref="12">Columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150973" role="paragraph" l10n="U" oldref="13"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_COL">Sorts the columns in the table according to the current sort options.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_ROW" id="bm_id3153670" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147526" role="heading" level="2" l10n="U"
+                 oldref="14">Rows</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="U" oldref="15"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_ROW">Sorts the rows in the table or the paragraphs in the selection according to the current sort options.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151312" role="heading" level="2" l10n="U"
+                 oldref="21">Separator</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150350" role="paragraph" l10n="U" oldref="22">Paragraphs are separated by nonprinting paragraph marks. You can also specify that tabs or a character act as separators when you sort paragraphs.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_TAB" id="bm_id3155896" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154570" role="heading" level="2" l10n="U"
+                 oldref="23">Tabs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155902" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_SORTING:RB_TAB">If the selected paragraphs correspond to a list separated by tabs, select this option.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_SORTING:RB_TABCH" id="bm_id3154201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SORTING:ED_TABCH" id="bm_id3159190" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154190" role="heading" level="2" l10n="U"
+                 oldref="25">Character</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159196" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW:EDIT:DLG_SORTING:ED_TABCH">Enter the character that you want to use as a separator in the selected area.</ahelp> By using the separator, $[officename] can determine the position of the sorting key in the selected paragraph.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_SORTING:PB_DELIM" id="bm_id3151335" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151324" role="heading" level="2" l10n="U"
+                 oldref="31">...</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="32"><ahelp hid="SW_PUSHBUTTON_DLG_SORTING_PB_DELIM">Opens the <emph>Special Characters</emph> dialog, where you can select the character that you want to use as a separator.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SORTING:LB_LANG" id="bm_id3149494" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
+                 oldref="33">Language</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151252" role="paragraph" l10n="U" oldref="34"><ahelp hid="SW_LISTBOX_DLG_SORTING_LB_LANG">Select the language that defines the sorting rules.</ahelp> Some languages sort special characters differently than other languages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SORTING:CB_CASE" id="bm_id3154832" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149104" role="heading" level="2" l10n="U"
+                 oldref="35">Match case</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154838" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="SW_CHECKBOX_DLG_SORTING_CB_CASE">Distinguishes between uppercase and lowercase letters when you sort a table. For Asian languages special handling applies.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10895" role="note" l10n="NEW">For Asian languages, select <emph>Match case </emph>to apply multi-level collation. In the multi-level collation, the primitive forms of the entries are first compared with the cases of the forms and diacritics ignored. If the forms are the same, the diacritics of the forms are compared. If the forms are still the same, the cases, character widths, and Japanese Kana differences of the forms are compared.<comment>UFI: see #112590# and #112507#</comment></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/01/06110000.xhp b/helpcontent2/source/text/swriter/01/06110000.xhp
index df1653c6ac..e8b3ab7721 100644
--- a/helpcontent2/source/text/swriter/01/06110000.xhp
+++ b/helpcontent2/source/text/swriter/01/06110000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06110000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06120000.xhp b/helpcontent2/source/text/swriter/01/06120000.xhp
index 82383568f2..1b38b35f68 100644
--- a/helpcontent2/source/text/swriter/01/06120000.xhp
+++ b/helpcontent2/source/text/swriter/01/06120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06120000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06160000.xhp b/helpcontent2/source/text/swriter/01/06160000.xhp
index bb76ea1897..cbfcd81620 100644
--- a/helpcontent2/source/text/swriter/01/06160000.xhp
+++ b/helpcontent2/source/text/swriter/01/06160000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06160000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06170000.xhp b/helpcontent2/source/text/swriter/01/06170000.xhp
index 8efa2007f6..07a2f76207 100644
--- a/helpcontent2/source/text/swriter/01/06170000.xhp
+++ b/helpcontent2/source/text/swriter/01/06170000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06170000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06180000.xhp b/helpcontent2/source/text/swriter/01/06180000.xhp
index 4b6ea9109c..423381e422 100644
--- a/helpcontent2/source/text/swriter/01/06180000.xhp
+++ b/helpcontent2/source/text/swriter/01/06180000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06180000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,44 +51,44 @@
 <section id="howtoget">
   <embed href="text/swriter/00/00000406.xhp#zeilennumerierung"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON" id="bm_id3147402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON" id="bm_id3147402" localize="false"/>
 <paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="2" l10n="U" oldref="5">Show numbering</paragraph>
 <paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON">Adds line numbers to the current document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3083449" xml-lang="en-US" level="2" l10n="U" oldref="7">View</paragraph>
 <paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="U" oldref="8">Set the properties of the line numbering.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE" id="bm_id3154558" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE" id="bm_id3154558" localize="false"/>
 <paragraph role="heading" id="hd_id3145822" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Style</paragraph>
 <paragraph role="paragraph" id="par_id3153000" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE">Select the formatting style that you want to use for the line numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT" id="bm_id3150020" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_FORMAT" id="bm_id3150020" localize="false"/>
 <paragraph role="heading" id="hd_id3149880" xml-lang="en-US" level="3" l10n="U" oldref="11">Format</paragraph>
 <paragraph role="paragraph" id="par_id3145246" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT">Select the numbering style that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_LINENUMBERING:LB_POS" id="bm_id3148774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LINENUMBERING:LB_POS" id="bm_id3148774" localize="false"/>
 <paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">Position</paragraph>
 <paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:LISTBOX:TP_LINENUMBERING:LB_POS">Select where you want the line numbers to appear.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LINENUMBERING:MF_OFFSET" id="bm_id3153924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LINENUMBERING:MF_OFFSET" id="bm_id3153924" localize="false"/>
 <paragraph role="heading" id="hd_id3155986" xml-lang="en-US" level="3" l10n="U" oldref="15">Spacing</paragraph>
 <paragraph role="paragraph" id="par_id3153719" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:METRICFIELD:TP_LINENUMBERING:MF_OFFSET">Enter the amount of space that you want to leave between the line numbers and the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LINENUMBERING:NF_NUM_INVERVAL" id="bm_id3151267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL" id="bm_id3151267" localize="false"/>
 <paragraph role="heading" id="hd_id3151183" xml-lang="en-US" level="3" l10n="U" oldref="17">Interval</paragraph>
 <paragraph role="paragraph" id="par_id3151272" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:NUMERICFIELD:TP_LINENUMBERING:NF_NUM_INVERVAL">Enter the counting interval for the line numbers.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156321" xml-lang="en-US" level="2" l10n="U" oldref="19">Separator</paragraph>
 <paragraph role="paragraph" id="par_id3150765" xml-lang="en-US" l10n="U" oldref="20">You can enter a separator character to display between line numbers if the counting interval is more than one.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_LINENUMBERING:ED_DIVISOR" id="bm_id3153150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_LINENUMBERING:ED_DIVISOR" id="bm_id3153150" localize="false"/>
 <paragraph role="heading" id="hd_id3150258" xml-lang="en-US" level="3" l10n="U" oldref="22">Text</paragraph>
 <paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW:EDIT:TP_LINENUMBERING:ED_DIVISOR">Enter the text that you want to use as a separator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL" id="bm_id3151175" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL" id="bm_id3151175" localize="false"/>
 <paragraph role="heading" id="hd_id3149757" xml-lang="en-US" level="3" l10n="U" oldref="24">Every</paragraph>
 <paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL">Enter the number of lines to leave between the separators.</ahelp></paragraph>
 <paragraph role="note" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="26">Separators are only displayed in lines that are not numbered.</paragraph>
 <paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="2" l10n="U" oldref="27">Count</paragraph>
 <paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="28">Specify whether to include empty paragraphs or lines in text frames in the line count.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES" id="bm_id3154573" localize="false"/>
 <paragraph role="heading" id="hd_id3153677" xml-lang="en-US" level="3" l10n="U" oldref="29">Blank lines</paragraph>
 <paragraph role="paragraph" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES">Includes empty paragraphs in the line count.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES" id="bm_id3150990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES" id="bm_id3150990" localize="false"/>
 <paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="3" l10n="U" oldref="31">Lines in text frames</paragraph>
 <paragraph role="paragraph" id="par_id3150995" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES">Adds line numbers to text in text frames. The numbering restarts in each text frame, and is excluded from the line count in the main text area of the document.</ahelp> In <link href="text/swriter/02/03210000.xhp" name="linked frames">linked frames</link>, the numbering is not restarted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LINENUMBERING_CB_RESTART_PAGE" id="bm_id3155902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LINENUMBERING:CB_RESTART_PAGE" id="bm_id3155902" localize="false"/>
 <paragraph role="heading" id="hd_id3151320" xml-lang="en-US" level="3" l10n="U" oldref="34">Restart every new page</paragraph>
 <paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW_CHECKBOX_TP_LINENUMBERING_CB_RESTART_PAGE">Restarts line numbering at the top of each page in the document.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/01/06190000.xhp b/helpcontent2/source/text/swriter/01/06190000.xhp
index cd0cfa147a..eee76651e8 100644
--- a/helpcontent2/source/text/swriter/01/06190000.xhp
+++ b/helpcontent2/source/text/swriter/01/06190000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06190000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06200000.xhp b/helpcontent2/source/text/swriter/01/06200000.xhp
index 84f4236f89..7cc4f62a48 100644
--- a/helpcontent2/source/text/swriter/01/06200000.xhp
+++ b/helpcontent2/source/text/swriter/01/06200000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06200000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06210000.xhp b/helpcontent2/source/text/swriter/01/06210000.xhp
index 7f9758847b..30c0dbf5bb 100644
--- a/helpcontent2/source/text/swriter/01/06210000.xhp
+++ b/helpcontent2/source/text/swriter/01/06210000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06210000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06220000.xhp b/helpcontent2/source/text/swriter/01/06220000.xhp
index a3afc29f7a..01b9f208b0 100644
--- a/helpcontent2/source/text/swriter/01/06220000.xhp
+++ b/helpcontent2/source/text/swriter/01/06220000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06220000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/06990000.xhp b/helpcontent2/source/text/swriter/01/06990000.xhp
index 604e6919cf..97b5671707 100755
--- a/helpcontent2/source/text/swriter/01/06990000.xhp
+++ b/helpcontent2/source/text/swriter/01/06990000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06990000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/format_object.xhp b/helpcontent2/source/text/swriter/01/format_object.xhp
index 61abe0e928..810a6ffcc9 100755
--- a/helpcontent2/source/text/swriter/01/format_object.xhp
+++ b/helpcontent2/source/text/swriter/01/format_object.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: format_object.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0b2f4eff8d..85044bad6e 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge00.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,12 +41,11 @@
 </meta>
 <body>
 <section id="mailmerge">
-<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id4642780" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" id="bm_id6627657" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id5004119" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><comment>UFI: moved DSBFormLetter ID to shared/main0212</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/mailmerge01.xhp b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
index 5d200b7e95..782c99f6a7 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge01.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge01.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,28 +44,28 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document that you want to use as a base for the mail merge document.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current Writer document as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_NEWDOC" id="bm_id501724" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC" id="bm_id501724" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Create a new document</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a new Writer document to use for the mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADDOC" id="bm_id216986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC" id="bm_id216986" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Start from existing document</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an existing Writer document to use as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_LOADDOC" id="bm_id7658314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC" id="bm_id7658314" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Locate the Writer document that you want too use, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Start from a template</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Templates and Documents</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_RECENTDOC" id="bm_id6065248" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC" id="bm_id6065248" localize="false"/>
 <paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from a recently saved starting document</paragraph>
 <paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_DOCSELECT_PAGE_LB_RECENTDOC" id="bm_id920133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC" id="bm_id920133" localize="false"/>
 <paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge02.xhp b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
index f6e661876f..b56cf20467 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge02.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge02.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,10 +44,10 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG">Specify the type of mail merge document to create. </paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge03.xhp b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
index 1bf18337f8..1fb279c293 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge03.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge03.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,25 +48,25 @@
 </section>
 <paragraph role="note" id="par_idN10561" xml-lang="en-US" l10n="NEW">The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the <emph>Select address list</emph> button is called <emph>Select different address list</emph>.</paragraph>
 <paragraph role="note" id="par_idN10556" xml-lang="en-US" l10n="NEW">The title of this page is <emph>Address block</emph> for letters and <emph>Address list</emph> for e-mail messages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ADDRESSLIST" id="bm_id8489028" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST" id="bm_id8489028" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Select address list</paragraph>
 <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdlis.xhp">Select Address List</link> dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</ahelp></paragraph>
 <paragraph role="warning" id="par_id7805413" xml-lang="en-US" l10n="NEW">When you edit some records in a Calc spreadsheet data source that is currently in use for a mail merge, those changes are not visible in the mail merge.<comment>ufi: see i9899</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_ADDRESS" id="bm_id934476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS" id="bm_id934476" localize="false"/>
 <paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">This document shall contain an address block</paragraph>
 <paragraph role="paragraph" id="par_idN10581" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds an address block to the mail merge document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the address block layout that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898237515" id="bm_id59205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_ADDRESSBLOCK_PAGE_CB_HIDE_EMPTY_PARA" id="bm_id59205" localize="false"/>
 <paragraph role="heading" id="hd_id9355754" xml-lang="en-US" level="3" l10n="NEW">Suppress lines with just empty fields</paragraph>
 <paragraph role="paragraph" id="par_id3109225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable to leave empty lines out of the address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_SETTINGS" id="bm_id8949247" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS" id="bm_id8949247" localize="false"/>
 <paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="3" l10n="NEW">More</paragraph>
 <paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdblo.xhp">Select Address Block</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ASSIGN" id="bm_id8653523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN" id="bm_id8653523" localize="false"/>
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Match fields</paragraph>
 <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_PREVSET" id="bm_id2950224" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET" id="bm_id8050477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET" id="bm_id2950224" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET" id="bm_id8050477" localize="false"/>
 <paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">(Browse buttons)</paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information from the previous or next data record.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge04.xhp" name="Mail Merge Wizard - Create a salutation">Mail Merge Wizard - Create a salutation</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge04.xhp b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
index da6a588ec9..55def9dbf5 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge04.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge04.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,40 +46,40 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard - Create a Salutation</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/898253839" id="bm_id274666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE" id="bm_id274666" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">This document should contain a salutation</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898253826" id="bm_id7168492" localize="false"/>
+<!-- removed HID 898253826 -->
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Insert personalized salutation</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a personalized salutation to the mail merge document. To use the default salutation, clear this check box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256387" id="bm_id1347392" localize="false"/>
+<!-- removed HID 898256387 -->
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="4" l10n="NEW">Female</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257412" id="bm_id7285073" localize="false"/>
+<!-- removed HID 898257412 -->
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Female recipient) dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256389" id="bm_id3386333" localize="false"/>
+<!-- removed HID 898256389 -->
 <paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="4" l10n="NEW">Male</paragraph>
 <paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257414" id="bm_id1029084" localize="false"/>
+<!-- removed HID 898257414 -->
 <paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Male recipient) dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256393" id="bm_id4558244" localize="false"/>
+<!-- removed HID 898256393 -->
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="4" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name of the address database field that contains the gender information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256907" id="bm_id960722" localize="false"/>
+<!-- removed HID 898256907 -->
 <paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="4" l10n="NEW">Field value</paragraph>
 <paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898256910" id="bm_id4571672" localize="false"/>
+<!-- removed HID 898256910 -->
 <paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="3" l10n="NEW">General salutation</paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the default salutation that is used when you do not specify a personalized salutation.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">Preview</paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the salutation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898257426" id="bm_id9288918" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_MM_GREETINGS_PAGE_PB_ASSIGN" id="bm_id9288918" localize="false"/>
 <paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="4" l10n="NEW">Match fields</paragraph>
 <paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/898264596" id="bm_id3859675" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/898264597" id="bm_id991546" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_PREVSET" id="bm_id3859675" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_NEXTSET" id="bm_id991546" localize="false"/>
 <paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="4" l10n="NEW">(Browse buttons)</paragraph>
 <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information from the previous or next data record.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge05.xhp" name="Mail Merge Wizard - Adjust layout">Mail Merge Wizard - Adjust layout</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge05.xhp b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
index 2b28d16aa7..77df875c5d 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge05.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge05.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,22 +46,22 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust Layout</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the position of the address blocks and salutations on the documents.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN" id="bm_id7631458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN" id="bm_id7631458" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Align to text body</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns the frame that contains the address block to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT" id="bm_id7862483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT" id="bm_id7862483" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">From left</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP" id="bm_id1113010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP" id="bm_id1113010" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">From top</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP" id="bm_id656758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP" id="bm_id656758" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Up</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN" id="bm_id3112582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN" id="bm_id3112582" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Down</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM" id="bm_id628070" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM" id="bm_id628070" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a magnification for the page preview.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW">Use the commands in the context menu of the preview to move the view up and down.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge06.xhp b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
index 205d2c190e..898504cd81 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge06.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge06.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,18 +46,18 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge06.xhp">Mail Merge Wizard - Edit Document</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Browse through the document previews, exclude single recipients, and edit the main document.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD" id="bm_id9046601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD" id="bm_id9046601" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Recipient</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the address record number of a recipient to preview the mail merge document for the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_FIRST" id="bm_id735801" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_PREV" id="bm_id290536" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_NEXT" id="bm_id2619708" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_LAST" id="bm_id1293679" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST" id="bm_id735801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV" id="bm_id290536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT" id="bm_id2619708" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST" id="bm_id1293679" localize="false"/>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use the browse buttons to scroll through the address records.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE" id="bm_id108340" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE" id="bm_id108340" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Exclude this recipient</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes the current recipient from this mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_EDIT" id="bm_id1743827" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT" id="bm_id1743827" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Edit Document</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Minimizes the wizard so that you can edit the main mail merge document for all recipients.</ahelp> To return to the wizard, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge07.xhp" name="Mail Merge Wizard - Personalize document">Mail Merge Wizard - Personalize document</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge07.xhp b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
index 8a9f167e94..736d2af0af 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge07.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge07.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,22 +45,22 @@
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Edit documents for each recipient.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">The Mail Merge Wizard creates a single merged document with page breaks between each recipient. When you reach this page of the wizard, the names and the addresses of the recipients are contained in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT" id="bm_id664082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT" id="bm_id664082" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Edit individual document</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Minimizes the wizard so that you can edit the mail merge document for a single recipient.</ahelp> After you made your changes, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND" id="bm_id2794885" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND" id="bm_id2794885" localize="false"/>
 <paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Search for</paragraph>
 <paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the text that you want to search for in the merged document, for example, the name of a recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND" id="bm_id2486342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND" id="bm_id2486342" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Find</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to start the search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS" id="bm_id823999" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS" id="bm_id823999" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Whole words only</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches for whole words only and not parts of larger words.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS" id="bm_id6592913" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS" id="bm_id6592913" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3" l10n="NEW">Backwards</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches from the current cursor position to the top of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE" id="bm_id4656208" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE" id="bm_id4656208" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Match case</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Distinguishes between uppercase and lowercase characters in the search.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge08.xhp" name="Mail Merge Wizard - Save print send">Mail Merge Wizard - Save, print or send</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
index 6dcf28af96..f714f59b9b 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmerge08.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,74 +47,74 @@
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Specifies the output options for mail merge documents.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The appearance of this page depends on the option that you select. After you specify the settings, click <emph>Finish</emph> to exit the wizard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVESTARTDOC" id="bm_id3743095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC" id="bm_id3743095" localize="false"/>
 <paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Save starting document</paragraph>
 <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the starting document that contains the database fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC" id="bm_id8654133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC" id="bm_id8654133" localize="false"/>
 <paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Save starting document</paragraph>
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC" id="bm_id5630664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC" id="bm_id5630664" localize="false"/>
 <paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="2" l10n="NEW">Save merged document</paragraph>
 <paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Saves the merged document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEASONE" id="bm_id7217627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE" id="bm_id7217627" localize="false"/>
 <paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3" l10n="NEW">Save as single document</paragraph>
 <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a single file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEINDIVIDUAL" id="bm_id3735465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL" id="bm_id3735465" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="3" l10n="NEW">Save as individual documents</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a separate file for each recipient. The file names of the documents are constructed from the name that you enter, followed by an underscore, and the number of the current record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_FROM" id="bm_id941190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM" id="bm_id941190" localize="false"/>
 <paragraph role="heading" id="par_idN1059B" xml-lang="en-US" level="3" l10n="NEW">From</paragraph>
 <paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects a range of records starting at the record number in the <emph>From</emph> box and ending at the record number in the <emph>To</emph> box. </ahelp><comment>UFI: used for saving and printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM" id="bm_id8942838" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM" id="bm_id8942838" localize="false"/>
 <paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">From</paragraph>
 <paragraph role="paragraph" id="par_idN106E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the number of the first record to include in the mail merge.</ahelp><comment>UFI: also used for printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO" id="bm_id7026886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO" id="bm_id7026886" localize="false"/>
 <paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="3" l10n="NEW">To</paragraph>
 <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the number of the last record to include in the mail merge.</ahelp><comment>UFI: also used for printing</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW" id="bm_id4436475" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW" id="bm_id4436475" localize="false"/>
 <paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Save Documents</paragraph>
 <paragraph role="paragraph" id="par_idN105AD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINT" id="bm_id7178868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT" id="bm_id7178868" localize="false"/>
 <paragraph role="heading" id="par_idN105B0" xml-lang="en-US" level="2" l10n="NEW">Print merged document</paragraph>
 <paragraph role="paragraph" id="par_idN105B4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints the output for all or some recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT" id="bm_id376598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT" id="bm_id376598" localize="false"/>
 <paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="3" l10n="NEW">Printer</paragraph>
 <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS" id="bm_id7486190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS" id="bm_id7486190" localize="false"/>
 <paragraph role="heading" id="par_idN105BE" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
 <paragraph role="paragraph" id="par_idN105C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Changes the printer properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINTALL" id="bm_id4834131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL" id="bm_id4834131" localize="false"/>
 <paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="3" l10n="NEW">Print all documents</paragraph>
 <paragraph role="paragraph" id="par_idN105C9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints documents for all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW" id="bm_id6397595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW" id="bm_id6397595" localize="false"/>
 <paragraph role="heading" id="par_idN105DA" xml-lang="en-US" level="3" l10n="NEW">Print Documents</paragraph>
 <paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints the mail merge documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDMAIL" id="bm_id508133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL" id="bm_id508133" localize="false"/>
 <paragraph role="heading" id="par_idN105E1" xml-lang="en-US" level="2" l10n="NEW">Send merged document as e-mail</paragraph>
 <paragraph role="paragraph" id="par_idN105E5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sends the output as e-mail messages to all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO" id="bm_id5152745" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO" id="bm_id5152745" localize="false"/>
 <paragraph role="heading" id="par_idN105E8" xml-lang="en-US" level="3" l10n="NEW">To</paragraph>
 <paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database field that contains the e-mail address of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO" id="bm_id3541673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO" id="bm_id3541673" localize="false"/>
 <paragraph role="heading" id="par_idN105EF" xml-lang="en-US" level="3" l10n="NEW">Copy to</paragraph>
 <paragraph role="paragraph" id="par_idN105F3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_copyto.xhp">Copy To</link> dialog where you can specify one or more CC or BCC addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT" id="bm_id5238196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT" id="bm_id5238196" localize="false"/>
 <paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Subject</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the subject line for the e-mail messages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS" id="bm_id9405499" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS" id="bm_id9405499" localize="false"/>
 <paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="3" l10n="NEW">Send as</paragraph>
 <paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the mail format for the e-mail messages.</ahelp></paragraph>
 <paragraph role="note" id="par_idN1060E" xml-lang="en-US" l10n="NEW">The Plain text and HTML message formats are sent in the body of the message, whereas the *.odt, *.doc, and *.pdf formats are sent as attachments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS" id="bm_id2954496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS" id="bm_id2954496" localize="false"/>
 <paragraph role="heading" id="par_idN10611" xml-lang="en-US" level="3" l10n="NEW">Properties</paragraph>
 <paragraph role="paragraph" id="par_idN10615" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_emabod.xhp">E-Mail Message</link> dialog where you can enter the e-mail message for the mail merge files that are sent as attachments.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT" id="bm_id8253730" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT" id="bm_id8253730" localize="false"/>
 <paragraph role="heading" id="par_idN10626" xml-lang="en-US" level="3" l10n="NEW">Name of the attachment</paragraph>
 <paragraph role="paragraph" id="par_idN1062A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Shows the name of the attachment.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL" id="bm_id8163090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL" id="bm_id8163090" localize="false"/>
 <paragraph role="heading" id="par_idN1062D" xml-lang="en-US" level="3" l10n="NEW">Send all documents</paragraph>
 <paragraph role="paragraph" id="par_idN10631" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to send e-mails to all recipients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS" id="bm_id425122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS" id="bm_id425122" localize="false"/>
 <paragraph role="heading" id="par_idN10642" xml-lang="en-US" level="3" l10n="NEW">Send Documents</paragraph>
 <paragraph role="paragraph" id="par_idN10646" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to start sending e-mails.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10649" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp" name="Mail Merge Wizard">Mail Merge Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/makefile.mk b/helpcontent2/source/text/swriter/01/makefile.mk
index 7232a42131..251de9e879 100644
--- a/helpcontent2/source/text/swriter/01/makefile.mk
+++ b/helpcontent2/source/text/swriter/01/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -227,4 +223,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/01/mm_copyto.xhp b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
index 9f857d0ad8..0b915fe3a5 100755
--- a/helpcontent2/source/text/swriter/01/mm_copyto.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_copyto.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,10 +42,10 @@
 <body>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Copy To</paragraph>
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Specify additional e-mail recipients for the <link href="text/swriter/01/mailmerge08.xhp">mail merge</link> document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_COPYTO_ED_CC" id="bm_id2162236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_CC" id="bm_id2162236" localize="false"/>
 <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">CC</paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail copies, separated by a semicolon (;).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_COPYTO_ED_BCC" id="bm_id3037202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_BCC" id="bm_id3037202" localize="false"/>
 <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">BCC</paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail blind copies, separated by a semicolon (;).</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp b/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
index f9185a2405..0635b91f96 100755
--- a/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_cusaddfie.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp b/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
index d563a363da..04669e5430 100755
--- a/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_cusaddlis.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
index 9300b12d56..bd14819106 100755
--- a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_cusgrelin.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,24 +45,24 @@
 <bookmark xml-lang="en-US" branch="hid/HID_MM_CUSTOMFIELDS" id="bm_id8578142" localize="false"/>
 <paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2" l10n="NEW">Salutation elements</paragraph>
 <paragraph role="paragraph" id="par_idN10555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_INSERTFIELD" id="bm_id5275734" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD" id="bm_id5275734" localize="false"/>
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">&gt;</paragraph>
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the selected field from the list of salutation elements to the other list. You can add a field more than once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_REMOVEFIELD" id="bm_id6546525" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD" id="bm_id6546525" localize="false"/>
 <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">&lt;</paragraph>
 <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected field from the other list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG" id="bm_id1746574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG" id="bm_id1746574" localize="false"/>
 <paragraph role="heading" id="par_idN10566" xml-lang="en-US" level="2" l10n="NEW">Drag salutation elements into the box below</paragraph>
 <paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Arrange the fields by drag-and-drop or use the arrow buttons.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD" id="bm_id8161564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD" id="bm_id8161564" localize="false"/>
 <paragraph role="heading" id="par_idN1056D" xml-lang="en-US" level="2" l10n="NEW">Customize salutation</paragraph>
 <paragraph role="paragraph" id="par_idN10571" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a value from the list for the salutation and the punctuation mark fields.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
 <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the first database record with the current salutation layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_UP" id="bm_id1669972" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_LEFT" id="bm_id1744743" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_RIGHT" id="bm_id1376384" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_DOWN" id="bm_id7465132" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP" id="bm_id1669972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT" id="bm_id1744743" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT" id="bm_id1376384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN" id="bm_id7465132" localize="false"/>
 <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">(Arrow Buttons)</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an item in the list and click an arrow button to move the item.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mm_emabod.xhp b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
index 7c9b313def..33244a9a16 100755
--- a/helpcontent2/source/text/swriter/01/mm_emabod.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_emabod.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,34 +42,34 @@
 <body>
 <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1" l10n="NEW">E-Mail Message</paragraph>
 <paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435403279" id="bm_id1831110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_MAILBODY_CB_GREETINGLINE" id="bm_id1831110" localize="false"/>
 <paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2" l10n="NEW">This e-mail should contain a salutation</paragraph>
 <paragraph role="paragraph" id="par_idN10558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435403266" id="bm_id6255073" localize="false"/>
+<!-- removed HID 1435403266 -->
 <paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="3" l10n="NEW">Insert personalized salutation</paragraph>
 <paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a personalized salutation. To use the default salutation, clear this check box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405827" id="bm_id8216193" localize="false"/>
+<!-- removed HID 1435405827 -->
 <paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="4" l10n="NEW">Female</paragraph>
 <paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406852" id="bm_id8684957" localize="false"/>
+<!-- removed HID 1435406852 -->
 <paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a female recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405829" id="bm_id3004547" localize="false"/>
+<!-- removed HID 1435405829 -->
 <paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="4" l10n="NEW">Male</paragraph>
 <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406854" id="bm_id1132847" localize="false"/>
+<!-- removed HID 1435406854 -->
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="4" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a male recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435405833" id="bm_id6285897" localize="false"/>
+<!-- removed HID 1435405833 -->
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name of the address database field that contains the gender information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406347" id="bm_id3717154" localize="false"/>
+<!-- removed HID 1435406347 -->
 <paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="4" l10n="NEW">Field value</paragraph>
 <paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435406350" id="bm_id4054994" localize="false"/>
+<!-- removed HID 1435406350 -->
 <paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="3" l10n="NEW">General salutation</paragraph>
 <paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the default greeting to use if a personalized salutation cannot be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1435404831" id="bm_id495010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_MULTILINEEDIT_DLG_MM_MAILBODY_MLE_BODY" id="bm_id495010" localize="false"/>
 <paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="3" l10n="NEW">Write your message here</paragraph>
 <paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the main text of the e-mail.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mm_finent.xhp b/helpcontent2/source/text/swriter/01/mm_finent.xhp
index 29aab87be8..d9ae39e6f5 100755
--- a/helpcontent2/source/text/swriter/01/mm_finent.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_finent.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_finent.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_matfie.xhp b/helpcontent2/source/text/swriter/01/mm_matfie.xhp
index 33e1c86770..14eb72c10c 100755
--- a/helpcontent2/source/text/swriter/01/mm_matfie.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_matfie.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_matfie.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp b/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
index 904d6637b2..f9f7b96856 100755
--- a/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_newaddblo.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp b/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
index 525e37fa08..9ea2097d6d 100755
--- a/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_newaddlis.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
index 7155c816cd..78cdc0c158 100755
--- a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_seladdblo.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,24 +44,24 @@
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</paragraph>
 <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select the address block which you want to use</paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the block in the list that you want to use for mail merge addresses, and click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER" id="bm_id6604815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER" id="bm_id6604815" localize="false"/>
 <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes country or regional information from the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_ALWAYS" id="bm_id2571184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS" id="bm_id2571184" localize="false"/>
 <paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes country or regional information in the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_DEPENDENT" id="bm_id6947538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT" id="bm_id6947538" localize="false"/>
 <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include country/region if it is not:</paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY" id="bm_id7257606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY" id="bm_id7257606" localize="false"/>
 <paragraph role="paragraph" id="par_idN10651" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the country/region string that shall not be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_NEW" id="bm_id1533249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW" id="bm_id1533249" localize="false"/>
 <paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can define a new address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_CUSTOMIZE" id="bm_id1784112" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE" id="bm_id1784112" localize="false"/>
 <paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can edit the selected address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_DELETE" id="bm_id2646565" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE" id="bm_id2646565" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected address block layout.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp b/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
index b76795837b..9da06f6ea2 100755
--- a/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seladdlis.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_seladdlis.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,19 +45,19 @@
 <bookmark xml-lang="en-US" branch="hid/HID_MM_ADDRESSLIST_TLB" id="bm_id119937" localize="false"/><comment>ufi: added help id for the table control, else the Help button does not work</comment>
 <paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Select Address List</paragraph>
 <paragraph role="paragraph" id="par_idN10549" xml-lang="en-US" l10n="NEW">Select the address list that you want to use for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>, then click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_LOADLIST" id="bm_id7303689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST" id="bm_id7303689" localize="false"/>
 <paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
 <paragraph role="paragraph" id="par_idN1055E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database file that contains the addresses that you want to use as an address list.</ahelp> If the file contains more than one table, the <link href="text/swriter/01/mm_seltab.xhp">Select Table</link> dialog opens.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_CREATELIST" id="bm_id584429" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST" id="bm_id584429" localize="false"/>
 <paragraph role="heading" id="par_idN10573" xml-lang="en-US" level="2" l10n="NEW">Create</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddlis.xhp">New Address List</link> dialog, where you can create a new address list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_FILTER" id="bm_id4916837" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER" id="bm_id4916837" localize="false"/>
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Filter</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/02/12090100.xhp">Standard Filter</link> dialog , where you can apply filters to the address list to display the recipients that you want to see.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_EDIT" id="bm_id3753166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT" id="bm_id3753166" localize="false"/>
 <paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddlis.xhp">New Address List</link> dialog, where you can edit the selected address list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_ADDRESSLISTDIALOG_PB_TABLE" id="bm_id7802667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE" id="bm_id7802667" localize="false"/>
 <paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="CHG">Change Table</paragraph>
 <paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seltab.xhp">Select Table</link> dialog, where you can select another table to use for mail merge.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/01/mm_seltab.xhp b/helpcontent2/source/text/swriter/01/mm_seltab.xhp
index f15b12e813..e98590158c 100755
--- a/helpcontent2/source/text/swriter/01/mm_seltab.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seltab.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mm_seltab.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" id="bm_id6627094" localize="false"/><paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Select Table</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the table that you want to use for <link href="text/swriter/01/mm_seladdlis.xhp">mail merge</link> addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW" id="bm_id2926419" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTDBTABLEDDIALOG:PB_PREVIEW" id="bm_id2926419" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
 <paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Mail Merge Recipients</emph> dialog.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/selection_mode.xhp b/helpcontent2/source/text/swriter/01/selection_mode.xhp
index d81ed59a5d..b464caa505 100644
--- a/helpcontent2/source/text/swriter/01/selection_mode.xhp
+++ b/helpcontent2/source/text/swriter/01/selection_mode.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selection_mode.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,13 +41,13 @@
 </meta>
 <body>
 <section id="selection_mode">
-<bookmark xml-lang="en-US" branch="hid/sel_mode_id" id="bm_id6964323" localize="false"/><paragraph role="heading" id="hd_id4177678" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/selection_mode.xhp">Selection Mode</link></paragraph>
+<!-- removed HID sel_mode_id --><paragraph role="heading" id="hd_id4177678" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/selection_mode.xhp">Selection Mode</link></paragraph>
 <paragraph role="paragraph" id="par_id2962126" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose the selection mode from the submenu: normal selection mode, or block selection mode.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000402.xhp#selection_mode"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/insert_normalid" id="bm_id5334025" localize="false"/><paragraph role="paragraph" id="par_id9816278" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In normal selection mode, you can select multi-line text including the line ends.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/insert_id" id="bm_id5380108" localize="false"/><paragraph role="paragraph" id="par_id3097323" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In block selection mode, you can select a rectangular block of text.</ahelp></paragraph>
+<!-- removed HID insert_normalid --><paragraph role="paragraph" id="par_id9816278" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In normal selection mode, you can select multi-line text including the line ends.</ahelp></paragraph>
+<!-- removed HID insert_id --><paragraph role="paragraph" id="par_id3097323" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In block selection mode, you can select a rectangular block of text.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/02/02110000.xhp b/helpcontent2/source/text/swriter/02/02110000.xhp
index 8596635d65..fcb04e3aa8 100644
--- a/helpcontent2/source/text/swriter/02/02110000.xhp
+++ b/helpcontent2/source/text/swriter/02/02110000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 02110000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/03210000.xhp b/helpcontent2/source/text/swriter/02/03210000.xhp
index 553b845ce0..61489024db 100644
--- a/helpcontent2/source/text/swriter/02/03210000.xhp
+++ b/helpcontent2/source/text/swriter/02/03210000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03210000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/03220000.xhp b/helpcontent2/source/text/swriter/02/03220000.xhp
index b6b4229c47..30a12bc903 100644
--- a/helpcontent2/source/text/swriter/02/03220000.xhp
+++ b/helpcontent2/source/text/swriter/02/03220000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 03220000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04090000.xhp b/helpcontent2/source/text/swriter/02/04090000.xhp
index e4005b448a..98d40a4ed7 100644
--- a/helpcontent2/source/text/swriter/02/04090000.xhp
+++ b/helpcontent2/source/text/swriter/02/04090000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04090000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04100000.xhp b/helpcontent2/source/text/swriter/02/04100000.xhp
index c3106df902..1773fb96fc 100644
--- a/helpcontent2/source/text/swriter/02/04100000.xhp
+++ b/helpcontent2/source/text/swriter/02/04100000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04100000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04220000.xhp b/helpcontent2/source/text/swriter/02/04220000.xhp
index 3d750d22a2..465a760d22 100644
--- a/helpcontent2/source/text/swriter/02/04220000.xhp
+++ b/helpcontent2/source/text/swriter/02/04220000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04220000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04230000.xhp b/helpcontent2/source/text/swriter/02/04230000.xhp
index 8621f4aece..134fda970b 100644
--- a/helpcontent2/source/text/swriter/02/04230000.xhp
+++ b/helpcontent2/source/text/swriter/02/04230000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04230000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04240000.xhp b/helpcontent2/source/text/swriter/02/04240000.xhp
index 1529fdd808..c37ee16f53 100644
--- a/helpcontent2/source/text/swriter/02/04240000.xhp
+++ b/helpcontent2/source/text/swriter/02/04240000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04240000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/04250000.xhp b/helpcontent2/source/text/swriter/02/04250000.xhp
index 33c0ec688d..518557a7ec 100644
--- a/helpcontent2/source/text/swriter/02/04250000.xhp
+++ b/helpcontent2/source/text/swriter/02/04250000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 04250000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06040000.xhp b/helpcontent2/source/text/swriter/02/06040000.xhp
index ba043f608b..da16beb8c7 100644
--- a/helpcontent2/source/text/swriter/02/06040000.xhp
+++ b/helpcontent2/source/text/swriter/02/06040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06070000.xhp b/helpcontent2/source/text/swriter/02/06070000.xhp
index eefcfe0219..6c994458f6 100644
--- a/helpcontent2/source/text/swriter/02/06070000.xhp
+++ b/helpcontent2/source/text/swriter/02/06070000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06070000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06080000.xhp b/helpcontent2/source/text/swriter/02/06080000.xhp
index dff5d97057..72e6a750e3 100644
--- a/helpcontent2/source/text/swriter/02/06080000.xhp
+++ b/helpcontent2/source/text/swriter/02/06080000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06080000.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06090000.xhp b/helpcontent2/source/text/swriter/02/06090000.xhp
index 228bbcebad..820c50ffdd 100644
--- a/helpcontent2/source/text/swriter/02/06090000.xhp
+++ b/helpcontent2/source/text/swriter/02/06090000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06120000.xhp b/helpcontent2/source/text/swriter/02/06120000.xhp
index b5698c18c0..a570cb4e44 100644
--- a/helpcontent2/source/text/swriter/02/06120000.xhp
+++ b/helpcontent2/source/text/swriter/02/06120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06120000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06130000.xhp b/helpcontent2/source/text/swriter/02/06130000.xhp
index dd2be06eb5..2249be3e17 100644
--- a/helpcontent2/source/text/swriter/02/06130000.xhp
+++ b/helpcontent2/source/text/swriter/02/06130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06130000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/06140000.xhp b/helpcontent2/source/text/swriter/02/06140000.xhp
index 1ee4f5e219..ca34eebba7 100644
--- a/helpcontent2/source/text/swriter/02/06140000.xhp
+++ b/helpcontent2/source/text/swriter/02/06140000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 06140000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/08010000.xhp b/helpcontent2/source/text/swriter/02/08010000.xhp
index c149abe74a..034d30ac94 100644
--- a/helpcontent2/source/text/swriter/02/08010000.xhp
+++ b/helpcontent2/source/text/swriter/02/08010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/08080000.xhp b/helpcontent2/source/text/swriter/02/08080000.xhp
index 02cab53cbd..c37de93359 100644
--- a/helpcontent2/source/text/swriter/02/08080000.xhp
+++ b/helpcontent2/source/text/swriter/02/08080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 08080000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10010000.xhp b/helpcontent2/source/text/swriter/02/10010000.xhp
index c71fa63178..695af5e5d4 100644
--- a/helpcontent2/source/text/swriter/02/10010000.xhp
+++ b/helpcontent2/source/text/swriter/02/10010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10010000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10020000.xhp b/helpcontent2/source/text/swriter/02/10020000.xhp
index d63e7e9ac3..f04648bf25 100644
--- a/helpcontent2/source/text/swriter/02/10020000.xhp
+++ b/helpcontent2/source/text/swriter/02/10020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10020000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10030000.xhp b/helpcontent2/source/text/swriter/02/10030000.xhp
index 378ef34836..ed4a52d792 100755
--- a/helpcontent2/source/text/swriter/02/10030000.xhp
+++ b/helpcontent2/source/text/swriter/02/10030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10030000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10050000.xhp b/helpcontent2/source/text/swriter/02/10050000.xhp
index fce71be0d6..bd7151d551 100644
--- a/helpcontent2/source/text/swriter/02/10050000.xhp
+++ b/helpcontent2/source/text/swriter/02/10050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10050000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10070000.xhp b/helpcontent2/source/text/swriter/02/10070000.xhp
index a1b689e0d3..f9376a44ec 100644
--- a/helpcontent2/source/text/swriter/02/10070000.xhp
+++ b/helpcontent2/source/text/swriter/02/10070000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10070000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="massstab">
-<bookmark xml-lang="en-US" branch="hid/FN_SHOW_FOUR_PAGES" id="bm_id3154507" localize="false"/>
+<!-- removed HID FN_SHOW_FOUR_PAGES -->
 <bookmark xml-lang="en-US" branch="hid/FN_PREVIEW_ZOOM" id="bm_id2536826" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PreviewZoom" id="bm_id3145243" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_SHOW_MULTIPLE_PAGES" id="bm_id2980921" localize="false"/>
@@ -66,9 +63,9 @@
 </table>
 </section>
 <paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="CHG" oldref="5">After clicking the <emph>Page Preview: Multiple Pages</emph> icon, the<emph> Multiple pages</emph> dialog opens. Use the two spin buttons to set the number of pages to be displayed. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_ROW" id="bm_id3155183" localize="false"/><paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="3" l10n="U" oldref="6">Rows</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW" id="bm_id3155183" localize="false"/><paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="3" l10n="U" oldref="6">Rows</paragraph>
 <paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_ROW">Defines the number of rows of pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_COL" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3143274" xml-lang="en-US" level="3" l10n="U" oldref="8">Columns</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3143274" xml-lang="en-US" level="3" l10n="U" oldref="8">Columns</paragraph>
 <paragraph role="paragraph" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW:NUMERICFIELD:DLG_PAGEPREVIEW_ZOOM:ED_COL">Defines the number of pages shown in columns.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149822" xml-lang="en-US" l10n="CHG" oldref="10">The settings you choose in the dialog can also be set using the mouse: Click the arrow next to the <emph>Page Preview: Multiple Pages</emph> icon. Now move the mouse over the desired number of rows and columns.</paragraph>
 </body>
diff --git a/helpcontent2/source/text/swriter/02/10080000.xhp b/helpcontent2/source/text/swriter/02/10080000.xhp
index 5e87bba349..58ae687154 100755
--- a/helpcontent2/source/text/swriter/02/10080000.xhp
+++ b/helpcontent2/source/text/swriter/02/10080000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10080000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/10090000.xhp b/helpcontent2/source/text/swriter/02/10090000.xhp
index 1b58765d25..e05b4f4ac2 100644
--- a/helpcontent2/source/text/swriter/02/10090000.xhp
+++ b/helpcontent2/source/text/swriter/02/10090000.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 10090000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,36 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriter0210090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Print page view</title>
-<filename>/text/swriter/02/10090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-19T09:38:27">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="drucken">
+      <topic id="textswriter0210090000xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Print page view</title>
+         <filename>/text/swriter/02/10090000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="drucken">
 <bookmark xml-lang="en-US" branch="hid/FN_PRINT_PAGEPREVIEW" id="bm_id7311881" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PrintPagePreView" id="bm_id3149290" localize="false"/>
-<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/10090000.xhp" name="Print page view">Print page view</link></paragraph>
-<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:PrintPagePreView">Opens the <emph>Print</emph> dialog to print the page preview. Use the <emph>Print options page view</emph> icon to set the printing scale and other printing properties.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152895" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/02/10090000.xhp" name="Print page view">Print page view</link><comment>remove this page</comment></paragraph><comment>id="par_id3151170" l10n="CHG" oldref="2"&lt;AVIS hid=".uno:PrintPagePreView"&gt;Opens the Print dialog to print the page preview. Use the Print options page view icon to set the printing scale and other printing properties.&lt;/AVIS&gt;</comment>
 </section>
-<section id="sydrucken">
-<table id="tbl_id3145414">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="E">
-<image id="img_id3154575" src="res/commandimagelist/sc_printpagepreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154575" xml-lang="en-US">Icon</alt>
+      <section id="sydrucken">
+         <table id="tbl_id3145414">
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="E">
+<image id="img_id3154575" src="res/commandimagelist/sc_printpagepreview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154575">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154568" xml-lang="en-US" l10n="U" oldref="3">Print page view</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="3">Print page view</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
 
-</section>
-</body>
-</helpdocument>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/02/10110000.xhp b/helpcontent2/source/text/swriter/02/10110000.xhp
index 8ffaf38e29..e73891532d 100644
--- a/helpcontent2/source/text/swriter/02/10110000.xhp
+++ b/helpcontent2/source/text/swriter/02/10110000.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: 10110000.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,21 +27,20 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
 <meta>
+
 <topic id="textswriter0210110000xml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Print Options</title>
 <filename>/text/swriter/02/10110000.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>
-  
-  
+
+
   <section id="doptionen">
   <bookmark xml-lang="en-US" branch="hid/FN_PREVIEW_PRINT_OPTIONS" id="bm_id4480392" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:PreviewPrintOptions" xml-lang="en-US" id="bm_id3145248"/><paragraph id="hd_id3154505" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/02/10110000.xhp" name="Print Options">Print Options</link></paragraph>
@@ -52,9 +49,9 @@
   <paragraph xml-lang="en-US" oldref="32" role="note" id="par_id3154567" l10n="U">The settings entered on the <emph>Print options</emph> dialog will only be activated if you print out the document using the <emph>Print page view</emph> icon.</paragraph>
   <section id="sydoptionen">
   <table id="tbl_id3155174">
-   
-   
-   
+
+
+
     <tablerow>
      <tablecell>
       <paragraph l10n="E" role="paragraph" id="par_id3143270" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_printersetup.png" id="img_id3143277"><alt xml-lang="en-US" id="alt_id3143277">Icon</alt></image></paragraph>
@@ -63,40 +60,40 @@
       <paragraph role="paragraph" id="par_id3149099" l10n="U" xml-lang="en-US" oldref="3">Print options page view</paragraph>
      </tablecell>
     </tablerow>
-   
+
   </table>
   </section>
   <paragraph role="heading" level="2" id="hd_id3148975" l10n="U" xml-lang="en-US" oldref="4">Distribution</paragraph>
   <paragraph role="paragraph" id="par_id3153634" l10n="U" xml-lang="en-US" oldref="5">Determines the number of rows and columns to print, as well as the print size. You can also choose to print several document pages on one printed page.</paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS" xml-lang="en-US" id="bm_id3155135"/><paragraph role="heading" level="3" id="hd_id3152771" l10n="U" xml-lang="en-US" oldref="6">Rows</paragraph>
+  <bookmark branch="hid/sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS" xml-lang="en-US" id="bm_id3155135"/><paragraph role="heading" level="3" id="hd_id3152771" l10n="U" xml-lang="en-US" oldref="6">Rows</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155141" xml-lang="en-US" oldref="7"><ahelp hid="SW:NUMERICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS" visibility="visible">Defines the number of rows of pages (horizontally stacked document pages).</ahelp></paragraph>
-  <bookmark branch="hid/SW:NUMERICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS" xml-lang="en-US" id="bm_id3155909"/><paragraph role="heading" level="3" id="hd_id3145780" l10n="U" xml-lang="en-US" oldref="8">Columns</paragraph>
+  <bookmark branch="hid/sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS" xml-lang="en-US" id="bm_id3155909"/><paragraph role="heading" level="3" id="hd_id3145780" l10n="U" xml-lang="en-US" oldref="8">Columns</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3155916" xml-lang="en-US" oldref="9"><ahelp hid="SW:NUMERICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS" visibility="visible">Defines the number of pages shown in columns (vertically tiled document pages).</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3150117" l10n="U" xml-lang="en-US" oldref="10">Margins</paragraph>
   <paragraph role="paragraph" id="par_id3155859" l10n="U" xml-lang="en-US" oldref="11">The print margins can be determined in this area.</paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN" xml-lang="en-US" id="bm_id3150696"/><paragraph role="heading" level="3" id="hd_id3150686" l10n="U" xml-lang="en-US" oldref="12">Left</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN" xml-lang="en-US" id="bm_id3150696"/><paragraph role="heading" level="3" id="hd_id3150686" l10n="U" xml-lang="en-US" oldref="12">Left</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147410" xml-lang="en-US" oldref="13"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN" visibility="visible">Specifies the left margin width.</ahelp></paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN" xml-lang="en-US" id="bm_id3149563"/><paragraph role="heading" level="3" id="hd_id3149552" l10n="U" xml-lang="en-US" oldref="14">Top</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN" xml-lang="en-US" id="bm_id3149563"/><paragraph role="heading" level="3" id="hd_id3149552" l10n="U" xml-lang="en-US" oldref="14">Top</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150546" xml-lang="en-US" oldref="15"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN" visibility="visible">Specifies the top margin height.</ahelp></paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN" xml-lang="en-US" id="bm_id3147744"/><paragraph role="heading" level="3" id="hd_id3147733" l10n="U" xml-lang="en-US" oldref="16">Right</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN" xml-lang="en-US" id="bm_id3147744"/><paragraph role="heading" level="3" id="hd_id3147733" l10n="U" xml-lang="en-US" oldref="16">Right</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147751" xml-lang="en-US" oldref="17"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN" visibility="visible">Specifies the right margin width.</ahelp></paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN" xml-lang="en-US" id="bm_id3148850"/><paragraph role="heading" level="3" id="hd_id3149845" l10n="U" xml-lang="en-US" oldref="18">Bottom</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN" xml-lang="en-US" id="bm_id3148850"/><paragraph role="heading" level="3" id="hd_id3149845" l10n="U" xml-lang="en-US" oldref="18">Bottom</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3148857" xml-lang="en-US" oldref="19"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN" visibility="visible">Specifies the bottom margin height.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3150491" l10n="U" xml-lang="en-US" oldref="20">Spacing</paragraph>
   <paragraph role="paragraph" id="par_id3156097" l10n="U" xml-lang="en-US" oldref="21">The spacing section is used to determine the horizontal and vertical distances between the reduced document pages on one page.</paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN" xml-lang="en-US" id="bm_id3150092"/><paragraph role="heading" level="3" id="hd_id3156113" l10n="U" xml-lang="en-US" oldref="22">Horizontal</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN" xml-lang="en-US" id="bm_id3150092"/><paragraph role="heading" level="3" id="hd_id3156113" l10n="U" xml-lang="en-US" oldref="22">Horizontal</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3150100" xml-lang="en-US" oldref="23"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN" visibility="visible">Determines the horizontal distance between document pages.</ahelp></paragraph>
-  <bookmark branch="hid/SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN" xml-lang="en-US" id="bm_id3153140"/><paragraph role="heading" level="3" id="hd_id3153128" l10n="U" xml-lang="en-US" oldref="24">Vertical</paragraph>
+  <bookmark branch="hid/sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN" xml-lang="en-US" id="bm_id3153140"/><paragraph role="heading" level="3" id="hd_id3153128" l10n="U" xml-lang="en-US" oldref="24">Vertical</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149632" xml-lang="en-US" oldref="25"><ahelp hid="SW:METRICFIELD:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN" visibility="visible">Determines the vertical distance between document pages.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3149649" l10n="U" xml-lang="en-US" oldref="26">Format</paragraph>
   <paragraph role="paragraph" id="par_id3154031" l10n="U" xml-lang="en-US" oldref="27">Determines what print format to use.</paragraph>
-  <bookmark branch="hid/SW:RADIOBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE" xml-lang="en-US" id="bm_id3149962"/><paragraph role="heading" level="3" id="hd_id3149950" l10n="U" xml-lang="en-US" oldref="28">Landscape</paragraph>
+  <bookmark branch="hid/sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE" xml-lang="en-US" id="bm_id3149962"/><paragraph role="heading" level="3" id="hd_id3149950" l10n="U" xml-lang="en-US" oldref="28">Landscape</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149969" xml-lang="en-US" oldref="29"><ahelp hid="SW:RADIOBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE" visibility="visible">Prints the page in landscape format.</ahelp></paragraph>
-  <bookmark branch="hid/SW:RADIOBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT" xml-lang="en-US" id="bm_id3149622"/><paragraph role="heading" level="3" id="hd_id3149611" l10n="U" xml-lang="en-US" oldref="30">Portrait</paragraph>
+  <bookmark branch="hid/sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT" xml-lang="en-US" id="bm_id3149622"/><paragraph role="heading" level="3" id="hd_id3149611" l10n="U" xml-lang="en-US" oldref="30">Portrait</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3145094" xml-lang="en-US" oldref="31"><ahelp hid="SW:RADIOBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT" visibility="visible">Prints the page in portrait format.</ahelp></paragraph>
-  <bookmark branch="hid/SW:PUSHBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD" xml-lang="en-US" id="bm_id3149572"/><paragraph role="heading" level="2" id="hd_id3145110" l10n="U" xml-lang="en-US" oldref="33">Default</paragraph>
+  <bookmark branch="hid/sw:PushButton:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD" xml-lang="en-US" id="bm_id3149572"/><paragraph role="heading" level="2" id="hd_id3145110" l10n="U" xml-lang="en-US" oldref="33">Default</paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3149579" xml-lang="en-US" oldref="34"><ahelp hid="SW:PUSHBUTTON:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD" visibility="visible">Specifies that the system will not use a fixed number of rows and columns when printing out the page view, but rather uses what was originally shown in the page view.</ahelp></paragraph>
-  
-  
+
+
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/02/14010000.xhp b/helpcontent2/source/text/swriter/02/14010000.xhp
index 6403d5cd63..c7b90cb0fa 100755
--- a/helpcontent2/source/text/swriter/02/14010000.xhp
+++ b/helpcontent2/source/text/swriter/02/14010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14010000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/14020000.xhp b/helpcontent2/source/text/swriter/02/14020000.xhp
index c551b66da3..9bfd98c858 100644
--- a/helpcontent2/source/text/swriter/02/14020000.xhp
+++ b/helpcontent2/source/text/swriter/02/14020000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14020000.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/14030000.xhp b/helpcontent2/source/text/swriter/02/14030000.xhp
index 0592f98ed2..8f4d6df1be 100644
--- a/helpcontent2/source/text/swriter/02/14030000.xhp
+++ b/helpcontent2/source/text/swriter/02/14030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14030000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/14040000.xhp b/helpcontent2/source/text/swriter/02/14040000.xhp
index 2b4e7d5159..0e053244c1 100644
--- a/helpcontent2/source/text/swriter/02/14040000.xhp
+++ b/helpcontent2/source/text/swriter/02/14040000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14040000.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/14050000.xhp b/helpcontent2/source/text/swriter/02/14050000.xhp
index 6344da7f97..37f513b40b 100644
--- a/helpcontent2/source/text/swriter/02/14050000.xhp
+++ b/helpcontent2/source/text/swriter/02/14050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 14050000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18010000.xhp b/helpcontent2/source/text/swriter/02/18010000.xhp
index 6c848a9ea1..401e42c39e 100644
--- a/helpcontent2/source/text/swriter/02/18010000.xhp
+++ b/helpcontent2/source/text/swriter/02/18010000.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18010000.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030000.xhp b/helpcontent2/source/text/swriter/02/18030000.xhp
index d7c77574ed..f77c8a11da 100644
--- a/helpcontent2/source/text/swriter/02/18030000.xhp
+++ b/helpcontent2/source/text/swriter/02/18030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030100.xhp b/helpcontent2/source/text/swriter/02/18030100.xhp
index 771352f45e..67329381ab 100644
--- a/helpcontent2/source/text/swriter/02/18030100.xhp
+++ b/helpcontent2/source/text/swriter/02/18030100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030100.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030200.xhp b/helpcontent2/source/text/swriter/02/18030200.xhp
index bda33f1e61..cacfa1ff18 100644
--- a/helpcontent2/source/text/swriter/02/18030200.xhp
+++ b/helpcontent2/source/text/swriter/02/18030200.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030200.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030300.xhp b/helpcontent2/source/text/swriter/02/18030300.xhp
index 35e4ec7332..ea71bf26b6 100644
--- a/helpcontent2/source/text/swriter/02/18030300.xhp
+++ b/helpcontent2/source/text/swriter/02/18030300.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030300.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030400.xhp b/helpcontent2/source/text/swriter/02/18030400.xhp
index b91b3e8a7f..50a9a56a09 100644
--- a/helpcontent2/source/text/swriter/02/18030400.xhp
+++ b/helpcontent2/source/text/swriter/02/18030400.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030400.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030500.xhp b/helpcontent2/source/text/swriter/02/18030500.xhp
index 4ce4a272c3..0ed5b5da0d 100644
--- a/helpcontent2/source/text/swriter/02/18030500.xhp
+++ b/helpcontent2/source/text/swriter/02/18030500.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030500.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030600.xhp b/helpcontent2/source/text/swriter/02/18030600.xhp
index c9de9fd65c..e6eca1119d 100644
--- a/helpcontent2/source/text/swriter/02/18030600.xhp
+++ b/helpcontent2/source/text/swriter/02/18030600.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030600.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18030700.xhp b/helpcontent2/source/text/swriter/02/18030700.xhp
index 12050ea71a..30ec7a0657 100644
--- a/helpcontent2/source/text/swriter/02/18030700.xhp
+++ b/helpcontent2/source/text/swriter/02/18030700.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18030700.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 <bookmark xml-lang="en-US" branch="hid/SID_INSERT_FLD_AUTHOR" id="bm_id4813138" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3154838" localize="false"/>
 <paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18030700.xhp" name="Author">Author</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User data"><emph>Tools - Options - $[officename] - User data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User data">$[officename] - User data</link></emph>.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#feldbefehlautor"/>
diff --git a/helpcontent2/source/text/swriter/02/18120000.xhp b/helpcontent2/source/text/swriter/02/18120000.xhp
index 17679a5e44..34255b7286 100644
--- a/helpcontent2/source/text/swriter/02/18120000.xhp
+++ b/helpcontent2/source/text/swriter/02/18120000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18120000.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/18130000.xhp b/helpcontent2/source/text/swriter/02/18130000.xhp
index 6d68f0777f..a23508ec3f 100644
--- a/helpcontent2/source/text/swriter/02/18130000.xhp
+++ b/helpcontent2/source/text/swriter/02/18130000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 18130000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,10 +33,6 @@
 <title id="tit" xml-lang="en-US">Direct Cursor On/Off</title>
 <filename>/text/swriter/02/18130000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-05T12:52:23">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="schacur">
@@ -48,7 +41,7 @@
 <bookmark xml-lang="en-US" branch="hid/FN_SHADOWCURSOR" id="bm_id4799596" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ShadowCursor" id="bm_id3154504" localize="false"/>
 <paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18130000.xhp" name="Direct Cursor On/Off">Direct Cursor On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>.</paragraph>
 </section>
 <section id="syschacur">
 <table id="tbl_id3151173" name="tbl_id3151173">
diff --git a/helpcontent2/source/text/swriter/02/19010000.xhp b/helpcontent2/source/text/swriter/02/19010000.xhp
index 9c8d32e33c..8ae5af7596 100644
--- a/helpcontent2/source/text/swriter/02/19010000.xhp
+++ b/helpcontent2/source/text/swriter/02/19010000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19010000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="kopfzeile">
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_HEADER" id="bm_id3152896" localize="false"/>
+<!-- removed HID FN_INSERT_HEADER -->
 <paragraph role="heading" id="hd_id3148769" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/19010000.xhp" name="Insert Header">Insert Header</link></paragraph>
 <paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="FN_INSERT_HEADER">Displays the header of an HTML document if headers are enabled on the <link href="text/shared/01/05040300.xhp" name="Format - Page - Header"><emph>Format - Page - Header</emph></link> tab page.</ahelp><comment>help text still visible in Customize - Toolbars, so do not remove</comment></paragraph>
 </section>
diff --git a/helpcontent2/source/text/swriter/02/19020000.xhp b/helpcontent2/source/text/swriter/02/19020000.xhp
index a6b4e2f71f..7ce2444516 100644
--- a/helpcontent2/source/text/swriter/02/19020000.xhp
+++ b/helpcontent2/source/text/swriter/02/19020000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19020000.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 </meta>
 <body>
 <section id="fusszeile">
-<bookmark xml-lang="en-US" branch="hid/FN_INSERT_FOOTER" id="bm_id3154502" localize="false"/>
+<!-- removed HID FN_INSERT_FOOTER -->
 <paragraph role="heading" id="hd_id3145829" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/19020000.xhp" name="Insert Footer">Insert Footer</link></paragraph>
 <paragraph role="paragraph" id="par_id3148768" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="FN_INSERT_FOOTER">Displays the footer of an HTML document if footers are enabled on the <link href="text/shared/01/05040400.xhp" name="Format - Page - Footer"><emph>Format - Page - Footer</emph></link> tab page.</ahelp><comment>help text still visible in Customize - Toolbars, so do not remove</comment><comment>name is wrong, see bug #105568#</comment></paragraph>
 </section>
diff --git a/helpcontent2/source/text/swriter/02/19030000.xhp b/helpcontent2/source/text/swriter/02/19030000.xhp
index 14979d1280..30fb2fa6ab 100644
--- a/helpcontent2/source/text/swriter/02/19030000.xhp
+++ b/helpcontent2/source/text/swriter/02/19030000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19030000.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/19040000.xhp b/helpcontent2/source/text/swriter/02/19040000.xhp
index c97fcab875..440f56909a 100755
--- a/helpcontent2/source/text/swriter/02/19040000.xhp
+++ b/helpcontent2/source/text/swriter/02/19040000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19040000.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/19050000.xhp b/helpcontent2/source/text/swriter/02/19050000.xhp
index 7bf5c443d6..6d0dc9ed28 100644
--- a/helpcontent2/source/text/swriter/02/19050000.xhp
+++ b/helpcontent2/source/text/swriter/02/19050000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 19050000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/02/makefile.mk b/helpcontent2/source/text/swriter/02/makefile.mk
index 2e0b93dd5a..d7378c2908 100644
--- a/helpcontent2/source/text/swriter/02/makefile.mk
+++ b/helpcontent2/source/text/swriter/02/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -99,4 +95,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp
index 023a0896f7..cb5dc0ccdb 100755
--- a/helpcontent2/source/text/swriter/04/01020000.xhp
+++ b/helpcontent2/source/text/swriter/04/01020000.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.15.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,1082 +32,1085 @@
  
 	
 <meta>
-<topic id="textswriter0401020000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Shortcut Keys for %PRODUCTNAME Writer</title>
-<filename>/text/swriter/04/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="starwritertastaturbefehle">
+      <topic id="textswriter0401020000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Shortcut Keys for %PRODUCTNAME Writer</title>
+         <filename>/text/swriter/04/01020000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="starwritertastaturbefehle">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145763"><bookmark_value>shortcut keys; in text documents</bookmark_value>
-<bookmark_value>text documents; shortcut keys in</bookmark_value>
+         <bookmark_value>text documents; shortcut keys in</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145763" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="text_keys"><link href="text/swriter/04/01020000.xhp" name="Shortcut Keys for %PRODUCTNAME Writer">Shortcut Keys for <item type="productname">%PRODUCTNAME</item> Writer</link>
+<paragraph xml-lang="en-US" id="hd_id3145763" role="heading" level="1" l10n="U" oldref="1"><variable id="text_keys"><link href="text/swriter/04/01020000.xhp" name="Shortcut Keys for %PRODUCTNAME Writer">Shortcut Keys for <item type="productname">%PRODUCTNAME</item> Writer</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150491" xml-lang="en-US" l10n="U" oldref="2">You can use shortcut keys to quickly perform common tasks in <item type="productname">%PRODUCTNAME</item>. This section lists the default shortcut keys for <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-</section>
-<paragraph role="paragraph" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="259">You can also use the <link href="text/shared/04/01010000.xhp" name="general shortcut keys in %PRODUCTNAME">general shortcut keys in <item type="productname">%PRODUCTNAME</item></link>.</paragraph>
-<paragraph role="heading" id="hd_id3149800" xml-lang="en-US" level="2" l10n="U" oldref="3">Function Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10663" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10668" xml-lang="en-US" l10n="NEW">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149486" xml-lang="en-US" l10n="U" oldref="7">F2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3143274" xml-lang="en-US" l10n="U" oldref="8">Formula Bar</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149821" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">Command 
+         <paragraph xml-lang="en-US" id="par_id3150491" role="paragraph" l10n="U" oldref="2">You can use shortcut keys to quickly perform common tasks in <item type="productname">%PRODUCTNAME</item>. This section lists the default shortcut keys for <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+         <embed href="text/shared/00/00000099.xhp#keys"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3145081" role="paragraph" l10n="U" oldref="259">You can also use the <link href="text/shared/04/01010000.xhp" name="general shortcut keys in %PRODUCTNAME">general shortcut keys in <item type="productname">%PRODUCTNAME</item></link>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149800" role="heading" level="2" l10n="U" oldref="3">Function Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10663" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10668" role="tablehead" l10n="NEW">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149486" role="tablecontent" l10n="U" oldref="7">F2</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3143274" role="tablecontent" l10n="U" oldref="8">Formula Bar</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149821" role="tablecontent" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145774" xml-lang="en-US" l10n="U" oldref="10">Insert Fields</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155912" xml-lang="en-US" l10n="U" oldref="11">F3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="12">Complete AutoText</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147411" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145774" role="tablecontent" l10n="U" oldref="10">Insert Fields</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155912" role="tablecontent" l10n="U" oldref="11">F3</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155855" role="tablecontent" l10n="U" oldref="12">Complete AutoText</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147411" role="tablecontent" l10n="U" oldref="13"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155060" xml-lang="en-US" l10n="U" oldref="14">Edit AutoText</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149839" xml-lang="en-US" l10n="U" oldref="15">F4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148847" xml-lang="en-US" l10n="U" oldref="16">Open Data Source View</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150097" xml-lang="en-US" l10n="CHG" oldref="19">Shift+F4</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153400" xml-lang="en-US" l10n="U" oldref="20">Select next frame<comment>UFI: see spec "OpenDocumentBehavior"</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156096" xml-lang="en-US" l10n="U" oldref="17">F5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156110" xml-lang="en-US" l10n="U" oldref="18">Navigator on/off</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153118" xml-lang="en-US" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155060" role="tablecontent" l10n="U" oldref="14">Edit AutoText</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149839" role="tablecontent" l10n="U" oldref="15">F4</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148847" role="tablecontent" l10n="U" oldref="16">Open Data Source View</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150097" role="tablecontent" l10n="CHG" oldref="19">Shift+F4</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153400" role="tablecontent" l10n="U" oldref="20">Select next frame<comment>UFI: see spec "OpenDocumentBehavior"</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156096" role="tablecontent" l10n="U" oldref="17">F5</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156110" role="tablecontent" l10n="U" oldref="18">Navigator on/off</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153118" role="tablecontent" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149628" xml-lang="en-US" l10n="CHG" oldref="22">Navigator on, go to page number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149647" xml-lang="en-US" l10n="U" oldref="24">F7</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="25">Spellcheck</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149601" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149628" role="tablecontent" l10n="CHG" oldref="22">Navigator on, go to page number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149647" role="tablecontent" l10n="U" oldref="24">F7</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149957" role="tablecontent" l10n="U" oldref="25">Spellcheck</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149601" role="tablecontent" l10n="U" oldref="26"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149850" xml-lang="en-US" l10n="U" oldref="27">Thesaurus</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149869" xml-lang="en-US" l10n="U" oldref="28">F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145096" xml-lang="en-US" l10n="U" oldref="29">Extension mode</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145116" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149850" role="tablecontent" l10n="U" oldref="27">Thesaurus</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149869" role="tablecontent" l10n="U" oldref="28">F8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145096" role="tablecontent" l10n="U" oldref="29">Extension mode</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145116" role="tablecontent" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149593" xml-lang="en-US" l10n="U" oldref="31">Field shadings on / off</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156250" xml-lang="en-US" l10n="U" oldref="32">Shift+F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156264" xml-lang="en-US" l10n="CHG" oldref="33">Additional selection mode</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7121494" xml-lang="en-US" l10n="NEW">Ctrl+Shift+F8</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id9048432" xml-lang="en-US" l10n="CHG">Block selection mode</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145408" xml-lang="en-US" l10n="U" oldref="34">F9</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="35">Update fields</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155324" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149593" role="tablecontent" l10n="U" oldref="31">Field shadings on / off</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156250" role="tablecontent" l10n="U" oldref="32">Shift+F8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156264" role="tablecontent" l10n="CHG" oldref="33">Additional selection mode</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7121494" role="tablecontent" l10n="NEW">Ctrl+Shift+F8</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9048432" role="tablecontent" l10n="CHG">Block selection mode</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145408" role="tablecontent" l10n="U" oldref="34">F9</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155306" role="tablecontent" l10n="U" oldref="35">Update fields</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155324" role="tablecontent" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154404" xml-lang="en-US" l10n="U" oldref="37">Show fields</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154423" xml-lang="en-US" l10n="U" oldref="38">Shift+F9</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153375" xml-lang="en-US" l10n="U" oldref="39">Calculate Table</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153394" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154404" role="tablecontent" l10n="U" oldref="37">Show fields</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154423" role="tablecontent" l10n="U" oldref="38">Shift+F9</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153375" role="tablecontent" l10n="U" oldref="39">Calculate Table</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153394" role="tablecontent" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F9</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154865" xml-lang="en-US" l10n="CHG" oldref="41">Update Input Fields and Input Lists<comment>UFI: fixes #i30104#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155883" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154865" role="tablecontent" l10n="CHG" oldref="41">Update Input Fields and Input Lists<comment>UFI: fixes #i30104#</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155883" role="tablecontent" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="44">Nonprinting Characters on/off</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148693" xml-lang="en-US" l10n="U" oldref="45">F11</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149978" xml-lang="en-US" l10n="CHG" oldref="46">Styles and Formatting window on/off</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149997" xml-lang="en-US" l10n="U" oldref="47">Shift+F11</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155926" xml-lang="en-US" l10n="U" oldref="48">Create Style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0905200802191980" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148674" role="tablecontent" l10n="U" oldref="44">Nonprinting Characters on/off</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148693" role="tablecontent" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149978" role="tablecontent" l10n="CHG" oldref="46">Styles and Formatting window on/off</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149997" role="tablecontent" l10n="U" oldref="47">Shift+F11</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155926" role="tablecontent" l10n="U" oldref="48">Create Style</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0905200802191980" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F11</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0905200802192020" xml-lang="en-US" l10n="NEW">Sets focus to Apply Style box<comment>i81468</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155945" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id0905200802192020" role="tablecontent" l10n="NEW">Sets focus to Apply Style box<comment>i81468</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155945" role="tablecontent" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F11</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153020" xml-lang="en-US" l10n="U" oldref="50">Update Style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153039" xml-lang="en-US" l10n="U" oldref="51">F12</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148959" xml-lang="en-US" l10n="U" oldref="52">Numbering on</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148979" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153020" role="tablecontent" l10n="U" oldref="50">Update Style</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153039" role="tablecontent" l10n="U" oldref="51">F12</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148959" role="tablecontent" l10n="U" oldref="52">Numbering on</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148979" role="tablecontent" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153650" xml-lang="en-US" l10n="U" oldref="54">Insert or edit Table</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152749" xml-lang="en-US" l10n="U" oldref="55">Shift+F12</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152763" xml-lang="en-US" l10n="U" oldref="56">Bullets on</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153876" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153650" role="tablecontent" l10n="U" oldref="54">Insert or edit Table</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152749" role="tablecontent" l10n="U" oldref="55">Shift+F12</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152763" role="tablecontent" l10n="U" oldref="56">Bullets on</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153876" role="tablecontent" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F12</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153901" xml-lang="en-US" l10n="U" oldref="58">Numbering / Bullets off</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153901" role="tablecontent" l10n="U" oldref="58">Numbering / Bullets off</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3147109" xml-lang="en-US" level="2" l10n="U" oldref="59">Shortcut Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10ACE" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10AD3" xml-lang="en-US" l10n="NEW">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149785" xml-lang="en-US" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="hd_id3147109" role="heading" level="2" l10n="U"
+                 oldref="59">Shortcut Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10ACE" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10AD3" role="tablehead" l10n="NEW">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149785" role="tablecontent" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150220" xml-lang="en-US" l10n="U" oldref="62">Select All</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150239" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150220" role="tablecontent" l10n="U" oldref="62">Select All</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150239" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145219" xml-lang="en-US" l10n="U" oldref="65">Justify</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145238" xml-lang="en-US" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145219" role="tablecontent" l10n="U" oldref="65">Justify</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145238" role="tablecontent" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150325" xml-lang="en-US" l10n="U" oldref="68">Double Underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148578" xml-lang="en-US" l10n="U" oldref="69"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150325" role="tablecontent" l10n="U" oldref="68">Double Underline</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148578" role="tablecontent" l10n="U" oldref="69"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+E</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="71">Centered</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147016" xml-lang="en-US" l10n="U" oldref="72"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148604" role="tablecontent" l10n="U" oldref="71">Centered</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147016" role="tablecontent" l10n="U" oldref="72"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147041" xml-lang="en-US" l10n="U" oldref="74">Find and Replace</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150940" xml-lang="en-US" l10n="U" oldref="75"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147041" role="tablecontent" l10n="U" oldref="74">Find and Replace</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150940" role="tablecontent" l10n="U" oldref="75"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+P</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150965" xml-lang="en-US" l10n="U" oldref="77">Superscript</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154363" xml-lang="en-US" l10n="U" oldref="78"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150965" role="tablecontent" l10n="U" oldref="77">Superscript</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154363" role="tablecontent" l10n="U" oldref="78"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+L</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154389" xml-lang="en-US" l10n="U" oldref="80">Align Left</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150519" xml-lang="en-US" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154389" role="tablecontent" l10n="U" oldref="80">Align Left</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150519" role="tablecontent" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147519" xml-lang="en-US" l10n="U" oldref="83">Align Right</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147538" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147519" role="tablecontent" l10n="U" oldref="83">Align Right</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147538" role="tablecontent" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+B</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153587" xml-lang="en-US" l10n="U" oldref="86">Subscript</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153606" xml-lang="en-US" l10n="U" oldref="87"><switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="89">Redo last action</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10D39" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153587" role="tablecontent" l10n="U" oldref="86">Subscript</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153606" role="tablecontent" l10n="U" oldref="87"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151268" role="tablecontent" l10n="U" oldref="89">Redo last action</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10D39" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+0 (zero)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10D64" xml-lang="en-US" l10n="NEW">Apply Default paragraph style<comment>UFI: see spec "Assign Keyboard Shortcuts to Styles"</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151287" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10D64" role="tablecontent" l10n="NEW">Apply Default paragraph style<comment>UFI: see spec "Assign Keyboard Shortcuts to Styles"</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151287" role="tablecontent" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+1</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153731" xml-lang="en-US" l10n="CHG" oldref="92">Apply Heading 1 paragraph style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153751" xml-lang="en-US" l10n="U" oldref="93"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153731" role="tablecontent" l10n="CHG" oldref="92">Apply Heading 1 paragraph style</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153751" role="tablecontent" l10n="U" oldref="93"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150831" xml-lang="en-US" l10n="CHG" oldref="95">Apply Heading 2 paragraph style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10DF8" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150831" role="tablecontent" l10n="CHG" oldref="95">Apply Heading 2 paragraph style</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10DF8" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+3</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10E23" xml-lang="en-US" l10n="NEW">Apply Heading 3 paragraph style</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150849" xml-lang="en-US" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10E23" role="tablecontent" l10n="NEW">Apply Heading 3 paragraph style</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150849" role="tablecontent" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+5</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146860" xml-lang="en-US" l10n="U" oldref="98">1.5 Line Spacing</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146878" xml-lang="en-US" l10n="U" oldref="99"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146860" role="tablecontent" l10n="U" oldref="98">1.5 Line Spacing</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146878" role="tablecontent" l10n="U" oldref="99"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Plus Key(+)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155403" xml-lang="en-US" l10n="CHG" oldref="101">Calculates the selected text and copies the result to the clipboard.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155432" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155403" role="tablecontent" l10n="CHG" oldref="101">Calculates the selected text and copies the result to the clipboard.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155432" role="tablecontent" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150712" xml-lang="en-US" l10n="U" oldref="104">Custom hyphens; hyphenation set by you.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150732" xml-lang="en-US" l10n="U" oldref="303"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150712" role="tablecontent" l10n="U" oldref="104">Custom hyphens; hyphenation set by you.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150732" role="tablecontent" l10n="U" oldref="303"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+minus sign (-)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="302">Non-breaking dash (is not used for hyphenation)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148414" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148394" role="tablecontent" l10n="U" oldref="302">Non-breaking dash (is not used for hyphenation)</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148414" role="tablecontent" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+multiplication sign * (only on number pad)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147302" xml-lang="en-US" l10n="U" oldref="107">Run macro field</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147321" xml-lang="en-US" l10n="U" oldref="108"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147302" role="tablecontent" l10n="U" oldref="107">Run macro field</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147321" role="tablecontent" l10n="U" oldref="108"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Space</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150260" xml-lang="en-US" l10n="U" oldref="110">Non-breaking spaces. Non-breaking spaces are not used for hyphenation and are not expanded if the text is justified.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150281" xml-lang="en-US" l10n="U" oldref="111">Shift+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150294" xml-lang="en-US" l10n="U" oldref="113">Line break without paragraph change</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149422" xml-lang="en-US" l10n="U" oldref="114"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150260" role="tablecontent" l10n="U" oldref="110">Non-breaking spaces. Non-breaking spaces are not used for hyphenation and are not expanded if the text is justified.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150281" role="tablecontent" l10n="U" oldref="111">Shift+Enter</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150294" role="tablecontent" l10n="U" oldref="113">Line break without paragraph change</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149422" role="tablecontent" l10n="U" oldref="114"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149447" xml-lang="en-US" l10n="U" oldref="116">Manual page break</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146967" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149447" role="tablecontent" l10n="U" oldref="116">Manual page break</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146967" role="tablecontent" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146993" xml-lang="en-US" l10n="U" oldref="119">Column break in multicolumnar texts</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152906" xml-lang="en-US" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146993" role="tablecontent" l10n="U" oldref="119">Column break in multicolumnar texts</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152906" role="tablecontent" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152932" xml-lang="en-US" l10n="U" oldref="300">Inserting a new paragraph without numbering</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153772" xml-lang="en-US" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152932" role="tablecontent" l10n="U" oldref="300">Inserting a new paragraph without numbering</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153772" role="tablecontent" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="293">Inserting a new paragraph directly before or after a section or a table.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153818" xml-lang="en-US" l10n="U" oldref="120">Arrow Left</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153930" xml-lang="en-US" l10n="U" oldref="121">Move cursor to left</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153949" xml-lang="en-US" l10n="U" oldref="122">Shift+Arrow Left</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="124">Move cursor with selection to the left</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148631" xml-lang="en-US" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153798" role="tablecontent" l10n="U" oldref="293">Inserting a new paragraph directly before or after a section or a table.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153818" role="tablecontent" l10n="U" oldref="120">Arrow Left</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153930" role="tablecontent" l10n="U" oldref="121">Move cursor to left</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153949" role="tablecontent" l10n="U" oldref="122">Shift+Arrow Left</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153963" role="tablecontent" l10n="U" oldref="124">Move cursor with selection to the left</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148631" role="tablecontent" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Left</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148656" xml-lang="en-US" l10n="U" oldref="127">Go to beginning of word</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154244" xml-lang="en-US" l10n="U" oldref="128"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148656" role="tablecontent" l10n="U" oldref="127">Go to beginning of word</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154244" role="tablecontent" l10n="U" oldref="128"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Left</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="130">Selecting to the left word by word</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153147" xml-lang="en-US" l10n="U" oldref="131">Arrow Right</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153161" xml-lang="en-US" l10n="U" oldref="132">Move cursor to right</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153180" xml-lang="en-US" l10n="U" oldref="133">Shift+Arrow Right</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154048" xml-lang="en-US" l10n="U" oldref="135">Move cursor with selection to the right</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154067" xml-lang="en-US" l10n="U" oldref="136"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154270" role="tablecontent" l10n="U" oldref="130">Selecting to the left word by word</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153147" role="tablecontent" l10n="U" oldref="131">Arrow Right</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153161" role="tablecontent" l10n="U" oldref="132">Move cursor to right</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153180" role="tablecontent" l10n="U" oldref="133">Shift+Arrow Right</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154048" role="tablecontent" l10n="U" oldref="135">Move cursor with selection to the right</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154067" role="tablecontent" l10n="U" oldref="136"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Right</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154093" xml-lang="en-US" l10n="CHG" oldref="138">Go to start of next word</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155272" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154093" role="tablecontent" l10n="CHG" oldref="138">Go to start of next word</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155272" role="tablecontent" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Right</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155298" xml-lang="en-US" l10n="U" oldref="141">Selecting to the right word by word</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154718" xml-lang="en-US" l10n="U" oldref="142">Arrow Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154731" xml-lang="en-US" l10n="CHG" oldref="143">Move cursor up one line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154750" xml-lang="en-US" l10n="U" oldref="144">Shift+Arrow Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153199" xml-lang="en-US" l10n="U" oldref="146">Selecting lines in an upwards direction</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id6452528" xml-lang="en-US" l10n="NEW">Ctrl+Arrow Up<comment>UFI: inserted 4 rows, see i31697</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1764275" xml-lang="en-US" l10n="NEW">Move cursor to beginning of paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id778527" xml-lang="en-US" l10n="NEW">Shift+Ctrl+Arrow Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1797235" xml-lang="en-US" l10n="NEW">Select to beginning of paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153218" xml-lang="en-US" l10n="U" oldref="147">Arrow Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153232" xml-lang="en-US" l10n="U" oldref="148">Move cursor down one line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153317" xml-lang="en-US" l10n="U" oldref="149">Shift+Arrow Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="151">Selecting lines in a downward direction</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id578936" xml-lang="en-US" l10n="NEW">Ctrl+Arrow Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id6164433" xml-lang="en-US" l10n="NEW">Move cursor to end of paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7405011" xml-lang="en-US" l10n="NEW">Shift+Ctrl+Arrow Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3729361" xml-lang="en-US" l10n="NEW">Select to end of paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153351" xml-lang="en-US" l10n="U" oldref="152">Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="153">Go to beginning of line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154531" xml-lang="en-US" l10n="U" oldref="154">Shift+Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154544" xml-lang="en-US" l10n="U" oldref="156">Go and select to the beginning of a line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150972" xml-lang="en-US" l10n="U" oldref="157">End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="158">Go to end of line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151005" xml-lang="en-US" l10n="U" oldref="159">Shift+End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151019" xml-lang="en-US" l10n="U" oldref="161">Go and select to end of line</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149371" xml-lang="en-US" l10n="U" oldref="162"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155298" role="tablecontent" l10n="U" oldref="141">Selecting to the right word by word</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154718" role="tablecontent" l10n="U" oldref="142">Arrow Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154731" role="tablecontent" l10n="CHG" oldref="143">Move cursor up one line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154750" role="tablecontent" l10n="U" oldref="144">Shift+Arrow Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153199" role="tablecontent" l10n="U" oldref="146">Selecting lines in an upwards direction</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6452528" role="tablecontent" l10n="NEW">Ctrl+Arrow Up<comment>UFI: inserted 4 rows, see i31697</comment><comment>2 years later I got an email that the submitted help patch was wrong. Corrected the Help accordingly.</comment></paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1764275" role="tablecontent" l10n="CHG">Move cursor to beginning of the previous paragraph</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id778527" role="tablecontent" l10n="NEW">Shift+Ctrl+Arrow Up</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1797235" role="tablecontent" l10n="NEW">Select to beginning of paragraph. Next keystroke extends selection to beginning of previous paragraph</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153218" role="tablecontent" l10n="U" oldref="147">Arrow Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153232" role="tablecontent" l10n="U" oldref="148">Move cursor down one line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153317" role="tablecontent" l10n="U" oldref="149">Shift+Arrow Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153331" role="tablecontent" l10n="U" oldref="151">Selecting lines in a downward direction</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id578936" role="tablecontent" l10n="NEW">Ctrl+Arrow Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6164433" role="tablecontent" l10n="CHG">Move cursor to beginning of next paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7405011" role="tablecontent" l10n="NEW">Shift+Ctrl+Arrow Down</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3729361" role="tablecontent" l10n="CHG">Select to end of paragraph. Next keystroke extends selection to end of next paragraph</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153351" role="tablecontent" l10n="U" oldref="152">Home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154512" role="tablecontent" l10n="U" oldref="153">Go to beginning of line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154531" role="tablecontent" l10n="U" oldref="154">Shift+Home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154544" role="tablecontent" l10n="U" oldref="156">Go and select to the beginning of a line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150972" role="tablecontent" l10n="U" oldref="157">End</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150986" role="tablecontent" l10n="U" oldref="158">Go to end of line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151005" role="tablecontent" l10n="U" oldref="159">Shift+End</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151019" role="tablecontent" l10n="U" oldref="161">Go and select to end of line</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149371" role="tablecontent" l10n="U" oldref="162"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149396" xml-lang="en-US" l10n="U" oldref="164">Go to start of document</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151030" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149396" role="tablecontent" l10n="U" oldref="164">Go to start of document</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151030" role="tablecontent" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151055" xml-lang="en-US" l10n="U" oldref="167">Go and select text to start of document</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151075" xml-lang="en-US" l10n="U" oldref="168"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151055" role="tablecontent" l10n="U" oldref="167">Go and select text to start of document</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151075" role="tablecontent" l10n="U" oldref="168"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149732" xml-lang="en-US" l10n="U" oldref="170">Go to end of document</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149750" xml-lang="en-US" l10n="U" oldref="171"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149732" role="tablecontent" l10n="U" oldref="170">Go to end of document</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149750" role="tablecontent" l10n="U" oldref="171"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147064" xml-lang="en-US" l10n="U" oldref="173">Go and select text to end of document</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147083" xml-lang="en-US" l10n="U" oldref="174"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147064" role="tablecontent" l10n="U" oldref="173">Go and select text to end of document</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147083" role="tablecontent" l10n="U" oldref="174"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153826" xml-lang="en-US" l10n="U" oldref="176">Switch cursor between text and header</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153846" xml-lang="en-US" l10n="U" oldref="177"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153826" role="tablecontent" l10n="U" oldref="176">Switch cursor between text and header</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153846" role="tablecontent" l10n="U" oldref="177"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageDown</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153872" xml-lang="en-US" l10n="U" oldref="179">Switch cursor between text and footer</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150889" xml-lang="en-US" l10n="U" oldref="180">Insert</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150903" xml-lang="en-US" l10n="U" oldref="181">Insert mode on/off</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150922" xml-lang="en-US" l10n="U" oldref="182">PageUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157513" xml-lang="en-US" l10n="U" oldref="183">Screen page up</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3157532" xml-lang="en-US" l10n="U" oldref="184">Shift+PageUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3157546" xml-lang="en-US" l10n="U" oldref="186">Move up screen page with selection</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152957" xml-lang="en-US" l10n="U" oldref="187">PageDown</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152970" xml-lang="en-US" l10n="U" oldref="188">Move down screen page</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3152990" xml-lang="en-US" l10n="U" oldref="189">Shift+PageDown</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153004" xml-lang="en-US" l10n="U" oldref="191">Move down screen page with selection</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148448" xml-lang="en-US" l10n="U" oldref="192"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153872" role="tablecontent" l10n="U" oldref="179">Switch cursor between text and footer</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150889" role="tablecontent" l10n="U" oldref="180">Insert</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150903" role="tablecontent" l10n="U" oldref="181">Insert mode on/off</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150922" role="tablecontent" l10n="U" oldref="182">PageUp</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157513" role="tablecontent" l10n="U" oldref="183">Screen page up</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3157532" role="tablecontent" l10n="U" oldref="184">Shift+PageUp</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3157546" role="tablecontent" l10n="U" oldref="186">Move up screen page with selection</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152957" role="tablecontent" l10n="U" oldref="187">PageDown</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152970" role="tablecontent" l10n="U" oldref="188">Move down screen page</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3152990" role="tablecontent" l10n="U" oldref="189">Shift+PageDown</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153004" role="tablecontent" l10n="U" oldref="191">Move down screen page with selection</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3148448" role="tablecontent" l10n="U" oldref="192"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="194">Delete text to end of word</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151080" xml-lang="en-US" l10n="U" oldref="195"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148474" role="tablecontent" l10n="U" oldref="194">Delete text to end of word</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151080" role="tablecontent" l10n="U" oldref="195"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Backspace</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151106" xml-lang="en-US" l10n="U" oldref="197">Delete text to beginning of word</paragraph>
-<paragraph role="tablecontent" id="par_id9959715" xml-lang="en-US" l10n="NEW">In a list: delete an empty paragraph in front of the current paragraph</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151124" xml-lang="en-US" l10n="U" oldref="198"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151106" role="tablecontent" l10n="U" oldref="197">Delete text to beginning of word</paragraph>
+               <paragraph xml-lang="en-US" id="par_id9959715" role="tablecontent" l10n="NEW">In a list: delete an empty paragraph in front of the current paragraph</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151124" role="tablecontent" l10n="U" oldref="198"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="200">Delete text to end of sentence</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3146937" xml-lang="en-US" l10n="U" oldref="201"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146919" role="tablecontent" l10n="U" oldref="200">Delete text to end of sentence</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3146937" role="tablecontent" l10n="U" oldref="201"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Backspace</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="203">Delete text to beginning of sentence</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153551" xml-lang="en-US" l10n="U" oldref="294"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153532" role="tablecontent" l10n="U" oldref="203">Delete text to beginning of sentence</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153551" role="tablecontent" l10n="U" oldref="294"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="296">Next suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147360" xml-lang="en-US" l10n="U" oldref="297"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153577" role="tablecontent" l10n="U" oldref="296">Next suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147360" role="tablecontent" l10n="U" oldref="297"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147386" xml-lang="en-US" l10n="U" oldref="299">Use previous suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145382" xml-lang="en-US" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147386" role="tablecontent" l10n="U" oldref="299">Use previous suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145382" role="tablecontent" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ double-click or <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150379" xml-lang="en-US" l10n="U" oldref="290">Use this combination to quickly dock or undock the Navigator, Styles and Formatting window, or other windows</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150379" role="tablecontent" l10n="U" oldref="290">Use this combination to quickly dock or undock the Navigator, Styles and Formatting window, or other windows</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150396"><bookmark_value>headings; switching levels by keyboard</bookmark_value>
-<bookmark_value>paragraphs; moving by keyboard</bookmark_value>
+      <bookmark_value>paragraphs; moving by keyboard</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150396" xml-lang="en-US" level="2" l10n="U" oldref="204">Shortcut Keys for Paragraphs and Heading Levels</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN11694" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN11699" xml-lang="en-US" l10n="NEW">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153679" xml-lang="en-US" l10n="CHG" oldref="206"><switchinline select="sys"><caseinline select="MAC">Command+Option
+<paragraph xml-lang="en-US" id="hd_id3150396" role="heading" level="2" l10n="U"
+                 oldref="204">Shortcut Keys for Paragraphs and Heading Levels</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN11694" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN11699" role="tablehead" l10n="NEW">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153679" role="tablecontent" l10n="CHG" oldref="206"><switchinline select="sys"><caseinline select="MAC">Command+Option 
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Up Arrow<comment>UFI: see sw-features "Ctrl + Up/Down accelerators added to move paragraphs". See now also i31697</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153693" xml-lang="en-US" l10n="U" oldref="208">Move the active paragraph or selected paragraphs up one paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153712" xml-lang="en-US" l10n="CHG" oldref="209"><switchinline select="sys"><caseinline select="MAC">Command+Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153693" role="tablecontent" l10n="U" oldref="208">Move the active paragraph or selected paragraphs up one paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153712" role="tablecontent" l10n="CHG" oldref="209"><switchinline select="sys"><caseinline select="MAC">Command+Option 
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Down Arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154639" xml-lang="en-US" l10n="U" oldref="211">Move the active paragraph or selected paragraphs down one paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154658" xml-lang="en-US" l10n="U" oldref="260">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154672" xml-lang="en-US" l10n="U" oldref="261">The heading in format "Heading X" (X = 1-9) is moved down one level in the outline.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154695" xml-lang="en-US" l10n="U" oldref="262">Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155346" xml-lang="en-US" l10n="U" oldref="263">The heading in format "Heading X" (X = 2-10) is moved up one level in the outline.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155369" xml-lang="en-US" l10n="U" oldref="265"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154639" role="tablecontent" l10n="U" oldref="211">Move the active paragraph or selected paragraphs down one paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154658" role="tablecontent" l10n="U" oldref="260">Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154672" role="tablecontent" l10n="U" oldref="261">The heading in format "Heading X" (X = 1-9) is moved down one level in the outline.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154695" role="tablecontent" l10n="U" oldref="262">Shift+Tab</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155346" role="tablecontent" l10n="U" oldref="263">The heading in format "Heading X" (X = 2-10) is moved up one level in the outline.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155369" role="tablecontent" l10n="U" oldref="265"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
+            </tablecell>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155395"><bookmark_value>tab stops; before headings</bookmark_value>
-<bookmark_value>headings; starting with tab stops</bookmark_value>
+               <bookmark_value>headings; starting with tab stops</bookmark_value>
 </bookmark>
-<paragraph role="tablecontent" id="par_id3155395" xml-lang="en-US" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph xml-lang="en-US" id="par_id3155395" role="tablecontent" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
-<paragraph role="tablecontent" id="par_id3149161" xml-lang="en-US" l10n="U" oldref="264">To change the heading level with the keyboard, first position the cursor in front of the heading.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+               <paragraph xml-lang="en-US" id="par_id3149161" role="tablecontent" l10n="U" oldref="264">To change the heading level with the keyboard, first position the cursor in front of the heading.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="212">Shortcut Keys for Tables in <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3155978" xml-lang="en-US" l10n="U" oldref="279">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155991" xml-lang="en-US" l10n="U" oldref="281">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156014" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="hd_id3149180" role="heading" level="2" l10n="U"
+                 oldref="212">Shortcut Keys for Tables in <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155978" role="tablehead" l10n="U" oldref="279">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155991" role="tablehead" l10n="U" oldref="281">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156014" role="tablecontent" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156048" xml-lang="en-US" l10n="U" oldref="215">If the active cell is empty: selects the whole table. Otherwise: selects the contents of the active cell. Pressing again selects the entire table.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156069" xml-lang="en-US" l10n="U" oldref="216"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156048" role="tablecontent" l10n="U" oldref="215">If the active cell is empty: selects the whole table. Otherwise: selects the contents of the active cell. Pressing again selects the entire table.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3156069" role="tablecontent" l10n="U" oldref="216"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="218">If the active cell is empty: goes to the beginning of the table. Otherwise: first press goes to beginning of the active cell, second press goes to beginning of the current table, third press goes to beginning of document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154308" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154285" role="tablecontent" l10n="U" oldref="218">If the active cell is empty: goes to the beginning of the table. Otherwise: first press goes to beginning of the active cell, second press goes to beginning of the current table, third press goes to beginning of document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154308" role="tablecontent" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154334" xml-lang="en-US" l10n="U" oldref="221">If the active cell is empty: goes to the end of the table. Otherwise: first press goes to the end of the active cell, second press goes to the end of the current table, third press goes to the end of the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153255" xml-lang="en-US" l10n="U" oldref="222"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154334" role="tablecontent" l10n="U" oldref="221">If the active cell is empty: goes to the end of the table. Otherwise: first press goes to the end of the active cell, second press goes to the end of the current table, third press goes to the end of the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3153255" role="tablecontent" l10n="U" oldref="222"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153281" xml-lang="en-US" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153281" role="tablecontent" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154905" xml-lang="en-US" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154905" role="tablecontent" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154931" xml-lang="en-US" l10n="U" oldref="233">Increases/decreases the size of the column/row on the right/bottom cell edge<comment>UFI: deleted two rows, see i31697</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154931" role="tablecontent" l10n="U" oldref="233">Increases/decreases the size of the column/row on the right/bottom cell edge<comment>UFI: deleted two rows, see i31697</comment></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154951" role="tablecontent" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="236">Increase/decrease the size of the column/row on the left/top cell edge</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150793" xml-lang="en-US" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150772" role="tablecontent" l10n="U" oldref="236">Increase/decrease the size of the column/row on the left/top cell edge</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150793" role="tablecontent" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command 
 </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150818" xml-lang="en-US" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150818" role="tablecontent" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3154451" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3154451" role="tablecontent" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command 
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154477" role="tablecontent" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145272" xml-lang="en-US" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3145272" role="tablecontent" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="245">3 seconds in Insert mode, Arrow Key inserts row/column, <switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145297" role="tablecontent" l10n="U" oldref="245">3 seconds in Insert mode, Arrow Key inserts row/column, <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key inserts cell</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155533" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3155533" role="tablecontent" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155559" xml-lang="en-US" l10n="U" oldref="248">3 seconds in Delete mode, Arrow key deletes row/column, <switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155559" role="tablecontent" l10n="U" oldref="248">3 seconds in Delete mode, Arrow key deletes row/column, <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key merges cell with neighboring cell</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155593"><bookmark_value>removing; cell protection in text documents</bookmark_value>
 </bookmark>
-<paragraph role="tablecontent" id="hd_id3155593" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph xml-lang="en-US" id="hd_id3155593" role="tablecontent" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147474" xml-lang="en-US" l10n="U" oldref="269">Removes cell protection from all selected tables. If no table is selected, then cell protection is removed from all of the tables in the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147496" xml-lang="en-US" l10n="U" oldref="270">Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147474" role="tablecontent" l10n="U" oldref="269">Removes cell protection from all selected tables. If no table is selected, then cell protection is removed from all of the tables in the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3147496" role="tablecontent" l10n="U" oldref="270">Shift+<switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149504" xml-lang="en-US" l10n="CHG" oldref="272">If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted. </paragraph>
-<paragraph role="tablecontent" id="par_id8539384" xml-lang="en-US" l10n="NEW">If no whole cell is selected and the cursor is at the end of the table, the following sentence from below the table will be deleted and the remainder of that paragraph will be moved into the last table cell. If an empty line follows the table, the empty line will be deleted.</paragraph>
-<paragraph role="tablecontent" id="par_id5891903" xml-lang="en-US" l10n="NEW">If one or more cells are selected, the whole rows containing the selection will be deleted. If all rows are selected completely or partially, the entire table will be deleted.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149504" role="tablecontent" l10n="CHG" oldref="272">If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted. </paragraph>
+               <paragraph xml-lang="en-US" id="par_id8539384" role="tablecontent" l10n="NEW">If no whole cell is selected and the cursor is at the end of the table, the following sentence from below the table will be deleted and the remainder of that paragraph will be moved into the last table cell. If an empty line follows the table, the empty line will be deleted.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id5891903" role="tablecontent" l10n="NEW">If one or more cells are selected, the whole rows containing the selection will be deleted. If all rows are selected completely or partially, the entire table will be deleted.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3149537" xml-lang="en-US" level="2" l10n="U" oldref="249">Shortcut Keys for Moving and Resizing Frames, Graphics and Objects</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="hd_id3149565" xml-lang="en-US" l10n="U" oldref="282">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3148993" xml-lang="en-US" l10n="U" oldref="284">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149010" xml-lang="en-US" l10n="U" oldref="305">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149024" xml-lang="en-US" l10n="U" oldref="306">Cursor is inside a text frame and no text is selected: Escape selects the text frame.</paragraph>
-<paragraph role="tablecontent" id="par_id3149039" xml-lang="en-US" l10n="U" oldref="307">Text frame is selected: Escape clears the cursor from the text frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149054" xml-lang="en-US" l10n="U" oldref="308">F2 or Enter or any key that produces a character on screen</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149890" xml-lang="en-US" l10n="U" oldref="309">If a text frame is selected: positions the cursor to the end of the text in the text frame. If you press any key that produces a character on screen, and the document is in edit mode, the character is appended to the text.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149913" xml-lang="en-US" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option
+      <paragraph xml-lang="en-US" id="hd_id3149537" role="heading" level="2" l10n="U"
+                 oldref="249">Shortcut Keys for Moving and Resizing Frames, Graphics and Objects</paragraph>
+      <table id="">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149565" role="tablehead" l10n="U" oldref="282">Shortcut Keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148993" role="tablehead" l10n="U" oldref="284">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149010" role="tablecontent" l10n="U" oldref="305">Esc</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149024" role="tablecontent" l10n="U" oldref="306">Cursor is inside a text frame and no text is selected: Escape selects the text frame.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149039" role="tablecontent" l10n="U" oldref="307">Text frame is selected: Escape clears the cursor from the text frame.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149054" role="tablecontent" l10n="U" oldref="308">F2 or Enter or any key that produces a character on screen</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149890" role="tablecontent" l10n="U" oldref="309">If a text frame is selected: positions the cursor to the end of the text in the text frame. If you press any key that produces a character on screen, and the document is in edit mode, the character is appended to the text.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3149913" role="tablecontent" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149939" xml-lang="en-US" l10n="U" oldref="252">Move object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151200" xml-lang="en-US" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149939" role="tablecontent" l10n="U" oldref="252">Move object.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151200" role="tablecontent" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command 
 </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151226" xml-lang="en-US" l10n="U" oldref="255">Resizes by moving lower right corner.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151246" xml-lang="en-US" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151226" role="tablecontent" l10n="U" oldref="255">Resizes by moving lower right corner.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3151246" role="tablecontent" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command 
 </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150115" xml-lang="en-US" l10n="U" oldref="258">Resizes by moving top left corner.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150129" xml-lang="en-US" l10n="U" oldref="310"><switchinline select="sys"><caseinline select="MAC">Command 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150115" role="tablecontent" l10n="U" oldref="258">Resizes by moving top left corner.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="hd_id3150129" role="tablecontent" l10n="U" oldref="310"><switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150154" xml-lang="en-US" l10n="U" oldref="311">Selects the anchor of an object (in Edit Points mode).</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150154" role="tablecontent" l10n="U" oldref="311">Selects the anchor of an object (in Edit Points mode).</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="relatedtopics">
-<embed href="text/swriter/guide/text_nav_keyb.xhp#text_nav_keyb"/>
-<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
-<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/text_nav_keyb.xhp#text_nav_keyb"/>
+         <embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
+         <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/04/makefile.mk b/helpcontent2/source/text/swriter/04/makefile.mk
index 14546c7538..32c41e9479 100644
--- a/helpcontent2/source/text/swriter/04/makefile.mk
+++ b/helpcontent2/source/text/swriter/04/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/guide/anchor_object.xhp b/helpcontent2/source/text/swriter/guide/anchor_object.xhp
index 176f6b18fc..3221948703 100755
--- a/helpcontent2/source/text/swriter/guide/anchor_object.xhp
+++ b/helpcontent2/source/text/swriter/guide/anchor_object.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: anchor_object.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,80 +29,82 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideanchor_objectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Positioning Objects</title>
-<filename>/text/swriter/guide/anchor_object.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideanchor_objectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Positioning Objects</title>
+         <filename>/text/swriter/guide/anchor_object.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147828"><bookmark_value>objects;anchoring options</bookmark_value>
-<bookmark_value>positioning;objects (guide)</bookmark_value>
-<bookmark_value>anchors;options</bookmark_value>
-<bookmark_value>frames;anchoring options</bookmark_value>
-<bookmark_value>pictures;anchoring options</bookmark_value>
-<bookmark_value>centering;images on HTML pages</bookmark_value>
+      <bookmark_value>positioning;objects (guide)</bookmark_value>
+      <bookmark_value>anchors;options</bookmark_value>
+      <bookmark_value>frames;anchoring options</bookmark_value>
+      <bookmark_value>pictures;anchoring options</bookmark_value>
+      <bookmark_value>centering;images on HTML pages</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147828" xml-lang="en-US" level="1" l10n="U" oldref="45"><variable id="anchor_object"><link href="text/swriter/guide/anchor_object.xhp" name="Positioning Objects">Positioning Objects</link>
+<paragraph xml-lang="en-US" id="hd_id3147828" role="heading" level="1" l10n="U"
+                 oldref="45"><variable id="anchor_object"><link href="text/swriter/guide/anchor_object.xhp" name="Positioning Objects">Positioning Objects</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147251" xml-lang="en-US" l10n="U" oldref="46">You can use anchors to position an object, graphic, or frame in a document. An anchored item remains in place, or moves when you modify the document. The following anchoring options are available:</paragraph>
-<table id="tbl_id3147268">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145599" xml-lang="en-US" l10n="U" oldref="47">Anchoring</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3145622" xml-lang="en-US" l10n="U" oldref="48">Effect</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145650" xml-lang="en-US" l10n="U" oldref="49">As character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151181" xml-lang="en-US" l10n="U" oldref="50">Anchors the selected item as a character in the current text. If the height of the selected item is greater than the current font size, the height of the line containing the item is increased.</paragraph>
-<paragraph role="tablecontent" id="par_idN10674" xml-lang="en-US" l10n="NEW">To center an image on an HTML page, insert the image, anchor it "as character", then center the paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151212" xml-lang="en-US" l10n="U" oldref="51">To character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151235" xml-lang="en-US" l10n="U" oldref="52">Anchors the selected item to a character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155071" xml-lang="en-US" l10n="U" oldref="53">To paragraph</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155094" xml-lang="en-US" l10n="U" oldref="54">Anchors the selected item to the current paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155122" xml-lang="en-US" l10n="U" oldref="55">To page</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155144" xml-lang="en-US" l10n="U" oldref="56">Anchors the selected item to the current page.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="57">To frame</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145697" xml-lang="en-US" l10n="U" oldref="58">Anchors the selected item to the surrounding frame.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3145715" xml-lang="en-US" l10n="U" oldref="59">When you insert an object, graphic, or frame, an anchor icon appears where the item is anchored. You can position an anchored item by dragging the item to another location. To change the anchoring options of an item, right-click the item, and then choose an option from the <emph>Anchor </emph>submenu.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3147251" role="paragraph" l10n="U" oldref="46">You can use anchors to position an object, graphic, or frame in a document. An anchored item remains in place, or moves when you modify the document. The following anchoring options are available:</paragraph>
+      <table id="tbl_id3147268">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145599" role="tablehead" l10n="U" oldref="47">Anchoring</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145622" role="tablehead" l10n="U" oldref="48">Effect</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145650" role="tablecontent" l10n="U" oldref="49">As character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151181" role="tablecontent" l10n="U" oldref="50">Anchors the selected item as a character in the current text. If the height of the selected item is greater than the current font size, the height of the line containing the item is increased.</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN10674" role="tablecontent" l10n="NEW">To center an image on an HTML page, insert the image, anchor it "as character", then center the paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151212" role="tablecontent" l10n="U" oldref="51">To character</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151235" role="tablecontent" l10n="U" oldref="52">Anchors the selected item to a character.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155071" role="tablecontent" l10n="U" oldref="53">To paragraph</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155094" role="tablecontent" l10n="U" oldref="54">Anchors the selected item to the current paragraph.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155122" role="tablecontent" l10n="U" oldref="55">To page</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155144" role="tablecontent" l10n="U" oldref="56">Anchors the selected item to the current page.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145674" role="tablecontent" l10n="U" oldref="57">To frame</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145697" role="tablecontent" l10n="U" oldref="58">Anchors the selected item to the surrounding frame.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_id3145715" role="paragraph" l10n="U" oldref="59">When you insert an object, graphic, or frame, an anchor icon appears where the item is anchored. You can position an anchored item by dragging the item to another location. To change the anchoring options of an item, right-click the item, and then choose an option from the <item type="menuitem">Anchor</item>
+         <emph/>submenu.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
index bef88d2c27..2406025aeb 100644
--- a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
+++ b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arrange_chapters.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,22 +32,23 @@
  
 	
 <meta>
-<topic id="textswriterguidearrange_chaptersxml" indexer="include">
-<title id="tit" xml-lang="en-US">Rearranging a Document by Using the Navigator</title>
-<filename>/text/swriter/guide/arrange_chapters.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidearrange_chaptersxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Rearranging a Document by Using the Navigator</title>
+         <filename>/text/swriter/guide/arrange_chapters.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149973"><bookmark_value>headings;rearranging</bookmark_value>
-<bookmark_value>rearranging headings</bookmark_value>
-<bookmark_value>moving;headings</bookmark_value>
-<bookmark_value>demoting heading levels</bookmark_value>
-<bookmark_value>promoting heading levels</bookmark_value>
-<bookmark_value>Navigator;heading levels and chapters</bookmark_value>
-<bookmark_value>arranging;headings</bookmark_value>
-<bookmark_value>outlines;arranging chapters</bookmark_value>
+      <bookmark_value>rearranging headings</bookmark_value>
+      <bookmark_value>moving;headings</bookmark_value>
+      <bookmark_value>demoting heading levels</bookmark_value>
+      <bookmark_value>promoting heading levels</bookmark_value>
+      <bookmark_value>Navigator;heading levels and chapters</bookmark_value>
+      <bookmark_value>arranging;headings</bookmark_value>
+      <bookmark_value>outlines;arranging chapters</bookmark_value>
 </bookmark><comment>mw added "outlines;..." entry</comment>
-<paragraph role="heading" id="hd_id3149973" xml-lang="en-US" level="1" l10n="CHG" oldref="58"><variable id="arrange_chapters"><link href="text/swriter/guide/arrange_chapters.xhp" name="Rearranging a Document by Using the Navigator">Arranging Chapters in the Navigator</link>
+<paragraph xml-lang="en-US" id="hd_id3149973" role="heading" level="1" l10n="CHG"
+                 oldref="58"><variable id="arrange_chapters"><link href="text/swriter/guide/arrange_chapters.xhp" name="Rearranging a Document by Using the Navigator">Arranging Chapters in the Navigator</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3147795" xml-lang="en-US" l10n="U" oldref="59">You can move headings and subordinate text up and down in a document text by using the Navigator. You can also promote and demote heading levels. To use this feature, format the headings in your document with one of the predefined heading paragraph styles. To use a custom paragraph style for a heading, choose <emph>Tools - Outline Numbering</emph>, select the style in the <emph>Paragraph Style </emph>box, and then double-click a number in the <emph>Levels </emph>list.</paragraph>
 <paragraph role="tip" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="62">To quickly move the text cursor to a heading in the document, double-click the heading in the <emph>Navigator </emph>list.</paragraph>
@@ -60,12 +58,12 @@
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3151206" xml-lang="en-US" l10n="U" oldref="71">On the <emph>Standard Bar</emph>, click the<emph> Navigator</emph> icon 
-<image id="img_id5211883" src="res/commandimagelist/sc_navigator.png" width="0.564cm" height="0.564cm"><alt id="alt_id5211883" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5211883" src="res/commandimagelist/sc_navigator.png" width="0.564cm" height="0.564cm"><alt id="alt_id5211883" xml-lang="en-US">Icon</alt>
 	</image> to open the <emph>Navigator</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3151238" xml-lang="en-US" l10n="U" oldref="72">On the <emph>Navigator</emph>, click the <emph>Content View </emph>icon 
-<image id="img_id3156338" src="sw/imglst/sc20244.png" width="0.564cm" height="0.564cm"><alt id="alt_id3156338" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156338" src="sw/imglst/sc20244.png" width="0.564cm" height="0.564cm"><alt id="alt_id3156338" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 </listitem>
 <listitem>
@@ -78,9 +76,9 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155139" xml-lang="en-US" l10n="U" oldref="75">Click a heading in the <emph>Navigator </emph>list, and then click the <emph>Promote Chapter</emph>
-<image id="img_id4217546" src="sw/imglst/sc20174.png" width="0.564cm" height="0.564cm"><alt id="alt_id4217546" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id4217546" src="sw/imglst/sc20174.png" width="0.564cm" height="0.564cm"><alt id="alt_id4217546" xml-lang="en-US">Icon</alt>
 	</image> or <emph>Demote Chapter </emph>icon 
-<image id="img_id6505788" src="sw/imglst/sc20171.png" width="0.564cm" height="0.564cm"><alt id="alt_id6505788" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id6505788" src="sw/imglst/sc20171.png" width="0.564cm" height="0.564cm"><alt id="alt_id6505788" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 </listitem>
 </list>
@@ -92,19 +90,19 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_idN1081C" xml-lang="en-US" l10n="NEW">Click the <emph>Promote Level </emph>
-<image id="img_id5564488" src="sw/imglst/sc20172.png" width="0.564cm" height="0.564cm"><alt id="alt_id5564488" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5564488" src="sw/imglst/sc20172.png" width="0.564cm" height="0.564cm"><alt id="alt_id5564488" xml-lang="en-US">Icon</alt>
 	</image> or <emph>Demote Level </emph>icon 
-<image id="img_id3159363" src="sw/imglst/sc20173.png" width="0.564cm" height="0.564cm"><alt id="alt_id3159363" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159363" src="sw/imglst/sc20173.png" width="0.564cm" height="0.564cm"><alt id="alt_id3159363" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3155525" xml-lang="en-US" level="3" l10n="U" oldref="78">To Change the Number of Heading Levels That Are Displayed</paragraph>
 <paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="79">Click the <emph>Heading Levels Shown </emph>icon 
-<image id="img_id3151310" src="sw/imglst/sc20236.png" width="0.564cm" height="0.564cm"><alt id="alt_id3151310" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151310" src="sw/imglst/sc20236.png" width="0.564cm" height="0.564cm"><alt id="alt_id3151310" xml-lang="en-US">Icon</alt>
 	</image>, and then select a number from the list.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/navigator.xhp#navigator"/>
-<embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/navigator.xhp#navigator"/>
+         <embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
index abb596dba7..ac9ef728c0 100644
--- a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,50 +32,51 @@
  
 	
 <meta>
-<topic id="textswriterguideauto_numberingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Creating Numbered or Bulleted Lists as You Type</title>
-<filename>/text/swriter/guide/auto_numbering.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideauto_numberingxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Creating Numbered or Bulleted Lists as You Type</title>
+         <filename>/text/swriter/guide/auto_numbering.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147407"><bookmark_value>numbering; lists, while typing</bookmark_value>
-<bookmark_value>bullet lists;creating while typing</bookmark_value>
-<bookmark_value>lists;automatic numbering</bookmark_value>
-<bookmark_value>numbers;lists</bookmark_value>
-<bookmark_value>automatic numbering; AutoCorrect function</bookmark_value>
-<bookmark_value>bullets; using automatically</bookmark_value>
-<bookmark_value>automatic bullets</bookmark_value>
-<bookmark_value>paragraphs; automatic numbering</bookmark_value>
-</bookmark><comment>MW deleted "applying;"</comment>
-<paragraph role="heading" id="hd_id3147407" xml-lang="en-US" level="1" l10n="U" oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
+      <bookmark_value>bullet lists;creating while typing</bookmark_value>
+      <bookmark_value>lists;automatic numbering</bookmark_value>
+      <bookmark_value>numbers;lists</bookmark_value>
+      <bookmark_value>automatic bullets/numbers; AutoCorrect function</bookmark_value>
+      <bookmark_value>bullets; using automatically</bookmark_value>
+      <bookmark_value>paragraphs; automatic numbering</bookmark_value>
+</bookmark><comment>MW deleted "applying;"</comment><comment>mw deleted "automatic bullets" and changed "automatic numbering;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="1" l10n="U"
+                 oldref="26"><variable id="auto_numbering"><link href="text/swriter/guide/auto_numbering.xhp" name="Creating Numbered or Bulleted Lists as You Type">Creating Numbered or Bulleted Lists as You Type</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155525" xml-lang="en-US" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
-<paragraph role="heading" id="hd_id3154243" xml-lang="en-US" level="3" l10n="U" oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152830" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>, click the <emph>Options</emph> tab, and then select <emph>Apply Numbering - Symbol</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152867" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Format - AutoCorrect</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id2357860" xml-lang="en-US" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
-<paragraph role="heading" id="hd_id3152897" xml-lang="en-US" level="3" l10n="U" oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147773" xml-lang="en-US" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147794" xml-lang="en-US" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147814" xml-lang="en-US" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3147287" xml-lang="en-US" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<paragraph role="paragraph" id="par_id3154083" xml-lang="en-US" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="16">$[officename] can automatically apply numbering or bullets as you type.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154243" role="heading" level="2" l10n="U"
+                 oldref="28">To Enable Automatic Numbering and Bulleting</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152830" role="listitem" l10n="U" oldref="29">Choose <item type="menuitem">Tools - AutoCorrect Options</item>, click the <item type="menuitem">Options</item> tab, and then select “Apply numbering – symbol”.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152867" role="listitem" l10n="U" oldref="30">Choose <emph>Format - AutoCorrect</emph>, and ensure that <emph>While Typing</emph> is selected.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id2357860" role="tip" l10n="NEW">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3152897" role="heading" level="2" l10n="U"
+                 oldref="21">To Create a Numbered or Bulleted List While You Type</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147773" role="listitem" l10n="U" oldref="22">Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147794" role="listitem" l10n="U" oldref="23">Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147814" role="listitem" l10n="U" oldref="31">Press Enter again to finish the list.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147287" role="note" l10n="U" oldref="25">You can start a numbered list with any number.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <paragraph xml-lang="en-US" id="par_id3154083" role="paragraph" l10n="U" oldref="27"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets">Format - Bullets and Numbering</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index 2301a9431c..3743c41fa2 100755
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,100 +29,100 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textswriterguideauto_offxml" indexer="include">
-<title id="tit" xml-lang="en-US">Turning Off AutoCorrect </title>
-<filename>/text/swriter/guide/auto_off.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideauto_offxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Turning Off AutoCorrect </title>
+         <filename>/text/swriter/guide/auto_off.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154250"><bookmark_value>turning off automatic correction</bookmark_value>
-<bookmark_value>text;turning off automatic correction</bookmark_value>
-<bookmark_value>uppercase;changing to lowercase</bookmark_value>
-<bookmark_value>capital letters;changing to small letters after periods</bookmark_value>
-<bookmark_value>quotation marks;changing automatically</bookmark_value>
-<bookmark_value>words;automatic replacement on/off</bookmark_value>
-<bookmark_value>lines;automatic drawing on/off</bookmark_value>
-<bookmark_value>underlining;quick</bookmark_value>
-<bookmark_value>borders; automatic drawing on/off</bookmark_value>
-<bookmark_value>automatic changes on/off</bookmark_value>
-<bookmark_value>changes;automatic</bookmark_value>
-<bookmark_value>AutoCorrect function;turning off</bookmark_value>
+      <bookmark_value>text;turning off automatic correction</bookmark_value>
+      <bookmark_value>uppercase;changing to lowercase</bookmark_value>
+      <bookmark_value>capital letters;changing to small letters after periods</bookmark_value>
+      <bookmark_value>quotation marks;changing automatically</bookmark_value>
+      <bookmark_value>words;automatic replacement on/off</bookmark_value>
+      <bookmark_value>lines;automatic drawing on/off</bookmark_value>
+      <bookmark_value>underlining;quick</bookmark_value>
+      <bookmark_value>borders; automatic drawing on/off</bookmark_value>
+      <bookmark_value>automatic changes on/off</bookmark_value>
+      <bookmark_value>changes;automatic</bookmark_value>
+      <bookmark_value>AutoCorrect function;turning off</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3154250" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3147812" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoCorrect</link>
+<paragraph xml-lang="en-US" id="par_id3154250" role="paragraph" l10n="E" oldref="1"
+                 localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id3147812" role="heading" level="1" l10n="U"
+                 oldref="16"><variable id="auto_off"><link href="text/swriter/guide/auto_off.xhp" name="Turning Off AutoFormat and AutoCorrect">Turning Off AutoCorrect</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147833" xml-lang="en-US" l10n="CHG" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1081B" xml-lang="en-US" l10n="NEW">To quickly undo an automatic correction or completion, press <switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="par_id3147833" role="paragraph" l10n="CHG" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. </paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1081B" role="listitem" l10n="NEW">To quickly undo an automatic correction or completion, press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">To turn off most AutoCorrect features, remove the check mark from the menu <emph>Format - AutoCorrect - While Typing</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147251" xml-lang="en-US" level="2" l10n="U" oldref="12">To remove a word from the AutoCorrect list:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="23">Click the <emph>Replace</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="15">In the <emph>AutoCorrect</emph> list, select the word pair that you want to remove.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145645" xml-lang="en-US" l10n="U" oldref="24">Click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145668" xml-lang="en-US" level="2" l10n="U" oldref="4">To stop replacing quotation marks:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151196" xml-lang="en-US" l10n="CHG" oldref="6">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151220" xml-lang="en-US" l10n="U" oldref="7">Click the <emph>Custom Quotes</emph> tab</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="25">Clear the <emph>Replace</emph> check box(es).</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155076" xml-lang="en-US" level="2" l10n="U" oldref="8">To stop capitalizing the first letter of a sentence:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155099" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155123" xml-lang="en-US" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155148" xml-lang="en-US" l10n="U" oldref="26">Clear the <emph>Capitalize first letter of every sentence</emph> check box.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155401" xml-lang="en-US" level="2" l10n="U" oldref="17">To stop drawing a line when you type three identical characters:</paragraph>
-<paragraph role="paragraph" id="par_id3155415" xml-lang="en-US" l10n="U" oldref="22">$[officename] automatically draws a line when you type three of the following characters and press Enter: - _ = * ~ #</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155439" xml-lang="en-US" l10n="CHG" oldref="19">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155463" xml-lang="en-US" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155488" xml-lang="en-US" l10n="U" oldref="27">Clear the <emph>Apply border</emph> check box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/autotext.xhp#autotext"/>
-<embed href="text/shared/guide/line_intext.xhp#line_intext"/>
-<embed href="text/swriter/guide/number_date_conv.xhp#number_date_conv"/>
-</body>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10846" role="listitem" l10n="NEW">To turn off most AutoCorrect features, remove the check mark from the menu <emph>Format - AutoCorrect - While Typing</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3147251" role="heading" level="2" l10n="U"
+                 oldref="12">To Remove a Word from the AutoCorrect List</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147274" role="listitem" l10n="CHG" oldref="14">Choose <item type="menuitem">Tools - AutoCorrect Options</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145596" role="listitem" l10n="U" oldref="23">Click the <emph>Replace</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145620" role="listitem" l10n="U" oldref="15">In the <emph>AutoCorrect</emph> list, select the word pair that you want to remove.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145645" role="listitem" l10n="U" oldref="24">Click <emph>Delete</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145668" role="heading" level="2" l10n="U" oldref="4">To Stop Replacing Quotation Marks</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151196" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">Tools - AutoCorrect Options</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151220" role="listitem" l10n="U" oldref="7">Click the <emph>Localized Options</emph> tab</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="CHG" oldref="25">Clear the "Replace" check box(es).</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155076" role="heading" level="2" l10n="U" oldref="8">To Stop Capitalizing the First Letter of a Sentence</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155099" role="listitem" l10n="CHG" oldref="10">Choose <item type="menuitem">Tools – AutoCorrect Options</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155123" role="listitem" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="CHG" oldref="26">Clear the "Capitalize first letter of every sentence" check box.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155401" role="heading" level="2" l10n="U"
+                 oldref="17">To Stop Drawing a Line When You Type Three Identical Characters</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155415" role="paragraph" l10n="U" oldref="22">$[officename] automatically draws a line when you type three of the following characters and press Enter: - _ = * ~ #</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155439" role="listitem" l10n="CHG" oldref="19">Choose <item type="menuitem">Tools - AutoCorrect Options</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155463" role="listitem" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155488" role="listitem" l10n="U" oldref="27">Clear the "Apply border" check box.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/autotext.xhp#autotext"/>
+      <embed href="text/shared/guide/line_intext.xhp#line_intext"/>
+      <embed href="text/swriter/guide/number_date_conv.xhp#number_date_conv"/>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
index 5f381dc7f8..d342b5c99a 100755
--- a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,55 +32,49 @@
  
 	
 <meta>
-<topic id="textswriterguideauto_spellcheckxml" indexer="include">
-<title id="tit" xml-lang="en-US">Automatically Check Spelling</title>
-<filename>/text/swriter/guide/auto_spellcheck.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideauto_spellcheckxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Automatically Check Spelling</title>
+         <filename>/text/swriter/guide/auto_spellcheck.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154265"><bookmark_value>spellcheck;AutoSpellcheck on/off</bookmark_value>
-<bookmark_value>automatic spellcheck</bookmark_value>
-<bookmark_value>checking spelling;while typing</bookmark_value>
-<bookmark_value>words;disabling spellcheck</bookmark_value>
+      <bookmark_value>automatic spellcheck</bookmark_value>
+      <bookmark_value>checking spelling;while typing</bookmark_value>
+      <bookmark_value>words;disabling spellcheck</bookmark_value>
 </bookmark><comment>MW deleted "text;"</comment>
-<paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
+<paragraph xml-lang="en-US" id="hd_id3154265" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="auto_spellcheck"><link href="text/swriter/guide/auto_spellcheck.xhp" name="Automatically Check Spelling">Automatically Check Spelling</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154664" xml-lang="en-US" l10n="U" oldref="5">You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line.</paragraph>
-<paragraph role="heading" id="hd_id3154678" xml-lang="en-US" level="2" l10n="U" oldref="41">To check spelling automatically while you type:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155531" xml-lang="en-US" l10n="CHG" oldref="42">Activate the <emph>AutoSpellcheck </emph>icon on the Standard bar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155569" xml-lang="en-US" l10n="U" oldref="33">Right-click a word with a red wavy underline, and then choose a suggested replacement word from the list, or from the <emph>AutoCorrect </emph>submenu.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="6">If you choose a word from the <emph>AutoCorrect</emph> submenu, the underlined word and the replacement word are automatically added to the <emph>AutoCorrect</emph> list for the current language. To view the <emph>AutoCorrect</emph> list, choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>, and then click the <emph>Replace</emph> tab.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147819" xml-lang="en-US" l10n="U" oldref="7">You can also add the underlined word to your custom dictionary by choosing <emph>Add</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147220" xml-lang="en-US" level="2" l10n="U" oldref="32">To exclude words from the spellcheck:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147263" xml-lang="en-US" l10n="U" oldref="35">Select the words that you want to exclude.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147282" xml-lang="en-US" l10n="CHG" oldref="36">Click the Language control on the Status bar to open a menu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145602" xml-lang="en-US" l10n="CHG" oldref="38">Choose None (Do not check spelling).</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3145648" xml-lang="en-US" l10n="U" oldref="40"><link href="text/shared/optionen/01010401.xhp" name="Creating a new dictionary.">Creating a new dictionary.</link></paragraph>
-<embed href="text/swriter/guide/autocorr_except.xhp#autocorr_except"/>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154664" role="paragraph" l10n="U" oldref="5">You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154678" role="heading" level="2" l10n="U"
+                 oldref="41">To Check Spelling Automatically While You Type</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155531" role="listitem" l10n="CHG" oldref="42">Activate the <emph>AutoSpellcheck </emph>icon on the Standard bar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155569" role="listitem" l10n="U" oldref="33">Right-click a word with a red wavy underline, and then choose a suggested replacement word from the list, or from the <emph>AutoCorrect </emph>submenu.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147759" role="paragraph" l10n="U" oldref="6">If you choose a word from the <item type="menuitem">AutoCorrect</item> submenu, the underlined word and the replacement word are automatically added to the AutoCorrect list for the current language. To view the AutoCorrect list, choose <item type="menuitem">Tools – AutoCorrect Options</item>, and then click the <item type="menuitem">Replace</item> tab.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147819" role="paragraph" l10n="U" oldref="7">You can also add the underlined word to your custom dictionary by choosing <emph>Add</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147220" role="heading" level="2" l10n="U"
+                 oldref="32">To Exclude Words From the Spellcheck</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147263" role="listitem" l10n="U" oldref="35">Select the words that you want to exclude.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147282" role="listitem" l10n="CHG" oldref="36">Click the Language control on the Status bar to open a menu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145602" role="listitem" l10n="CHG" oldref="38">Choose “None (Do not check spelling)”.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3145648" role="paragraph" l10n="U" oldref="40"><link href="text/shared/optionen/01010401.xhp" name="Creating a new dictionary.">Creating a new dictionary.</link></paragraph>
+      <embed href="text/swriter/guide/autocorr_except.xhp#autocorr_except"/>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
index 1cc56d54da..8bfc09ed06 100644
--- a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
+++ b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,41 +32,34 @@
  
 	
 <meta>
-<topic id="textswriterguideautocorr_exceptxml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Adding Exceptions to the AutoCorrect List</title>
-<filename>/text/swriter/guide/autocorr_except.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideautocorr_exceptxml" indexer="exclude">
+         <title xml-lang="en-US" id="tit">Adding Exceptions to the AutoCorrect List</title>
+         <filename>/text/swriter/guide/autocorr_except.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152887"><bookmark_value>AutoCorrect function; adding exceptions</bookmark_value>
-<bookmark_value>exceptions; AutoCorrect function</bookmark_value>
-<bookmark_value>abbreviations</bookmark_value>
-<bookmark_value>capital letters;avoiding after specific abbreviations</bookmark_value>
+      <bookmark_value>exceptions; AutoCorrect function</bookmark_value>
+      <bookmark_value>abbreviations</bookmark_value>
+      <bookmark_value>capital letters;avoiding after specific abbreviations</bookmark_value>
 </bookmark><comment>MW added "capital letters;..."</comment>
-<paragraph role="heading" id="hd_id3152887" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="autocorr_except"><link href="text/swriter/guide/autocorr_except.xhp" name="Adding Exceptions to the AutoCorrect List">Adding Exceptions to the AutoCorrect List</link>
+<paragraph xml-lang="en-US" id="hd_id3152887" role="heading" level="1" l10n="U"
+                 oldref="10"><variable id="autocorr_except"><link href="text/swriter/guide/autocorr_except.xhp" name="Adding Exceptions to the AutoCorrect List">Adding Exceptions to the AutoCorrect List</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154254" xml-lang="en-US" l10n="U" oldref="11">You can prevent AutoCorrect from correcting specific abbreviations or words that have mixed capital letters and lowercase letters. </paragraph>
-<paragraph role="tip" id="par_id3144875" xml-lang="en-US" l10n="U" oldref="17">To quickly undo an AutoCorrect replacement, press <switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="par_id3154254" role="paragraph" l10n="U" oldref="11">You can prevent AutoCorrect from correcting specific abbreviations or words that have mixed capital letters and lowercase letters. </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155576" role="listitem" l10n="U" oldref="13">Choose <item type="menuitem">Tools - AutoCorrect Options</item>, and then click the <item type="menuitem">Exceptions</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147762" role="listitem" l10n="U" oldref="18">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147786" role="listitem" l10n="U" oldref="19">Type the abbreviation followed by a period in the <emph>Abbreviations (no subsequent capital) </emph>box and click <emph>New</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147812" role="listitem" l10n="U" oldref="20">Type the word in the <emph>Words with TWo INitial CApitals </emph>box and click <emph>New</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3144875" role="tip" l10n="U" oldref="17">To quickly undo an AutoCorrect replacement, press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z. This also adds the word or abbreviation that you typed to the AutoCorrect exceptions list.</paragraph>
-<paragraph role="heading" id="hd_id3155554" xml-lang="en-US" level="2" l10n="U" oldref="12">To Add an Exception to the AutoCorrect Exceptions List</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155576" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>, and then click the <emph>Exceptions </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147762" xml-lang="en-US" l10n="U" oldref="18">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147786" xml-lang="en-US" l10n="U" oldref="19">Type the abbreviation followed by a period in the <emph>Abbreviations (no subsequent capital) </emph>box and click <emph>New</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147812" xml-lang="en-US" l10n="U" oldref="20">Type the word in the <emph>Words with TWo INitial CApitals </emph>box and click <emph>New</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
-</body>
-</helpdocument>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/autotext.xhp b/helpcontent2/source/text/swriter/guide/autotext.xhp
index db7657816f..b0193e62d0 100755
--- a/helpcontent2/source/text/swriter/guide/autotext.xhp
+++ b/helpcontent2/source/text/swriter/guide/autotext.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autotext.xhp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,88 +29,92 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideautotextxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Using AutoText</title>
-<filename>/text/swriter/guide/autotext.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T14:53:22">FPE: Deleted screenshot</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideautotextxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using AutoText</title>
+         <filename>/text/swriter/guide/autotext.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155521"><bookmark_value>AutoText</bookmark_value>
-<bookmark_value>networks and AutoText directories</bookmark_value>
-<bookmark_value>lists;AutoText shortcuts</bookmark_value>
-<bookmark_value>printing;AutoText shortcuts</bookmark_value>
-<bookmark_value>inserting;text blocks</bookmark_value>
-<bookmark_value>text blocks</bookmark_value>
-<bookmark_value>blocks of text</bookmark_value>
+      <bookmark_value>networks and AutoText directories</bookmark_value>
+      <bookmark_value>lists;AutoText shortcuts</bookmark_value>
+      <bookmark_value>printing;AutoText shortcuts</bookmark_value>
+      <bookmark_value>inserting;text blocks</bookmark_value>
+      <bookmark_value>text blocks</bookmark_value>
+      <bookmark_value>blocks of text</bookmark_value>
 </bookmark><comment>mw deleted "creating;"</comment>
-<paragraph role="heading" id="hd_id3155521" xml-lang="en-US" level="1" l10n="U" oldref="26"><variable id="autotext"><link href="text/swriter/guide/autotext.xhp" name="Using AutoText">Using AutoText</link>
+<paragraph xml-lang="en-US" id="hd_id3155521" role="heading" level="1" l10n="U"
+                 oldref="26"><variable id="autotext"><link href="text/swriter/guide/autotext.xhp" name="Using AutoText">Using AutoText</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="CHG" oldref="27">In $[officename] Writer, you can store text - also containing graphics, tables, and fields - as AutoText, so that you can quickly insert the text later on. If you want, you can also store formatted text.</paragraph>
-<paragraph role="heading" id="hd_id3155539" xml-lang="en-US" level="2" l10n="U" oldref="48">Creating an AutoText Entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155560" xml-lang="en-US" l10n="U" oldref="47">Select the text, text with graphics, table, or field that you want to save as an AutoText entry. A graphic can only be stored if it is anchored as a character and is preceded and followed by at least one text character.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="57">Choose<emph> Edit - AutoText</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147761" xml-lang="en-US" l10n="U" oldref="58">Select the category where you want to store the AutoText.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147779" xml-lang="en-US" l10n="U" oldref="59">Type a name that is longer than four characters. This allows you to use the <emph>Display remainder of name as suggestion while typing</emph> AutoText option. If you want, you can modify the proposed shortcut.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147807" xml-lang="en-US" l10n="U" oldref="60">Click the <emph>AutoText</emph> button, and then choose <emph>New</emph>. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10732" xml-lang="en-US" l10n="NEW">Click the <emph>Close</emph> button.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147282" xml-lang="en-US" level="2" l10n="U" oldref="39">Inserting an AutoText Entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145597" xml-lang="en-US" l10n="U" oldref="61">Click in your document where you want to insert an AutoText entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="28">Choose <link href="text/swriter/01/02120000.xhp" name="Edit - AutoText"><emph>Edit - AutoText</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145644" xml-lang="en-US" l10n="U" oldref="38">Select the AutoText that you want to insert, and then click<emph> Insert</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3145668" xml-lang="en-US" l10n="CHG" oldref="30">You can also type the shortcut for an AutoText entry, and then press F3, or click the arrow next to the <emph>AutoText </emph>icon on the <emph>Insert</emph> bar, and then choose an AutoText entry. </paragraph>
-<paragraph role="tip" id="par_id3155090" xml-lang="en-US" l10n="U" oldref="43">To quickly enter a %PRODUCTNAME Math formula, type "FN", and then press F3. If you insert more than one formula, the formulae are sequentially numbered. To insert dummy text, type "DT", and then press F3. </paragraph>
-<paragraph role="heading" id="hd_id3155115" xml-lang="en-US" level="2" l10n="U" oldref="45">To Print a List of AutoText Entries</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155136" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155160" xml-lang="en-US" l10n="CHG" oldref="62">In the <emph>Macro from</emph> list, double-click "%PRODUCTNAME Macros - Gimmicks".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="63">Select "AutoText" and then click <emph>Run</emph>. A list of the current AutoText entries is generated in a separate text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151304" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>File - Print</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3151327" xml-lang="en-US" level="2" l10n="U" oldref="49">Using AutoText in Network Installations</paragraph>
-<paragraph role="paragraph" id="par_id3151355" xml-lang="en-US" l10n="U" oldref="50">You can store AutoText entries in different directories on a network.</paragraph>
-<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="51">For example, you can store "read-only" AutoText entries for your company on a central server, and user-defined AutoText entries in a local directory.</paragraph>
-<paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="CHG" oldref="52">The paths for the AutoText directories can be edited in the configuration.</paragraph>
-<paragraph role="paragraph" id="par_id3154960" xml-lang="en-US" l10n="U" oldref="53">Two directories are listed here. The first entry is on the server installation and the second entry is in the user directory. If there are two AutoText entries with the same name in both directories, the entry from the user directory is used.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154995" xml-lang="en-US" l10n="U" oldref="42"><link href="text/swriter/01/02120000.xhp" name="Edit - AutoText">Edit - AutoText</link></paragraph>
-<paragraph role="paragraph" id="par_id3155012" xml-lang="en-US" l10n="U" oldref="46"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150534" role="paragraph" l10n="CHG" oldref="27">In $[officename] Writer, you can store text - also containing graphics, tables, and fields - as AutoText, so that you can quickly insert the text later on. If you want, you can also store formatted text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155539" role="heading" level="2" l10n="U"
+                 oldref="48">To To Create an AutoText Entry</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155560" role="listitem" l10n="U" oldref="47">Select the text, text with graphics, table, or field that you want to save as an AutoText entry. A graphic can only be stored if it is anchored as a character and is preceded and followed by at least one text character.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155581" role="listitem" l10n="U" oldref="57">Choose<emph/>
+               <item type="menuitem">Edit - AutoText</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147761" role="listitem" l10n="U" oldref="58">Select the category where you want to store the AutoText.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147779" role="listitem" l10n="U" oldref="59">Type a name that is longer than four characters. This allows you to use the <emph>Display remainder of name as suggestion while typing</emph> AutoText option. If you want, you can modify the proposed shortcut.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147807" role="listitem" l10n="U" oldref="60">Click the <emph>AutoText</emph> button, and then choose <emph>New</emph>. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10732" role="listitem" l10n="NEW">Click the <emph>Close</emph> button.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3147282" role="heading" level="2" l10n="U"
+                 oldref="39">To Insert an AutoText Entry</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145597" role="listitem" l10n="U" oldref="61">Click in your document where you want to insert an AutoText entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145615" role="listitem" l10n="U" oldref="28">Choose <link href="text/swriter/01/02120000.xhp" name="Edit - AutoText"><emph>Edit - AutoText</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145644" role="listitem" l10n="U" oldref="38">Select the AutoText that you want to insert, and then click<emph/>
+               <item type="menuitem">Insert</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145668" role="paragraph" l10n="CHG" oldref="30">You can also type the shortcut for an AutoText entry, and then press F3, or click the arrow next to the <item type="menuitem">AutoText</item>
+         <emph/>icon on the <item type="menuitem">Insert</item> bar, and then choose an AutoText entry. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155090" role="tip" l10n="U" oldref="43">To quickly enter a %PRODUCTNAME Math formula, type <item type="literal">fn</item>, and then press F3. If you insert more than one formula, the formulae are sequentially numbered. To insert dummy text, type <item type="literal">dt</item>, and then press F3. </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155115" role="heading" level="2" l10n="U"
+                 oldref="45">To Print a List of AutoText Entries</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155136" role="listitem" l10n="CHG" oldref="44">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155160" role="listitem" l10n="CHG" oldref="62">In the <emph>Macro from</emph> list, double-click "%PRODUCTNAME Macros - Gimmicks".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151277" role="listitem" l10n="U" oldref="63">Select "AutoText" and then click <emph>Run</emph>. A list of the current AutoText entries is generated in a separate text document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151304" role="listitem" l10n="U" oldref="64">Choose <emph>File - Print</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3151327" role="heading" level="2" l10n="U"
+                 oldref="49">Using AutoText in Network Installations</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151355" role="paragraph" l10n="U" oldref="50">You can store AutoText entries in different directories on a network.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151370" role="paragraph" l10n="U" oldref="51">For example, you can store "read-only" AutoText entries for your company on a central server, and user-defined AutoText entries in a local directory.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151390" role="paragraph" l10n="CHG" oldref="52">The paths for the AutoText directories can be edited in the configuration.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154960" role="paragraph" l10n="U" oldref="53">Two directories are listed here. The first entry is on the server installation and the second entry is in the user directory. If there are two AutoText entries with the same name in both directories, the entry from the user directory is used.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3154995" role="paragraph" l10n="U" oldref="42"><link href="text/swriter/01/02120000.xhp" name="Edit - AutoText">Edit - AutoText</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155012" role="paragraph" l10n="U" oldref="46"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/background.xhp b/helpcontent2/source/text/swriter/guide/background.xhp
index 2903fa5d88..bef1e15d60 100644
--- a/helpcontent2/source/text/swriter/guide/background.xhp
+++ b/helpcontent2/source/text/swriter/guide/background.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: background.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,91 +31,83 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidebackgroundxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Defining Background Colors or Background Graphics</title>
-<filename>/text/swriter/guide/background.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidebackgroundxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Background Colors or Background Graphics</title>
+         <filename>/text/swriter/guide/background.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>backgrounds;text objects</bookmark_value>
 <bookmark_value>words;backgrounds</bookmark_value>
 <bookmark_value>paragraphs; backgrounds</bookmark_value>
-<bookmark_value>text;  backgrounds</bookmark_value>
+<bookmark_value>text;backgrounds</bookmark_value>
 <bookmark_value>tables; backgrounds</bookmark_value>
 <bookmark_value>cells; backgrounds</bookmark_value>
-</bookmark>
-  <comment>MW transferred 4 index entries from shared/guide/background.xhp and added 3 new entries</comment>
-  <paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/swriter/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link> 
-</variable></paragraph>
-  <comment>MW built this file from splitting shared/guide/background.xhp</comment>
-  <paragraph xml-lang="en-US" id="par_id7355265" role="paragraph" l10n="NEW">You can define a background color or use a graphic as a background for various objects in $[officename] Writer.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="3">Applying a Background To Text Characters</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150669" role="listitem" l10n="U" oldref="4">Select the characters.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155390" role="listitem" l10n="U" oldref="5">Choose <emph>Format - Character</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153665" role="listitem" l10n="U" oldref="6">Click the <emph>Background</emph> tab, select the background color.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3153541" role="heading" level="2" l10n="U" oldref="7">Applying a Background To a Paragraph</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145119" role="listitem" l10n="U" oldref="8">Place the cursor in the paragraph or select several paragraphs.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3158430" role="listitem" l10n="U" oldref="9">Choose <emph>Format - Paragraph</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="U" oldref="10">On the <emph>Background</emph> tab page, select the background color or a background graphic.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="11">Applying a Background To All or Part of a Text Table</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154346" role="listitem" l10n="U" oldref="12">Place the cursor in the table in your text document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148664" role="listitem" l10n="CHG" oldref="13">Choose <emph>Table - Table Properties</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154938" role="listitem" l10n="U" oldref="14">On the <emph>Background</emph> tab page, select the background color or a background graphic.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3156280" role="listitem" l10n="U" oldref="15">In the <emph>For</emph> box, choose whether the color or graphic should apply to the current cell, the current row or the whole table. If you select several cells or rows before opening the dialog, the change applies to the selection.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3151041" role="heading" level="3" l10n="U" oldref="31">Applying a Background to Parts of a Text Table Using an Icon</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150767" role="listitem" l10n="U" oldref="32">To apply a background color to cells, select the cells and click the color on the <emph>Background Color</emph> toolbar.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147084" role="listitem" l10n="U" oldref="33">To apply a background color to a text paragraph within a cell, place the cursor into the text paragraph, then click the color on the <emph>Background Color </emph>toolbar.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   
+<bookmark_value>backgrounds;selecting</bookmark_value>
+</bookmark><comment>MW transferred 4 index entries from shared/guide/background.xhp and added 3 new entries</comment>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/swriter/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
+</variable></paragraph><comment>MW built this file from splitting shared/guide/background.xhp</comment>
+<paragraph xml-lang="en-US" id="par_id7355265" role="paragraph" l10n="NEW">You can define a background color or use a graphic as a background for various objects in $[officename] Writer.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="3">To Apply a Background To Text Characters</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150669" role="listitem" l10n="U" oldref="4">Select the characters.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155390" role="listitem" l10n="U" oldref="5">Choose <emph>Format - Character</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153665" role="listitem" l10n="U" oldref="6">Click the <emph>Background</emph> tab, select the background color.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153541" role="heading" level="2" l10n="U" oldref="7">To Apply a Background To a Paragraph</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145119" role="listitem" l10n="U" oldref="8">Place the cursor in the paragraph or select several paragraphs.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3158430" role="listitem" l10n="U" oldref="9">Choose <emph>Format - Paragraph</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="U" oldref="10">On the <emph>Background</emph> tab page, select the background color or a background graphic.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0104201010554939" role="tip" l10n="NEW">To select an object in the background, hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key and click the object. Alternatively, use the Navigator to select the object.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U"
+                 oldref="11">To Apply a Background To All or Part of a Table</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154346" role="listitem" l10n="U" oldref="12">Place the cursor in the table in your text document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148664" role="listitem" l10n="CHG" oldref="13">Choose <emph>Table - Table Properties</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154938" role="listitem" l10n="U" oldref="14">On the <emph>Background</emph> tab page, select the background color or a background graphic.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156280" role="listitem" l10n="U" oldref="15">In the <emph>For</emph> box, choose whether the color or graphic should apply to the current cell, the current row or the whole table. If you select several cells or rows before opening the dialog, the change applies to the selection.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3151041" role="tip" l10n="U" oldref="31">You may also use an icon to apply a background to table parts.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150767" role="tip" l10n="U" oldref="32">To apply a background color to cells, select the cells and click the color on the <emph>Background Color</emph> toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147084" role="tip" l10n="U" oldref="33">To apply a background color to a text paragraph within a cell, place the cursor into the text paragraph, then click the color on the <item type="menuitem">Background Color</item> toolbar.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
 <switch select="appl">
-   
-<case select="IMPRESS">
-   <embed href="text/simpress/guide/background.xhp#background"/>
-   
+<case select="IMPRESS"><embed href="text/simpress/guide/background.xhp#background"/>
 </case>
-   
 </switch>
-   <paragraph xml-lang="en-US" id="par_idN10A56" role="paragraph" l10n="NEW"><link href="text/shared/02/02160000.xhp">Highlighting icon</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id4922025" role="paragraph" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id478530" role="paragraph" l10n="NEW"><link href="text/swriter/guide/pagebackground.xhp">Page Backgrounds as Page Styles</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10A56" role="paragraph" l10n="NEW"><link href="text/shared/02/02160000.xhp">Highlighting icon</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page">Background tab page</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id4922025" role="paragraph" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id478530" role="paragraph" l10n="NEW"><link href="text/swriter/guide/pagebackground.xhp">Page Backgrounds as Page Styles</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/border_object.xhp b/helpcontent2/source/text/swriter/guide/border_object.xhp
index e47d6f9752..38ff992238 100644
--- a/helpcontent2/source/text/swriter/guide/border_object.xhp
+++ b/helpcontent2/source/text/swriter/guide/border_object.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: border_object.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,67 +29,67 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideborder_objectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Borders for Objects </title>
-<filename>/text/swriter/guide/border_object.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideborder_objectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Borders for Objects </title>
+         <filename>/text/swriter/guide/border_object.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146957"><bookmark_value>objects; defining borders</bookmark_value>
-<bookmark_value>borders; for objects</bookmark_value>
-<bookmark_value>frames; around objects</bookmark_value>
-<bookmark_value>charts;borders</bookmark_value>
-<bookmark_value>pictures;borders</bookmark_value>
-<bookmark_value>OLE objects;borders</bookmark_value>
-<bookmark_value>defining;object borders</bookmark_value>
-</bookmark><comment>MW deleted "adding;"</comment><paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="1" l10n="U" oldref="17"><variable id="border_object"><link href="text/swriter/guide/border_object.xhp" name="Defining Borders for Objects">Defining Borders for Objects</link>
+      <bookmark_value>borders; for objects</bookmark_value>
+      <bookmark_value>frames; around objects</bookmark_value>
+      <bookmark_value>charts;borders</bookmark_value>
+      <bookmark_value>pictures;borders</bookmark_value>
+      <bookmark_value>OLE objects;borders</bookmark_value>
+      <bookmark_value>defining;object borders</bookmark_value>
+</bookmark><comment>MW deleted "adding;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="1" l10n="U"
+                 oldref="17"><variable id="border_object"><link href="text/swriter/guide/border_object.xhp" name="Defining Borders for Objects">Defining Borders for Objects</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="CHG" oldref="1">In Writer, you can define borders around OLE objects, plug-ins, diagrams/charts, graphics and frames. The name of the menu to be used depends on the object selected.</paragraph>
-<paragraph role="heading" id="hd_id3145673" xml-lang="en-US" level="2" l10n="U" oldref="2">Setting a Predefined Border Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="3">Select the object for which you want to define a border.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="4">Click the <emph>Borders</emph> icon on the <emph>OLE-Object</emph> toolbar or <emph>Frame</emph> toolbar to open the <emph>Borders</emph> window. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="6">Click one of the predefined border styles. This replaces the current border style of the object with the selected style.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152474" xml-lang="en-US" level="2" l10n="U" oldref="7">Setting a Customized Border Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="8">Select the table cells that you want to modify.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156344" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - (object name) - Borders</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154071" xml-lang="en-US" l10n="U" oldref="10">Replace (object name) with the actual name of the object type you selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="11">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="12">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="13">Repeat the last two steps for every border edge.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="14">Select the distance between the border lines and the page contents in the <emph>Spacing to Contents</emph> area.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="15">Click <emph>OK</emph> to apply the changes.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/border_page.xhp#border_page"/>
-<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-<embed href="text/shared/guide/border_table.xhp#border_table"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3146797" role="paragraph" l10n="CHG" oldref="1">In Writer, you can define borders around OLE objects, plug-ins, diagrams/charts, graphics and frames. The name of the menu to be used depends on the object selected.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145673" role="heading" level="2" l10n="U" oldref="2">To Set a Predefined Border Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155388" role="listitem" l10n="U" oldref="3">Select the object for which you want to define a border.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="CHG" oldref="4">Click the <emph>Borders</emph> icon on the <emph>OLE-Object</emph> toolbar or <emph>Frame</emph> toolbar to open the <emph>Borders</emph> window. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159176" role="listitem" l10n="U" oldref="6">Click one of the predefined border styles. This replaces the current border style of the object with the selected style.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3152474" role="heading" level="2" l10n="U" oldref="7">To Set a Customized Border Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153896" role="listitem" l10n="U" oldref="8">Select the table cells that you want to modify.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156344" role="listitem" l10n="U" oldref="9">Choose <item type="menuitem">Format - (object name) – Borders</item>.<br/>Replace (object name) with the actual name of the object type you selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148797" role="listitem" l10n="U" oldref="11">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152933" role="listitem" l10n="U" oldref="12">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3125865" role="listitem" l10n="U" oldref="13">Repeat the last two steps for every border edge.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150447" role="listitem" l10n="U" oldref="14">Select the distance between the border lines and the page contents in the <emph>Spacing to Contents</emph> area.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154908" role="listitem" l10n="U" oldref="15">Click <emph>OK</emph> to apply the changes.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/border_page.xhp#border_page"/>
+         <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
+         <embed href="text/shared/guide/border_table.xhp#border_table"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/border_page.xhp b/helpcontent2/source/text/swriter/guide/border_page.xhp
index 2cf28cf1ad..57c0c9007a 100644
--- a/helpcontent2/source/text/swriter/guide/border_page.xhp
+++ b/helpcontent2/source/text/swriter/guide/border_page.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: border_page.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,74 +29,68 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideborder_pagexml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Defining Borders for Pages</title>
-<filename>/text/swriter/guide/border_page.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideborder_pagexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Borders for Pages</title>
+         <filename>/text/swriter/guide/border_page.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156136"><bookmark_value>pages;defining borders</bookmark_value>
-<bookmark_value>borders; for pages</bookmark_value>
-<bookmark_value>frames; around pages</bookmark_value>
-<bookmark_value>defining;page borders</bookmark_value>
-</bookmark>
-  <comment>MW deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3156136" role="heading" level="1" l10n="U" oldref="15"><variable id="border_page"><link href="text/swriter/guide/border_page.xhp" name="Defining Borders for Pages">Defining Borders for Pages</link> 
+      <bookmark_value>borders; for pages</bookmark_value>
+      <bookmark_value>frames; around pages</bookmark_value>
+      <bookmark_value>defining;page borders</bookmark_value>
+</bookmark><comment>MW deleted "adding;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156136" role="heading" level="1" l10n="U"
+                 oldref="15"><variable id="border_page"><link href="text/swriter/guide/border_page.xhp" name="Defining Borders for Pages">Defining Borders for Pages</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148473" role="warning" l10n="CHG" oldref="1">In Writer, you can define borders for page styles, not individual pages. All changes made to borders apply to all pages that use the same page style. Note that page style changes cannot be undone by the Undo function in $[officename].</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3150503" role="heading" level="2" l10n="U" oldref="2">Setting a Predefined Border Style</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148491" role="listitem" l10n="U" oldref="3">Choose <emph>Format - Page - Borders</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150771" role="listitem" l10n="U" oldref="4">Select one of the default border styles in the <emph>Default</emph> area.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154046" role="listitem" l10n="U" oldref="5">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3152472" role="listitem" l10n="U" oldref="6">Select the distance between the border lines and the page contents in the <emph>Spacing to contents</emph> area.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3156023" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph> to apply the changes.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3145068" role="heading" level="2" l10n="U" oldref="8">Setting a Customized Border Style</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="9">Choose <emph>Format - Page - Borders</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150541" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3159149" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3156282" role="listitem" l10n="U" oldref="12">Repeat the last two steps for every border edge.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3151041" role="listitem" l10n="U" oldref="13">Select the distance between the border lines and the page contents in the <emph>Spacing to contents</emph> area.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145606" role="listitem" l10n="U" oldref="14">Click <emph>OK</emph> to apply the changes.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-   <embed href="text/shared/guide/border_table.xhp#border_table"/>
-   <embed href="text/swriter/guide/border_object.xhp#border_object"/>
-   <embed href="text/swriter/guide/pagestyles.xhp#pagestyles"/>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3148473" role="warning" l10n="CHG" oldref="1">In Writer, you define borders for <emph>page styles</emph>, not individual pages. All changes made to borders apply to all pages that use the same page style. Note that page style changes cannot be undone by the Undo function in $[officename].</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150503" role="heading" level="2" l10n="U" oldref="2">To Set a Predefined Border Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148491" role="listitem" l10n="U" oldref="3">Choose <emph>Format - Page - Borders</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150771" role="listitem" l10n="U" oldref="4">Select one of the default border styles in the <emph>Default</emph> area.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154046" role="listitem" l10n="U" oldref="5">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152472" role="listitem" l10n="U" oldref="6">Select the distance between the border lines and the page contents in the <emph>Spacing to contents</emph> area.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156023" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph> to apply the changes.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145068" role="heading" level="2" l10n="U" oldref="8">To Set a Customized Border Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="9">Choose <emph>Format - Page - Borders</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150541" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3159149" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156282" role="listitem" l10n="U" oldref="12">Repeat the last two steps for every border edge.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151041" role="listitem" l10n="U" oldref="13">Select the distance between the border lines and the page contents in the <emph>Spacing to contents</emph> area.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145606" role="listitem" l10n="U" oldref="14">Click <emph>OK</emph> to apply the changes.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
+         <embed href="text/shared/guide/border_table.xhp#border_table"/>
+         <embed href="text/swriter/guide/border_object.xhp#border_object"/>
+         <embed href="text/swriter/guide/pagestyles.xhp#pagestyles"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/borders.xhp b/helpcontent2/source/text/swriter/guide/borders.xhp
index fffc320439..014c95b8a6 100755
--- a/helpcontent2/source/text/swriter/guide/borders.xhp
+++ b/helpcontent2/source/text/swriter/guide/borders.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: borders.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,218 +29,209 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidebordersxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">User Defined Borders in Text Documents </title>
-<filename>text/swriter/guide/borders.xhp</filename>
-</topic>
-<history>
-<created date="2005-11-01T16:47:50">Writer borders</created>
-<lastedited date="2007-02-19T12:20:56"/>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidebordersxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">User Defined Borders in Text Documents </title>
+         <filename>text/swriter/guide/borders.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id6737876"><bookmark_value>borders;for text tables</bookmark_value>
-<bookmark_value>cells;borders in text tables</bookmark_value>
-<bookmark_value>defining;table borders in Writer</bookmark_value>
-<bookmark_value>frames;around text tables</bookmark_value>
-<bookmark_value>tables;defining borders</bookmark_value>
+      <bookmark_value>cells;borders in text tables</bookmark_value>
+      <bookmark_value>defining;table borders in Writer</bookmark_value>
+      <bookmark_value>frames;around text tables</bookmark_value>
+      <bookmark_value>tables;defining borders</bookmark_value>
 </bookmark><comment>MW changed "text tables;" to "tables;"</comment>
-<paragraph role="heading" id="hd_id3614917" xml-lang="en-US" level="1" l10n="NEW"><variable id="borders"><link href="text/swriter/guide/borders.xhp">User Defined Borders in Text Documents</link>
+<paragraph xml-lang="en-US" id="hd_id3614917" role="heading" level="1" l10n="NEW"><variable id="borders"><link href="text/swriter/guide/borders.xhp">User Defined Borders in Text Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1069368" xml-lang="en-US" l10n="NEW">You can apply a variety of different cell borders to selected cells in a Writer table and to the whole table. Other objects in text documents can have user defined borders, too. For example, you can assign borders to page styles, to frames, and to inserted pictures or charts.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6527298" xml-lang="en-US" l10n="NEW">Select the cell or a block of cells in a Writer table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6129947" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Table - Table properties</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8141117" xml-lang="en-US" l10n="NEW">In the dialog, click the <emph>Borders</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6016418" xml-lang="en-US" l10n="NEW">Choose the border options you want to apply and click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5282448" xml-lang="en-US" l10n="NEW">The options in the <emph>Line arrangement</emph> area can be used to apply multiple border styles.</paragraph>
-<paragraph role="heading" id="hd_id3547166" xml-lang="en-US" level="2" l10n="NEW">Selection of cells</paragraph>
-<paragraph role="paragraph" id="par_id1108432" xml-lang="en-US" l10n="NEW">Depending on the selection of cells, the area looks different.</paragraph>
-<table id="tbl_id4423352">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id2422559" xml-lang="en-US" l10n="NEW">Selection</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id1053498" xml-lang="en-US" l10n="NEW">Line arrangement area</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1076998" xml-lang="en-US" l10n="NEW">One cell selected in a table of more that one cell size, or cursor inside a table with no cell selected</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4240241" xml-lang="en-US" l10n="NEW">
-<image id="img_id1058992" src="res/helpimg/border_wr_1.png" width="1.2709inch" height="1.5937inch"><alt id="alt_id1058992" xml-lang="en-US">one cell border</alt>
+      <paragraph xml-lang="en-US" id="par_id1069368" role="paragraph" l10n="NEW">You can apply a variety of different cell borders to selected cells in a Writer table and to the whole table. Other objects in text documents can have user defined borders, too. For example, you can assign borders to page styles, to frames, and to inserted pictures or charts.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6527298" role="paragraph" l10n="NEW">Select the cell or a block of cells in a Writer table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6129947" role="paragraph" l10n="NEW">Choose <item type="menuitem">Table - Table properties</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8141117" role="paragraph" l10n="NEW">In the dialog, click the <emph>Borders</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6016418" role="paragraph" l10n="NEW">Choose the border options you want to apply and click OK.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5282448" role="paragraph" l10n="NEW">The options in the <emph>Line arrangement</emph> area can be used to apply multiple border styles.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3547166" role="heading" level="2" l10n="NEW">Selection of cells</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1108432" role="paragraph" l10n="NEW">Depending on the selection of cells, the area looks different.</paragraph>
+      <table id="tbl_id4423352">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2422559" role="tablehead" l10n="NEW">Selection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1053498" role="tablehead" l10n="NEW">Line arrangement area</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1076998" role="tablecontent" l10n="NEW">One cell selected in a table of more that one cell size, or cursor inside a table with no cell selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4240241" role="tablecontent" l10n="NEW">
+<image id="img_id1058992" src="res/helpimg/border_wr_1.png" width="1.4071in" height="1.7791in"><alt xml-lang="en-US" id="alt_id1058992">one cell border</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id162053" xml-lang="en-US" l10n="NEW">A one cell table, the cell is selected</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5021820" xml-lang="en-US" l10n="NEW">
-<image id="img_id7366557" src="res/helpimg/border_wr_2.png" width="1.2709inch" height="1.6146inch"><alt id="alt_id7366557" xml-lang="en-US">one selected cell border</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id162053" role="tablecontent" l10n="NEW">A one cell table, the cell is selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5021820" role="tablecontent" l10n="NEW">
+<image id="img_id7366557" src="res/helpimg/border_wr_2.png" width="1.4071in" height="1.7791in"><alt xml-lang="en-US" id="alt_id7366557">one selected cell border</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3549607" xml-lang="en-US" l10n="NEW">Cells in a column selected</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2544328" xml-lang="en-US" l10n="NEW">
-<image id="img_id2298654" src="res/helpimg/border_wr_3.png" width="1.2709inch" height="1.6252inch"><alt id="alt_id2298654" xml-lang="en-US">column selected border</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3549607" role="tablecontent" l10n="NEW">Cells in a column selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2544328" role="tablecontent" l10n="NEW">
+<image id="img_id2298654" src="res/helpimg/border_wr_3.png" width="1.4071in" height="1.7791in"><alt xml-lang="en-US" id="alt_id2298654">column selected border</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1636402" xml-lang="en-US" l10n="NEW">Cells in a row selected</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7450483" xml-lang="en-US" l10n="NEW">
-<image id="img_id9033783" src="res/helpimg/border_wr_4.png" width="1.2709inch" height="1.6043inch"><alt id="alt_id9033783" xml-lang="en-US">row selected border</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1636402" role="tablecontent" l10n="NEW">Cells in a row selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id7450483" role="tablecontent" l10n="NEW">
+<image id="img_id9033783" src="res/helpimg/border_wr_4.png" width="1.4071in" height="1.7791in"><alt xml-lang="en-US" id="alt_id9033783">row selected border</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5741752" xml-lang="en-US" l10n="NEW">A whole table of 2x2 or more cells selected</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id570085" xml-lang="en-US" l10n="NEW">
-<image id="img_id4776757" src="res/helpimg/border_wr_5.png" width="1.2811inch" height="1.6043inch"><alt id="alt_id4776757" xml-lang="en-US">block selected border</alt>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id5741752" role="tablecontent" l10n="NEW">A whole table of 2x2 or more cells selected</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id570085" role="tablecontent" l10n="NEW">
+<image id="img_id4776757" src="res/helpimg/border_wr_5.png" width="1.4071in" height="1.7791in"><alt xml-lang="en-US" id="alt_id4776757">block selected border</alt>
 	</image></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id5044099" xml-lang="en-US" level="2" l10n="NEW">Default settings</paragraph>
-<paragraph role="paragraph" id="par_id626544" xml-lang="en-US" l10n="NEW">Click one of the <emph>Default</emph> icons to set or reset multiple borders.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id292062" xml-lang="en-US" l10n="NEW">The thin gray lines inside an icon show the borders that will be reset or cleared.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1361735" xml-lang="en-US" l10n="NEW">The dark lines inside an icon show the lines that will be set using the selected line style and color.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id82399" xml-lang="en-US" l10n="NEW">The thick gray lines inside an icon show the lines that will not be changed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id7144993" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
-<paragraph role="paragraph" id="par_id5528427" xml-lang="en-US" l10n="NEW">Select a block of about 8x8 cells, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id4194158" xml-lang="en-US" l10n="NEW">
-<image id="img_id8221076" src="res/helpimg/border_ca_5.png" width="1.1354inch" height="0.25inch"><alt id="alt_id8221076" xml-lang="en-US">default icons for borders</alt>
+      <paragraph xml-lang="en-US" id="hd_id5044099" role="heading" level="2" l10n="NEW">Default settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id626544" role="paragraph" l10n="NEW">Click one of the <emph>Default</emph> icons to set or reset multiple borders.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id292062" role="listitem" l10n="NEW">The thin gray lines inside an icon show the borders that will be reset or cleared.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1361735" role="listitem" l10n="NEW">The dark lines inside an icon show the lines that will be set using the selected line style and color.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id82399" role="listitem" l10n="NEW">The thick gray lines inside an icon show the lines that will not be changed.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id7144993" role="heading" level="3" l10n="NEW">Examples</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5528427" role="paragraph" l10n="NEW">Select a block of about 8x8 cells, then choose <emph>Format - Cells - Borders</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4194158" role="paragraph" l10n="NEW">
+<image id="img_id8221076" src="res/helpimg/border_ca_5.png" width="1.2209in" height="0.2445in"><alt xml-lang="en-US" id="alt_id8221076">default icons for borders</alt>
 	</image></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7253028" xml-lang="en-US" l10n="NEW">Click the left icon to clear all lines. This removes all outer borders and all inner lines.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9441206" xml-lang="en-US" l10n="NEW">Click the second icon from the left to set an outer border and to remove all other lines.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7276833" xml-lang="en-US" l10n="NEW">Click the rightmost icon to set an outer border. The inner lines are not changed.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5273293" xml-lang="en-US" l10n="NEW">Now you can continue to see which lines the other icons will set or remove.</paragraph>
-<paragraph role="heading" id="hd_id5110019" xml-lang="en-US" level="2" l10n="NEW">User defined settings</paragraph>
-<paragraph role="paragraph" id="par_id1820734" xml-lang="en-US" l10n="NEW">In the <emph>User defined</emph> area, you can click to set or remove individual lines. The preview shows lines in three different states. </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7093111" xml-lang="en-US" l10n="NEW">Repeatedly click an edge or a corner to switch through the three different states.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id5196996">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3673818" xml-lang="en-US" l10n="NEW">Line types</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id2593768" xml-lang="en-US" l10n="NEW">Image</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id2055421" xml-lang="en-US" l10n="NEW">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9836115" xml-lang="en-US" l10n="NEW">A black line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6485793" xml-lang="en-US" l10n="NEW">
-<image id="img_id1237525" src="res/helpimg/border_wr_6.png" width="1.2709inch" height="1.1354inch"><alt id="alt_id1237525" xml-lang="en-US">solid line for border</alt>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7253028" role="listitem" l10n="NEW">Click the left icon to clear all lines. This removes all outer borders and all inner lines.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9441206" role="listitem" l10n="NEW">Click the second icon from the left to set an outer border and to remove all other lines.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7276833" role="listitem" l10n="NEW">Click the rightmost icon to set an outer border. The inner lines are not changed.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5273293" role="paragraph" l10n="NEW">Now you can continue to see which lines the other icons will set or remove.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5110019" role="heading" level="2" l10n="NEW">User defined settings</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1820734" role="paragraph" l10n="NEW">In the <emph>User defined</emph> area, you can click to set or remove individual lines. The preview shows lines in three different states. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id7093111" role="paragraph" l10n="NEW">Repeatedly click an edge or a corner to switch through the three different states.</paragraph>
+      <table id="tbl_id5196996">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3673818" role="tablehead" l10n="NEW">Line types</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2593768" role="tablehead" l10n="NEW">Image</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2055421" role="tablehead" l10n="NEW">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9836115" role="tablecontent" l10n="NEW">A black line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id6485793" role="tablecontent" l10n="NEW">
+<image id="img_id1237525" src="res/helpimg/border_wr_6.png" width="1.4071in" height="1.2555in"><alt xml-lang="en-US" id="alt_id1237525">solid line for border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1454512" xml-lang="en-US" l10n="NEW">A black line sets the corresponding line of the selected cells. The line is shown as a dotted line when you choose the 0.05 pt line style. Double lines are shown when you select a double line style.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4618671" xml-lang="en-US" l10n="NEW">A gray line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1239356" xml-lang="en-US" l10n="NEW">
-<image id="img_id2688680" src="res/helpimg/border_wr_7.png" width="1.2709inch" height="1.1457inch"><alt id="alt_id2688680" xml-lang="en-US">gray line for border</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1454512" role="tablecontent" l10n="NEW">A black line sets the corresponding line of the selected cells. The line is shown as a dotted line when you choose the 0.05 pt line style. Double lines are shown when you select a double line style.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id4618671" role="tablecontent" l10n="NEW">A gray line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1239356" role="tablecontent" l10n="NEW">
+<image id="img_id2688680" src="res/helpimg/border_wr_7.png" width="1.4071in" height="1.2555in"><alt xml-lang="en-US" id="alt_id2688680">gray line for border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9474166" xml-lang="en-US" l10n="NEW">A gray line is shown when the corresponding line of the selected cells will not be changed. No line will be set or removed at this position.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1545457" xml-lang="en-US" l10n="NEW">A white line</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1681875" xml-lang="en-US" l10n="NEW">
-<image id="img_id7340617" src="res/helpimg/border_wr_8.png" width="1.2709inch" height="1.1354inch"><alt id="alt_id7340617" xml-lang="en-US">white line for border</alt>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id9474166" role="tablecontent" l10n="NEW">A gray line is shown when the corresponding line of the selected cells will not be changed. No line will be set or removed at this position.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1545457" role="tablecontent" l10n="NEW">A white line</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id1681875" role="tablecontent" l10n="NEW">
+<image id="img_id7340617" src="res/helpimg/border_wr_8.png" width="1.4071in" height="1.2555in"><alt xml-lang="en-US" id="alt_id7340617">white line for border</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2316660" xml-lang="en-US" l10n="NEW">A white line is shown when the corresponding line of the selected cells will be removed.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id2316660" role="tablecontent" l10n="NEW">A white line is shown when the corresponding line of the selected cells will be removed.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id5908688" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5118564" xml-lang="en-US" l10n="NEW">Select a single cell in a Writer table, then choose <emph>Table - Table properties - Borders</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id244758" xml-lang="en-US" l10n="NEW">Select a thick line style.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7741325" xml-lang="en-US" l10n="NEW">To set a lower border, click the lower edge repeatedly until you see a thick line.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id542313" xml-lang="en-US" l10n="NEW">
-<image id="img_id4273506" src="res/helpimg/border_wr_6.png" width="1.2709inch" height="1.1354inch"><alt id="alt_id4273506" xml-lang="en-US">setting thick lower border</alt>
+      <paragraph xml-lang="en-US" id="hd_id5908688" role="heading" level="3" l10n="NEW">Examples</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5118564" role="paragraph" l10n="NEW">Select a single cell in a Writer table, then choose <emph>Table - Table properties - Borders</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id244758" role="paragraph" l10n="NEW">Select a thick line style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7741325" role="paragraph" l10n="NEW">To set a lower border, click the lower edge repeatedly until you see a thick line.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id542313" role="paragraph" l10n="NEW">
+<image id="img_id4273506" src="res/helpimg/border_wr_6.png" width="1.4071in" height="1.2555in"><alt xml-lang="en-US" id="alt_id4273506">setting thick lower border</alt>
 	</image></paragraph>
-<paragraph role="note" id="par_id2210760" xml-lang="en-US" l10n="NEW">All cells in a Writer table have at least a left and a lower line by default. Most cells on the table perimeter have more lines applied by default. </paragraph>
-<paragraph role="warning" id="par_id5400860" xml-lang="en-US" l10n="NEW">All lines that are shown in white in the preview will be removed from the cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2210760" role="note" l10n="NEW">All cells in a Writer table have at least a left and a lower line by default. Most cells on the table perimeter have more lines applied by default. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id5400860" role="warning" l10n="NEW">All lines that are shown in white in the preview will be removed from the cell.</paragraph>
 <switch select="appl">
 <case select="CALC"><embed href="text/scalc/guide/borders.xhp#borders"/>
 </case>
-</switch>
-<embed href="text/swriter/guide/border_page.xhp#border_page"/>
-<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-</body>
-</helpdocument>
+</switch><embed href="text/swriter/guide/border_page.xhp#border_page"/>
+      <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate.xhp b/helpcontent2/source/text/swriter/guide/calculate.xhp
index a4fadde04f..fc32c8b81c 100755
--- a/helpcontent2/source/text/swriter/guide/calculate.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,41 +29,38 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating in Text Documents</title>
-<filename>/text/swriter/guide/calculate.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-18T13:58:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidecalculatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating in Text Documents</title>
+         <filename>/text/swriter/guide/calculate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149909"><bookmark_value>calculating; in text</bookmark_value>
-<bookmark_value>formulas; calculating in text</bookmark_value>
-<bookmark_value>references;in Writer tables</bookmark_value>
+      <bookmark_value>formulas; calculating in text</bookmark_value>
+      <bookmark_value>references;in Writer tables</bookmark_value>
 </bookmark><comment>mw deleted "formula bar in text"</comment>
-<paragraph role="heading" id="hd_id3149909" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="calculate"><link href="text/swriter/guide/calculate.xhp" name="Calculating in Text Documents">Calculating in Text Documents</link>
+<paragraph xml-lang="en-US" id="hd_id3149909" role="heading" level="1" l10n="U" oldref="1"><variable id="calculate"><link href="text/swriter/guide/calculate.xhp" name="Calculating in Text Documents">Calculating in Text Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="2">You can insert a calculation directly into a text document or into a text table.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="3">Click in the document where you want to insert the calculation, and then press F2. If you are in a table cell, type an equals sign =.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155547" xml-lang="en-US" l10n="U" oldref="10">Type the calculation that you want to insert, for example, "=10000/12", and then press Enter.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155565" xml-lang="en-US" l10n="U" oldref="11">You can also click the <emph>Formula </emph>icon on the <emph>Formula Bar</emph>, and then choose a function for your formula.</paragraph>
-<paragraph role="note" id="par_id8316904" xml-lang="en-US" l10n="NEW">To reference cells in a Writer text table, enclose the cell address or the cell range in angle brackets. For example, to reference cell A1 from another cell, enter =&lt;A1&gt; into the cell.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
-<embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
-<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
-<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149949" role="paragraph" l10n="U" oldref="2">You can insert a calculation directly into a text document or into a text table.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149972" role="listitem" l10n="U" oldref="3">Click in the document where you want to insert the calculation, and then press F2. If you are in a table cell, type an equals sign =.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155547" role="listitem" l10n="U" oldref="10">Type the calculation that you want to insert, for example, <item type="literal">=10000/12</item>, and then press Enter.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155565" role="paragraph" l10n="U" oldref="11">You can also click the <item type="menuitem">Formula</item>
+         <emph/>icon on the <item type="menuitem">Formula Bar</item>, and then choose a function for your formula.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8316904" role="note" l10n="NEW">To reference cells in a Writer text table, enclose the cell address or the cell range in angle brackets. For example, to reference cell A1 from another cell, enter =&lt;A1&gt; into the cell.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
+      <embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
+      <embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
+      <embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp b/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
index 4a8c76c3b8..56c82f2a2f 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate_clipboard.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,52 +27,43 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculate_clipboardxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating and Pasting the Result of a Formula in a Text Document</title>
-<filename>/text/swriter/guide/calculate_clipboard.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-24T13:45:58">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidecalculate_clipboardxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating and Pasting the Result of a Formula in a Text Document</title>
+         <filename>/text/swriter/guide/calculate_clipboard.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147692"><bookmark_value>pasting;results of formulas</bookmark_value>
-<bookmark_value>clipboard;calculating in text</bookmark_value>
-<bookmark_value>formulas;pasting results in text documents</bookmark_value>
+      <bookmark_value>clipboard;calculating in text</bookmark_value>
+      <bookmark_value>formulas;pasting results in text documents</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147692" xml-lang="en-US" level="1" l10n="U" oldref="35"><variable id="calculate_clipboard"><link href="text/swriter/guide/calculate_clipboard.xhp" name=" Calculating and Pasting the Result of a Formula in a Text Document"> Calculating and Pasting the Result of a Formula in a Text Document</link>
+<paragraph xml-lang="en-US" id="hd_id3147692" role="heading" level="1" l10n="U"
+                 oldref="35"><variable id="calculate_clipboard"><link href="text/swriter/guide/calculate_clipboard.xhp" name=" Calculating and Pasting the Result of a Formula in a Text Document"> Calculating and Pasting the Result of a Formula in a Text Document</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156366" xml-lang="en-US" l10n="U" oldref="36">If your text already contains a formula, for example "12+24*2", $[officename] can calculate, and then paste the result of the formula in your document, without using the <emph>Formula Bar</emph>.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154250" xml-lang="en-US" l10n="U" oldref="37">Select the formula in the text. The formula can only contain numbers and operators and cannot contain spaces.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155496" xml-lang="en-US" l10n="U" oldref="38">Choose <emph>Tools - Calculate</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="par_id3156366" role="paragraph" l10n="U" oldref="36">If your text already contains a formula, for example "12+24*2", $[officename] can calculate, and then paste the result of the formula in your document, without using the <emph>Formula Bar</emph>.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154250" role="listitem" l10n="U" oldref="37">Select the formula in the text. The formula can only contain numbers and operators and cannot contain spaces.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155496" role="listitem" l10n="U" oldref="38">Choose <emph>Tools - Calculate</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Plus Sign (+).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150512" xml-lang="en-US" l10n="U" oldref="40">Place the cursor where you want to insert the result of the formula, and then choose <emph>Edit - Paste</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155547" xml-lang="en-US" l10n="U" oldref="41">If the formula is selected, it is replaced by the result.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate.xhp#calculate"/>
-<embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
-<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
-<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5172582" role="listitem" l10n="NEW">Place the cursor where you want to insert the result of the formula, and then choose <item type="menuitem">Edit - Paste</item>, or press <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.<br/>The selected formula is replaced by the result.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate.xhp#calculate"/>
+      <embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
+      <embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
+      <embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intable.xhp b/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
index a51b2a29b2..1460acf140 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate_intable.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,52 +29,49 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculate_intablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating Cell Totals in Tables</title>
-<filename>/text/swriter/guide/calculate_intable.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:17:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidecalculate_intablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating Cell Totals in Tables</title>
+         <filename>/text/swriter/guide/calculate_intable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147400"><bookmark_value>calculating;sums in text tables</bookmark_value>
-<bookmark_value>totals in text tables</bookmark_value>
-<bookmark_value>tables;calculating sums</bookmark_value>
-<bookmark_value>cells;calculating sums</bookmark_value>
-<bookmark_value>table cells;calculating sums</bookmark_value>
-<bookmark_value>sums of table cell series</bookmark_value>
+      <bookmark_value>totals in text tables</bookmark_value>
+      <bookmark_value>tables;calculating sums</bookmark_value>
+      <bookmark_value>cells;calculating sums</bookmark_value>
+      <bookmark_value>table cells;calculating sums</bookmark_value>
+      <bookmark_value>sums of table cell series</bookmark_value>
 </bookmark><comment>mw deleted "text tables;"</comment>
-<paragraph role="heading" id="hd_id3147400" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="calculate_intable"><link href="text/swriter/guide/calculate_intable.xhp" name="Calculating Cell Totals in Tables">Calculating the sum of a series of table cells</link>
+<paragraph xml-lang="en-US" id="hd_id3147400" role="heading" level="1" l10n="U" oldref="3"><variable id="calculate_intable"><link href="text/swriter/guide/calculate_intable.xhp" name="Calculating Cell Totals in Tables">Calculating the Sum of a Series of Table Cells</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154243" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Insert - Table</emph>, and insert a table with one column and more than one row into a text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154203" xml-lang="en-US" l10n="U" oldref="5">Type a number in each cell of the column, but leave the last cell in the column empty.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154222" xml-lang="en-US" l10n="U" oldref="6">Place the cursor in the last cell of the column, and then click the <emph>Sum</emph> icon on the <emph>Table Bar</emph>.<br/>The<emph> Formula Bar</emph> appears with the entry "=sum".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147775" xml-lang="en-US" l10n="U" oldref="15">Click in the first cell of the series you want to sum up, drag to the final cell, and then release.<br/>$[officename] inserts a formula for calculating the sum of the values in the current column.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150507" xml-lang="en-US" l10n="U" oldref="8">Press Enter, or click <emph>Apply</emph> in the Formula bar. <br/>The sum of the values in the current column is entered in the cell.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="10">If you enter a different number anywhere in the column, the sum is updated as soon as you click in the last column cell.</paragraph>
-<paragraph role="paragraph" id="par_id3155533" xml-lang="en-US" l10n="U" oldref="11">Similarly, you can also quickly calculate the sum of a row of numbers.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate.xhp#calculate"/>
-<embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
-<embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
-<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154243" role="listitem" l10n="U" oldref="4">Choose <emph>Insert - Table</emph>, and insert a table with one column and more than one row into a text document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154203" role="listitem" l10n="U" oldref="5">Type a number in each cell of the column, but leave the last cell in the column empty.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154222" role="listitem" l10n="U" oldref="6">Place the cursor in the last cell of the column, and then click the <item type="menuitem">Sum</item> icon on the <item type="menuitem">Table Bar</item>.<br/>The<emph/>
+               <item type="menuitem">Formula Bar</item> appears with the entry "=sum".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147775" role="listitem" l10n="U" oldref="15">Click in the first cell of the series you want to sum up, drag to the final cell, and then release.<br/>$[officename] inserts a formula for calculating the sum of the values in the current column.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150507" role="listitem" l10n="U" oldref="8">Press Enter, or click <emph>Apply</emph> in the Formula bar. <br/>The sum of the values in the current column is entered in the cell.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3150533" role="paragraph" l10n="U" oldref="10">If you enter a different number anywhere in the column, the sum is updated as soon as you click in the last column cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U" oldref="11">Similarly, you can also quickly calculate the sum of a row of numbers.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate.xhp#calculate"/>
+      <embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
+      <embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
+      <embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intext.xhp b/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
index 09df09cbf5..8dee9d598c 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate_intext.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,49 +27,47 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculate_intextxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating Complex Formulas in Text Documents</title>
-<filename>/text/swriter/guide/calculate_intext.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-16T10:09:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3147406"><bookmark_value>calculating;complex formulas in text</bookmark_value>
-<bookmark_value>formulas; complex formulas in text</bookmark_value>
-<bookmark_value>calculating;mean values</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3147406" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="calculate_intext"><link href="text/swriter/guide/calculate_intext.xhp" name="Calculating Complex Formulas in Text Documents">Calculating Complex Formulas in Text Documents</link>
+      <topic id="textswriterguidecalculate_intextxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating Complex Formulas in Text Documents</title>
+         <filename>/text/swriter/guide/calculate_intext.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3147406"><bookmark_value>formulas; complex formulas in text</bookmark_value>
+      <bookmark_value>calculating;formulas/mean values</bookmark_value>
+</bookmark><comment>mw reduced "calculating;"  entries to one entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3147406" role="heading" level="1" l10n="U"
+                 oldref="20"><variable id="calculate_intext"><link href="text/swriter/guide/calculate_intext.xhp" name="Calculating Complex Formulas in Text Documents">Calculating Complex Formulas in Text Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="25">You can use predefined functions in a formula, and then insert the result of the calculation into a text document.</paragraph>
-<paragraph role="paragraph" id="par_id3152901" xml-lang="en-US" l10n="U" oldref="26">For example, to calculate the mean value of three numbers, do the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145078" xml-lang="en-US" l10n="U" oldref="27">Click in the document where you want to insert the formula, and then press F2.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="28">Click the <emph>Formula </emph>icon, and choose "Mean" from the Statistical Functions list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="30">Type the three numbers, separated by vertical slashes (|).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="32">Press <emph>Enter</emph>. The result is inserted as a field into the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149823" xml-lang="en-US" l10n="U" oldref="35">To edit the formula, double-click the field in the document.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate.xhp#calculate"/>
-<embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
-<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
-<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145245" role="paragraph" l10n="U" oldref="25">You can use predefined functions in a formula, and then insert the result of the calculation into a text document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152901" role="paragraph" l10n="U" oldref="26">For example, to calculate the mean value of three numbers, do the following:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145078" role="listitem" l10n="U" oldref="27">Click in the document where you want to insert the formula, and then press F2.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156382" role="listitem" l10n="U" oldref="28">Click the <item type="menuitem">Formula</item>
+               <emph/>icon, and choose "Mean" from the Statistical Functions list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149692" role="listitem" l10n="U" oldref="30">Type the three numbers, separated by vertical slashes (|).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149481" role="listitem" l10n="U" oldref="32">Press <emph>Enter</emph>. The result is inserted as a field into the document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149823" role="paragraph" l10n="U" oldref="35">To edit the formula, double-click the field in the document.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate.xhp#calculate"/>
+      <embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
+      <embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
+      <embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
index b325e85e8a..0f03ffaa39 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate_intext2.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,53 +29,49 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculate_intext2xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Displaying the Result of a Table Calculation in a Different Table</title>
-<filename>/text/swriter/guide/calculate_intext2.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T12:26:01">UFI: fixed #i30737#
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidecalculate_intext2xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Displaying the Result of a Table Calculation in a Different Table</title>
+         <filename>/text/swriter/guide/calculate_intext2.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153899"><bookmark_value>calculating;in text tables</bookmark_value>
-<bookmark_value>tables; performing calculations in</bookmark_value>
+      <bookmark_value>tables; performing calculations in</bookmark_value>
 </bookmark><comment>MW reduced "text tables;" to "tables;"</comment>
-<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="49"><variable id="calculate_intext2"><link href="text/swriter/guide/calculate_intext2.xhp" name="Displaying the Result of a Table Calculation in a Different Table">Displaying the Result of a Table Calculation in a Different Table</link>
+<paragraph xml-lang="en-US" id="hd_id3153899" role="heading" level="1" l10n="U"
+                 oldref="49"><variable id="calculate_intext2"><link href="text/swriter/guide/calculate_intext2.xhp" name="Displaying the Result of a Table Calculation in a Different Table">Displaying the Result of a Table Calculation in a Different Table</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154250" xml-lang="en-US" l10n="U" oldref="6">You can perform a calculation on cells in one table and display the result in a different table.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150508" xml-lang="en-US" l10n="U" oldref="26">Open a text document, insert a table with multiple columns and rows, and then insert another table consisting of one cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150528" xml-lang="en-US" l10n="U" oldref="50">Enter numbers into some of the cells of the large table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155532" xml-lang="en-US" l10n="U" oldref="29">Place the cursor in the table with the single cell, and then press F2.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155551" xml-lang="en-US" l10n="U" oldref="30">In the <emph>Formula Bar</emph>, enter the function that you want to perform, for example, "=SUM".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="31">Click in a cell in the larger table that contains a number, press the plus sign (+), and then click in a different cell containing a number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155598" xml-lang="en-US" l10n="U" oldref="32">Press <emph>Enter</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3147776" xml-lang="en-US" l10n="CHG" oldref="51">If you want, you can format the table to behave as normal text. Insert the table into a frame, and then anchor the frame as a character. The frame remains anchored to the adjacent text when you insert or delete text.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate.xhp#calculate"/>
-<embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
-<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
-<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154250" role="paragraph" l10n="U" oldref="6">You can perform a calculation on cells in one table and display the result in a different table.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150508" role="listitem" l10n="U" oldref="26">Open a text document, insert a table with multiple columns and rows, and then insert another table consisting of one cell.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150528" role="listitem" l10n="U" oldref="50">Enter numbers into some of the cells of the large table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155532" role="listitem" l10n="U" oldref="29">Place the cursor in the table with the single cell, and then press F2.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155551" role="listitem" l10n="U" oldref="30">In the <item type="menuitem">Formula Bar</item>, enter the function that you want to perform, for example, <item type="literal">=SUM</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155577" role="listitem" l10n="U" oldref="31">Click in a cell in the larger table that contains a number, press the plus sign (+), and then click in a different cell containing a number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155598" role="listitem" l10n="U" oldref="32">Press <emph>Enter</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147776" role="note" l10n="CHG" oldref="51">If you want, you can format the table to behave as normal text. Insert the table into a frame, and then anchor the frame as a character. The frame remains anchored to the adjacent text when you insert or delete text.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate.xhp#calculate"/>
+      <embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
+      <embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
+      <embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp b/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
index b271638863..fb7557d82d 100755
--- a/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: calculate_multitable.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,50 +29,47 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidecalculate_multitablexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculating Across Tables</title>
-<filename>/text/swriter/guide/calculate_multitable.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:15:46">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidecalculate_multitablexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Calculating Across Tables</title>
+         <filename>/text/swriter/guide/calculate_multitable.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154248"><bookmark_value>calculating; across multiple text tables</bookmark_value>
-<bookmark_value>tables;calculating across</bookmark_value>
+      <bookmark_value>tables;calculating across</bookmark_value>
 </bookmark><comment>mw changed "text tables;" to "tables;"</comment>
-<paragraph role="heading" id="hd_id3154248" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="calculate_multitable"><link href="text/swriter/guide/calculate_multitable.xhp" name="Calculating Across Tables">Calculating Across Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3154248" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="calculate_multitable"><link href="text/swriter/guide/calculate_multitable.xhp" name="Calculating Across Tables">Calculating Across Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147773" xml-lang="en-US" l10n="U" oldref="12">You can perform calculations that span across more than one table in a text document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147795" xml-lang="en-US" l10n="U" oldref="13">Open a text document, insert two tables, and type numbers in a few cells in both tables.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147815" xml-lang="en-US" l10n="U" oldref="14">Place your cursor in an empty cell in one of the tables.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147833" xml-lang="en-US" l10n="U" oldref="16">Press F2.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Formula Bar</emph>, enter the function that you want to perform, for example, "=SUM".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147254" xml-lang="en-US" l10n="U" oldref="18">Click in a cell containing a number, press the plus sign (+), and then click in a different cell containing a number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147274" xml-lang="en-US" l10n="U" oldref="19">Press <emph>Enter</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/main0214.xhp#releistename"/>
-<embed href="text/swriter/guide/calculate.xhp#calculate"/>
-<embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
-<embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
-<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3147773" role="paragraph" l10n="U" oldref="12">You can perform calculations that span across more than one table in a text document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147795" role="listitem" l10n="U" oldref="13">Open a text document, insert two tables, and type numbers in a few cells in both tables.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147815" role="listitem" l10n="U" oldref="14">Place your cursor in an empty cell in one of the tables.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147833" role="listitem" l10n="U" oldref="16">Press F2.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147228" role="listitem" l10n="U" oldref="17">In the <item type="menuitem">Formula Bar</item>, enter the function that you want to perform, for example, <item type="literal">=SUM</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147254" role="listitem" l10n="U" oldref="18">Click in a cell containing a number, press the plus sign (+), and then click in a different cell containing a number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147274" role="listitem" l10n="U" oldref="19">Press <emph>Enter</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/main0214.xhp#releistename"/>
+      <embed href="text/swriter/guide/calculate.xhp#calculate"/>
+      <embed href="text/swriter/guide/calculate_intext.xhp#calculate_intext"/>
+      <embed href="text/swriter/guide/calculate_clipboard.xhp#calculate_clipboard"/>
+      <embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/captions.xhp b/helpcontent2/source/text/swriter/guide/captions.xhp
index 1e15da0ea0..6a3e08b500 100644
--- a/helpcontent2/source/text/swriter/guide/captions.xhp
+++ b/helpcontent2/source/text/swriter/guide/captions.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: captions.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,60 +29,58 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidecaptionsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Using Captions </title>
-<filename>/text/swriter/guide/captions.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidecaptionsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using Captions </title>
+         <filename>/text/swriter/guide/captions.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147691"><bookmark_value>inserting; captions</bookmark_value>
-<bookmark_value>captions; inserting and editing</bookmark_value>
-<bookmark_value>editing;captions</bookmark_value>
-<bookmark_value>objects; captioning</bookmark_value>
-<bookmark_value>tables; labeling</bookmark_value>
-<bookmark_value>frames; labeling</bookmark_value>
-<bookmark_value>charts; labeling</bookmark_value>
-<bookmark_value>text frames; labeling</bookmark_value>
-<bookmark_value>draw objects; inserting captions</bookmark_value>
-<bookmark_value>legends, see also captions</bookmark_value>
-</bookmark>
-  <comment>mw deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="par_id3147691" role="paragraph" l10n="E" oldref="21" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3150537" role="heading" level="1" l10n="U" oldref="39"><variable id="captions"><link href="text/swriter/guide/captions.xhp" name="Using Captions">Using Captions</link> 
+      <bookmark_value>captions; inserting and editing</bookmark_value>
+      <bookmark_value>editing;captions</bookmark_value>
+      <bookmark_value>objects; captioning</bookmark_value>
+      <bookmark_value>tables; labeling</bookmark_value>
+      <bookmark_value>frames; labeling</bookmark_value>
+      <bookmark_value>charts; labeling</bookmark_value>
+      <bookmark_value>text frames; labeling</bookmark_value>
+      <bookmark_value>draw objects; inserting captions</bookmark_value>
+      <bookmark_value>legends, see also captions</bookmark_value>
+</bookmark><comment>mw deleted "adding;"</comment>
+<paragraph xml-lang="en-US" id="par_id3147691" role="paragraph" l10n="E" oldref="21"
+                 localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id3150537" role="heading" level="1" l10n="U"
+                 oldref="39"><variable id="captions"><link href="text/swriter/guide/captions.xhp" name="Using Captions">Using Captions</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153156" role="paragraph" l10n="CHG" oldref="22">In text documents, you can add continuously numbered captions to graphics, tables, frames, and drawing objects.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153172" role="paragraph" l10n="CHG" oldref="36">You can edit the text and the number ranges for different types of captions.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153186" role="note" l10n="CHG" oldref="37">When you add a caption to a picture or to an object, the object and the caption text are placed together in a new frame. When you add a caption to a table, the caption text is inserted as a paragraph next to the table. When you add a caption to a frame, the caption text is added to the text inside the frame, either before or after the existing text.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10713" role="tip" l10n="NEW">To move both the object and the caption, drag the frame that contains these items. To update the caption numbering after you move the frame, press F9.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3155541" role="heading" level="2" l10n="U" oldref="23">Defining Captions</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155567" role="listitem" l10n="U" oldref="24">Select the item that you want to add a caption to.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="25">Choose <emph>Insert - Caption</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147765" role="listitem" l10n="U" oldref="26">Select the options that you want, and then click <emph>OK</emph>. If you want, you can also enter different text in the <emph>Category </emph>box, for example "Figure".</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3147254" role="note" l10n="U" oldref="27">You can edit caption text directly in the document.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3147271" role="paragraph" l10n="U" oldref="28">A caption is formatted with the paragraph style that matches the name of the caption <emph>Category</emph>. For example, if you insert a "Table" caption, the "Table" paragraph style is applied to the caption text.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145671" role="tip" l10n="CHG" oldref="45">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
-  <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-  <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-  <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-  <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-  <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-  <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153156" role="paragraph" l10n="CHG" oldref="22">In text documents, you can add continuously numbered captions to graphics, tables, frames, and drawing objects.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153172" role="paragraph" l10n="CHG" oldref="36">You can edit the text and the number ranges for different types of captions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153186" role="note" l10n="CHG" oldref="37">When you add a caption to a picture or to an object, the object and the caption text are placed together in a new frame. When you add a caption to a table, the caption text is inserted as a paragraph next to the table. When you add a caption to a frame, the caption text is added to the text inside the frame, either before or after the existing text.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10713" role="tip" l10n="NEW">To move both the object and the caption, drag the frame that contains these items. To update the caption numbering after you move the frame, press F9.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155541" role="paragraph" l10n="U" oldref="23">To define a caption proceed as follows:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155567" role="listitem" l10n="U" oldref="24">Select the item that you want to add a caption to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="25">Choose <emph>Insert - Caption</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147765" role="listitem" l10n="U" oldref="26">Select the options that you want, and then click <item type="menuitem">OK</item>. If you want, you can also enter different text in the <item type="menuitem">Category</item>
+               <emph/>box, for example <item type="literal">Figure</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147254" role="note" l10n="U" oldref="27">You can edit caption text directly in the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147271" role="paragraph" l10n="U" oldref="28">A caption is formatted with the paragraph style that matches the name of the caption category. For example, if you insert a "Table" caption, the "Table" paragraph style is applied to the caption text.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145671" role="tip" l10n="CHG" oldref="45">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+      <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+      <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+      <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+      <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/captions_numbers.xhp b/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
index dd083fb563..2917ae4447 100644
--- a/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
+++ b/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: captions_numbers.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,61 +29,60 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidecaptions_numbersxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Chapter Numbers to Captions</title>
-<filename>/text/swriter/guide/captions_numbers.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidecaptions_numbersxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Chapter Numbers to Captions</title>
+         <filename>/text/swriter/guide/captions_numbers.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147684"><bookmark_value>captions; adding chapter numbers</bookmark_value>
-<bookmark_value>objects; captioning automatically</bookmark_value>
-<bookmark_value>numbering; captions</bookmark_value>
-<bookmark_value>automatic numbering;of objects</bookmark_value>
-<bookmark_value>chapter numbers in captions</bookmark_value>
-<bookmark_value>inserting;chapter numbers in captions</bookmark_value>
-</bookmark>
-  <comment>MW changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3147684" role="heading" level="1" l10n="U" oldref="14"><variable id="captions_numbers"><link href="text/swriter/guide/captions_numbers.xhp" name="Adding Chapter Numbers to Captions">Adding Chapter Numbers to Captions</link> 
+      <bookmark_value>objects; captioning automatically</bookmark_value>
+      <bookmark_value>numbering; captions</bookmark_value>
+      <bookmark_value>automatic numbering;of objects</bookmark_value>
+      <bookmark_value>chapter numbers in captions</bookmark_value>
+      <bookmark_value>inserting;chapter numbers in captions</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147684" role="heading" level="1" l10n="U"
+                 oldref="14"><variable id="captions_numbers"><link href="text/swriter/guide/captions_numbers.xhp" name="Adding Chapter Numbers to Captions">Adding Chapter Numbers to Captions</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3147395" role="paragraph" l10n="U" oldref="15">You can include chapter numbers in captions.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3147408" role="paragraph" l10n="U" oldref="16">Ensure that the text in your document is organized by chapters, and that the chapter titles and, if you want, the section titles, use one of the predefined heading paragraph styles. You must also assign a numbering option to the heading paragraph styles.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154249" role="listitem" l10n="U" oldref="17">Select the item that you want to add a caption to.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150503" role="listitem" l10n="U" oldref="18">Choose <emph>Insert - Caption</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150527" role="listitem" l10n="U" oldref="19">Select a caption title from the <emph>Category </emph>box, and select a numbering style in the <emph>Numbering </emph>box. You also can enter a caption text in this dialog. If you want, enter text in the <emph>Caption </emph>box.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153166" role="listitem" l10n="U" oldref="39">Click <emph>Options</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153190" role="listitem" l10n="U" oldref="45">In the <emph>Level </emph>box, select the number of heading levels to include in the chapter number.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155553" role="listitem" l10n="U" oldref="46">Type the character that you want to separate the chapter number(s) from the caption number in the<emph> Separator</emph> box, and then click <emph>OK</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="40">In the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U" oldref="43">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
-  <section id="relatedtopics">
-   
-   <embed href="text/swriter/guide/captions.xhp#captions"/>
-   <paragraph xml-lang="en-US" id="par_id3145567" role="paragraph" l10n="CHG"><link href="text/shared/optionen/01041100.xhp" name="Caption dialog">AutoCaption dialog</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3145574" role="paragraph" l10n="C"><link href="text/swriter/guide/chapter_numbering.xhp" name="Chapter numbering">Chapter numbering</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3147395" role="paragraph" l10n="U" oldref="15">You can include chapter numbers in captions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147408" role="paragraph" l10n="U" oldref="16">Ensure that the text in your document is organized by chapters, and that the chapter titles and, if you want, the section titles, use one of the predefined heading paragraph styles. You must also assign a numbering option to the heading paragraph styles.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154249" role="listitem" l10n="U" oldref="17">Select the item that you want to add a caption to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150503" role="listitem" l10n="U" oldref="18">Choose <emph>Insert - Caption</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150527" role="listitem" l10n="U" oldref="19">Select a caption title from the <item type="menuitem">Category</item>
+               <emph/>box, and select a numbering style in the <item type="menuitem">Numbering</item>
+               <emph/>box. <br/>You also can enter a caption text in this dialog. If you want, enter text in the <item type="menuitem">Caption</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153166" role="listitem" l10n="U" oldref="39">Click <emph>Options</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153190" role="listitem" l10n="U" oldref="45">In the <item type="menuitem">Level</item>
+               <emph/>box, select the number of heading levels to include in the chapter number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155553" role="listitem" l10n="U" oldref="46">Type the character that you want to separate the chapter number(s) from the caption number in the<emph/>
+               <item type="menuitem">Separator</item> box, and then click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="40">In the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U" oldref="43">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/captions.xhp#captions"/>
+         <paragraph xml-lang="en-US" id="par_id3145567" role="paragraph" l10n="CHG"><link href="text/shared/optionen/01041100.xhp" name="Caption dialog">AutoCaption dialog</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145574" role="paragraph" l10n="C"><link href="text/swriter/guide/chapter_numbering.xhp" name="Chapter numbering">Chapter numbering</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/change_header.xhp b/helpcontent2/source/text/swriter/guide/change_header.xhp
index 202675cfce..9a3b24af7e 100755
--- a/helpcontent2/source/text/swriter/guide/change_header.xhp
+++ b/helpcontent2/source/text/swriter/guide/change_header.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: change_header.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,62 +29,62 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidechange_headerxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating a Page Style Based on the Current Page</title>
-<filename>/text/swriter/guide/change_header.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T14:51:43">FPE: Screenshot deleted</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidechange_headerxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating a Page Style Based on the Current Page</title>
+         <filename>/text/swriter/guide/change_header.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146875"><bookmark_value>headers; inserting</bookmark_value>
-<bookmark_value>footers; inserting</bookmark_value>
-<bookmark_value>page styles; changing from selection</bookmark_value>
-<bookmark_value>new page styles from selection</bookmark_value>
+      <bookmark_value>footers; inserting</bookmark_value>
+      <bookmark_value>page styles; changing from selection</bookmark_value>
+      <bookmark_value>new page styles from selection</bookmark_value>
 </bookmark><comment>mw deleted "creating;"</comment>
-<paragraph role="heading" id="hd_id3146875" xml-lang="en-US" level="1" l10n="U" oldref="21"><variable id="change_header"><link href="text/swriter/guide/change_header.xhp" name="Creating a Page Style Based on the Current Page">Creating a Page Style Based on the Current Page</link>
+<paragraph xml-lang="en-US" id="hd_id3146875" role="heading" level="1" l10n="U"
+                 oldref="21"><variable id="change_header"><link href="text/swriter/guide/change_header.xhp" name="Creating a Page Style Based on the Current Page">Creating a Page Style Based on the Current Page</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153584" xml-lang="en-US" l10n="U" oldref="22">You can design a page layout and then create a page style based on it.</paragraph>
-<paragraph role="paragraph" id="par_id3154245" xml-lang="en-US" l10n="U" oldref="24">For example, you can create a page style that displays a particular header, and another page style that displays a different header.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="26">Open a new text document, choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Page Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150532" xml-lang="en-US" l10n="CHG" oldref="27">Click the <emph>New Style from Selection</emph> icon and select <emph>New Styles from Selection</emph> from the submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153153" xml-lang="en-US" l10n="U" oldref="31">Type a name for the page in the <emph>Style name </emph>box, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153184" xml-lang="en-US" l10n="U" oldref="32">Double-click the name in the list to apply the style to the current page. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155541" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Insert - Header</emph>, and choose the new page style from the list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155572" xml-lang="en-US" l10n="U" oldref="34">Type the text that you want in the header. Position the cursor into the main text area outside of the header.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155592" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>Insert - Manual Break</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147771" xml-lang="en-US" l10n="U" oldref="28">In the <emph>Type </emph>area, select <emph>Page break</emph> and then select 'Default' from the <emph>Style </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147810" xml-lang="en-US" l10n="U" oldref="29">Repeat steps 2-6 to create a second custom <emph>Page Style</emph> with a different header.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153584" role="paragraph" l10n="U" oldref="22">You can design a page layout and then create a page style based on it.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154245" role="paragraph" l10n="U" oldref="24">For example, you can create a page style that displays a particular header, and another page style that displays a different header.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150503" role="listitem" l10n="U" oldref="26">Open a new text document, choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Page Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150532" role="listitem" l10n="CHG" oldref="27">Click the <emph>New Style from Selection</emph> icon and select <emph>New Styles from Selection</emph> from the submenu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153153" role="listitem" l10n="U" oldref="31">Type a name for the page in the <item type="menuitem">Style name</item>
+               <emph/>box, and then click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153184" role="listitem" l10n="U" oldref="32">Double-click the name in the list to apply the style to the current page. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155541" role="listitem" l10n="U" oldref="33">Choose <emph>Insert - Header</emph>, and choose the new page style from the list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155572" role="listitem" l10n="U" oldref="34">Type the text that you want in the header. Position the cursor into the main text area outside of the header.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155592" role="listitem" l10n="U" oldref="25">Choose <emph>Insert - Manual Break</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147771" role="listitem" l10n="U" oldref="28">In the <item type="menuitem">Type</item>
+               <emph/>area, select <item type="menuitem">Page break</item> and then select “Default” from the <item type="menuitem">Style</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147810" role="listitem" l10n="U" oldref="29">Repeat steps 2-6 to create a second custom page style with a different header.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+      <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/chapter_numbering.xhp b/helpcontent2/source/text/swriter/guide/chapter_numbering.xhp
index 4f66d399b9..4df7afcbef 100644
--- a/helpcontent2/source/text/swriter/guide/chapter_numbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/chapter_numbering.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chapter_numbering.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,62 +29,71 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidechapter_numberingxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Outline Numbering</title>
-<filename>/text/swriter/guide/chapter_numbering.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidechapter_numberingxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Outline Numbering</title>
+         <filename>/text/swriter/guide/chapter_numbering.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147682"><bookmark_value>outlines;numbering</bookmark_value>
-<bookmark_value>deleting;heading numbers</bookmark_value>
-<bookmark_value>chapter numbering</bookmark_value>
-<bookmark_value>headings; numbering</bookmark_value>
-<bookmark_value>numbering;headings</bookmark_value>
-<bookmark_value>headings; own paragraph styles</bookmark_value>
-</bookmark><comment>MW changed "removing;..." to "deleting;..." and made "outline numbering" a two level entry</comment><paragraph role="heading" id="hd_id3147682" xml-lang="en-US" level="1" l10n="U" oldref="22"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp" name="Outline Numbering">Outline Numbering</link>
+      <bookmark_value>deleting;heading numbers</bookmark_value>
+      <bookmark_value>chapter numbering</bookmark_value>
+      <bookmark_value>headings; numbering/paragraph styles</bookmark_value>
+      <bookmark_value>numbering;headings</bookmark_value>
+</bookmark><comment>MW changed "removing;..." to "deleting;..." and made "outline numbering" a two level entry</comment><comment>mw reduced two  "headings;" bookmarks to one entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3147682" role="heading" level="1" l10n="U"
+                 oldref="22"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp" name="Outline Numbering">Outline Numbering</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155605" xml-lang="en-US" l10n="CHG" oldref="23">You can modify the heading hierarchy or assign a level in the hierarchy to a custom paragraph style. You can also add chapter and section numbering to heading paragraph styles. By default, the "Heading 1" paragraph style is at the top of the outline hierarchy.</paragraph>
-<paragraph role="heading" id="hd_id3155626" xml-lang="en-US" level="2" l10n="U" oldref="35">To add automatic numbering to a heading style:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>Tools - Outline Numbering</emph>, and then click the <emph>Numbering </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155891" xml-lang="en-US" l10n="U" oldref="37">In the <emph>Paragraph Style </emph>box, select the heading style that you want to add chapter numbers to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150513" xml-lang="en-US" l10n="U" oldref="25">In the<emph> Numbers</emph> box, select the numbering style that you want to use, and then click<emph> OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107CE" xml-lang="en-US" level="2" l10n="NEW">To remove automatic outline numbering from a heading paragraph:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107D5" xml-lang="en-US" l10n="NEW">Click at the beginning of the text in the heading paragraph, after the number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107D9" xml-lang="en-US" l10n="NEW">Press the <item type="keycode">Backspace</item> key to delete the number.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="2" l10n="U" oldref="26">To use a custom paragraph style as a heading:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155571" xml-lang="en-US" l10n="U" oldref="38">Choose <emph>Tools - Outline Numbering</emph>, and then click the <emph>Numbering </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147758" xml-lang="en-US" l10n="U" oldref="27">Select the custom style in the <emph>Paragraph Style</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147782" xml-lang="en-US" l10n="U" oldref="39">Click the heading level that you want to assign to the custom paragraph style in the<emph> Level</emph> list. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147808" xml-lang="en-US" l10n="U" oldref="28">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/insert_tab_innumbering.xhp#insert_tab_innumbering"/>
-<embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/><comment>mw inserted new link under "Related topics" and deleted "To rearrange the headings in a text document"</comment></body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph" l10n="CHG" oldref="23">You can modify the heading hierarchy or assign a level in the hierarchy to a custom paragraph style. You can also add chapter and section numbering to heading paragraph styles. By default, the "Heading 1" paragraph style is at the top of the outline hierarchy.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155626" role="heading" level="2" l10n="U"
+                 oldref="35">To Add Automatic Numbering to a Heading Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154255" role="listitem" l10n="U" oldref="36">Choose <item type="menuitem">Tools - Outline Numbering</item>, and then click the <item type="menuitem">Numbering</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155891" role="listitem" l10n="U" oldref="37">In the <item type="menuitem">Paragraph Style</item>
+               <emph/>box, select the heading style that you want to add chapter numbers to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150513" role="listitem" l10n="U" oldref="25">In the<emph/>
+               <item type="menuitem">Numbers</item> box, select the numbering style that you want to use, and then click<emph/>
+               <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107CE" role="heading" level="2" l10n="NEW">To Remove Automatic Outline Numbering From a Heading Paragraph</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107D5" role="listitem" l10n="NEW">Click at the beginning of the text in the heading paragraph, after the number.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107D9" role="listitem" l10n="NEW">Press the <item type="keycode">Backspace</item> key to delete the number.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155552" role="heading" level="2" l10n="U"
+                 oldref="26">To Use a Custom Paragraph Style as a Heading</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155571" role="listitem" l10n="U" oldref="38">Choose <item type="menuitem">Tools - Outline Numbering</item>, and then click the <item type="menuitem">Numbering</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147758" role="listitem" l10n="U" oldref="27">Select the custom style in the <emph>Paragraph Style</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147782" role="listitem" l10n="U" oldref="39">Click the heading level that you want to assign to the custom paragraph style in the<emph/>
+               <item type="menuitem">Level</item> list. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147808" role="listitem" l10n="U" oldref="28">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/insert_tab_innumbering.xhp#insert_tab_innumbering"/>
+      <embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/><comment>mw inserted new link under "Related topics" and deleted "To rearrange the headings in a text document"</comment>
+</body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/conditional_text.xhp b/helpcontent2/source/text/swriter/guide/conditional_text.xhp
index 3a747f6904..b0ac4ba8f0 100644
--- a/helpcontent2/source/text/swriter/guide/conditional_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/conditional_text.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conditional_text.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,94 +29,96 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideconditional_textxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Conditional Text</title>
-<filename>/text/swriter/guide/conditional_text.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-29T10:07:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideconditional_textxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Conditional Text</title>
+         <filename>/text/swriter/guide/conditional_text.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155619"><bookmark_value>matching conditional text in fields</bookmark_value>
-<bookmark_value>if-then queries as fields</bookmark_value>
-<bookmark_value>conditional text; setting up</bookmark_value>
-<bookmark_value>text; conditional text</bookmark_value>
-<bookmark_value>defining;conditions</bookmark_value>
+      <bookmark_value>if-then queries as fields</bookmark_value>
+      <bookmark_value>conditional text; setting up</bookmark_value>
+      <bookmark_value>text; conditional text</bookmark_value>
+      <bookmark_value>defining;conditions</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155619" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="conditional_text"><link href="text/swriter/guide/conditional_text.xhp" name="Conditional Text">Conditional Text</link>
+<paragraph xml-lang="en-US" id="hd_id3155619" role="heading" level="1" l10n="U" oldref="4"><variable id="conditional_text"><link href="text/swriter/guide/conditional_text.xhp" name="Conditional Text">Conditional Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155879" xml-lang="en-US" l10n="U" oldref="5">You can set up fields in your document that display text when a condition that you define is met. For example, you can define the conditional text that is displayed in a series of reminder letters.</paragraph>
-<paragraph role="paragraph" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="6">Setting up conditional text in this example is a two-part process. First you create a variable, and then you create the condition.</paragraph>
-<paragraph role="heading" id="hd_id3153175" xml-lang="en-US" level="2" l10n="U" oldref="61">To define a conditional variable:</paragraph>
-<paragraph role="paragraph" id="par_id3153185" xml-lang="en-US" l10n="U" oldref="62">The first part of the example is to define a variable for the condition statement. </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155566" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Insert -</emph>
-<emph>Fields - Other</emph>, and then click the <emph>Variables</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147759" xml-lang="en-US" l10n="U" oldref="9">Click "Set variable" in the <emph>Type </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147784" xml-lang="en-US" l10n="U" oldref="10">Type a name for the variable in the <emph>Name</emph> box, for example "Reminder".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147810" xml-lang="en-US" l10n="U" oldref="57">Click "Text" in the<emph> Format</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145614" xml-lang="en-US" l10n="U" oldref="11">Enter "1" in the <emph>Value</emph> box, and then click <emph>Insert</emph>.</paragraph>
-<paragraph role="listitem" id="par_idN1083F" xml-lang="en-US" l10n="NEW">The Format list displays a "General" format after you click Insert.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145645" xml-lang="en-US" level="2" l10n="U" oldref="63">To define a condition and the conditional text</paragraph>
-<paragraph role="paragraph" id="par_id3145659" xml-lang="en-US" l10n="U" oldref="64">The second part of the example is to define the condition that must be met, and to insert a placeholder for displaying the conditional text in your document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151193" xml-lang="en-US" l10n="U" oldref="12">Place the cursor where you want to insert the conditional text in your text.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151212" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Insert -</emph>
-<emph>Fields - Other</emph>, and then click the <emph>Functions</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="13">Click "Conditional text" in the <emph>Type </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155936" xml-lang="en-US" l10n="U" oldref="14">Type <emph>Reminder EQ "3"</emph> in the <emph>Condition </emph>box. In other words, the conditional text will be displayed when the variable in the field that you defined in the first part of this example is equal to three.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155969" xml-lang="en-US" l10n="U" oldref="15">The quotation marks enclosing the "3" indicate that the variable that you defined in the first part of this example is a text string.</paragraph>
-<list type="ordered" startwith="5">
-<listitem>
-<paragraph role="listitem" id="par_id3150446" xml-lang="en-US" l10n="U" oldref="16">Type the text that you want to display when the condition is met in the <emph>Then</emph> box. There is almost no limit to the length of the text that you can enter. You can paste a paragraph into this box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150473" xml-lang="en-US" l10n="U" oldref="17">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155073" xml-lang="en-US" level="2" l10n="U" oldref="66">To display the conditional text:</paragraph>
-<paragraph role="paragraph" id="par_id3155086" xml-lang="en-US" l10n="U" oldref="67">In this example, the conditional text is displayed when the value of the conditional variable is equal to 3.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155110" xml-lang="en-US" l10n="U" oldref="19">Place your cursor in front of the field that you defined in the first part of this example, and then choose <emph>Edit - Fields</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="68">Replace the number in the <emph>Value </emph>box with 3, and then click<emph> Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155168" xml-lang="en-US" l10n="U" oldref="20">If the field does not automatically update, press F9.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
-<embed href="text/swriter/guide/conditional_text2.xhp#conditional_text2"/>
-<embed href="text/swriter/01/04090200.xhp#defining_conditions"/>
-<paragraph role="paragraph" id="par_id3145714" xml-lang="en-US" l10n="C"><link href="text/swriter/02/14020000.xhp" name="List of conditional operators">List of conditional operators</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155879" role="paragraph" l10n="U" oldref="5">You can set up fields in your document that display text when a condition that you define is met. For example, you can define the conditional text that is displayed in a series of reminder letters.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155895" role="paragraph" l10n="U" oldref="6">Setting up conditional text in this example is a two-part process. First you create a variable, and then you create the condition.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153175" role="heading" level="2" l10n="U"
+                 oldref="61">To Define a Conditional Variable</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153185" role="paragraph" l10n="U" oldref="62">The first part of the example is to define a variable for the condition statement. </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155566" role="listitem" l10n="U" oldref="8">Choose <item type="menuitem">Insert - Fields - Other</item>, and then click the <item type="menuitem">Variables</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147759" role="listitem" l10n="U" oldref="9">Click "Set variable" in the <item type="menuitem">Type</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147784" role="listitem" l10n="U" oldref="10">Type a name for the variable in the <item type="menuitem">Name</item> box, for example <item type="literal">Reminder</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147810" role="listitem" l10n="U" oldref="57">Click "Text" in the<emph/>
+               <item type="menuitem">Format</item> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7748344" role="listitem" l10n="NEW">Enter <item type="literal">1</item> in the <item type="menuitem">Value</item> box, and then click <item type="menuitem">Insert</item>.<br/>The Format list now displays a "General" format.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145645" role="heading" level="2" l10n="U"
+                 oldref="63">To Define a Condition and the Conditional Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145659" role="paragraph" l10n="U" oldref="64">The second part of the example is to define the condition that must be met, and to insert a placeholder for displaying the conditional text in your document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151193" role="listitem" l10n="U" oldref="12">Place the cursor where you want to insert the conditional text in your text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151212" role="listitem" l10n="U" oldref="65">Choose <item type="menuitem">Insert - Fields - Other</item>, and then click the <item type="menuitem">Functions</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151250" role="listitem" l10n="U" oldref="13">Click "Conditional text" in the <item type="menuitem">Type</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155936" role="listitem" l10n="U" oldref="14">Type <item type="literal">Reminder EQ "3"</item> in the <item type="menuitem">Condition</item>
+               <emph/>box. In other words, the conditional text will be displayed when the variable in the field that you defined in the first part of this example is equal to three.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155969" role="listitem" l10n="U" oldref="15">The quotation marks enclosing the "3" indicate that the variable that you defined in the first part of this example is a text string.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="5">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150446" role="listitem" l10n="U" oldref="16">Type the text that you want to display when the condition is met in the <emph>Then</emph> box. There is almost no limit to the length of the text that you can enter. You can paste a paragraph into this box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150473" role="listitem" l10n="U" oldref="17">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155073" role="heading" level="2" l10n="U"
+                 oldref="66">To Display the Conditional Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155086" role="paragraph" l10n="U" oldref="67">In this example, the conditional text is displayed when the value of the conditional variable is equal to 3.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155110" role="listitem" l10n="U" oldref="19">Place your cursor in front of the field that you defined in the first part of this example, and then choose <emph>Edit - Fields</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155136" role="listitem" l10n="U" oldref="68">Replace the number in the <item type="menuitem">Value</item>
+               <emph/>box with 3, and then click<emph/>
+               <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155168" role="listitem" l10n="U" oldref="20">If the field does not automatically update, press F9.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
+         <embed href="text/swriter/guide/conditional_text2.xhp#conditional_text2"/>
+         <embed href="text/swriter/01/04090200.xhp#defining_conditions"/>
+         <paragraph xml-lang="en-US" id="par_id3145714" role="paragraph" l10n="C"><link href="text/swriter/02/14020000.xhp" name="List of conditional operators">List of conditional operators</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/conditional_text2.xhp b/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
index c8f2907c0b..cc544171f5 100755
--- a/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
+++ b/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conditional_text2.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,54 +29,51 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideconditional_text2xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Conditional Text for Page Counts</title>
-<filename>/text/swriter/guide/conditional_text2.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-29T10:07:48">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideconditional_text2xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Conditional Text for Page Counts</title>
+         <filename>/text/swriter/guide/conditional_text2.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153108"><bookmark_value>page counts</bookmark_value>
-<bookmark_value>conditional text;page counts</bookmark_value>
+      <bookmark_value>conditional text;page counts</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153108" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="conditional_text2"><link href="text/swriter/guide/conditional_text2.xhp" name="Conditional Text for Page Counts">Conditional Text for Page Counts</link>
+<paragraph xml-lang="en-US" id="hd_id3153108" role="heading" level="1" l10n="U" oldref="1"><variable id="conditional_text2"><link href="text/swriter/guide/conditional_text2.xhp" name="Conditional Text for Page Counts">Conditional Text for Page Counts</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156228" xml-lang="en-US" l10n="U" oldref="3">You can create a conditional text field that displays the word "pages" instead of "page" in conjunction with a page count field if your document contains more than one page.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156257" xml-lang="en-US" l10n="U" oldref="4">Place the cursor in your document where you want to insert the page count.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150513" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Insert - Field - Page Count</emph>, and then enter a space.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>Insert - Field - Other</emph>, and then click the <emph>Functions</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153166" xml-lang="en-US" l10n="U" oldref="9">Click "Conditional text" in the <emph>Type </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="7">Type "Page &gt; 1" in the <emph>Condition</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145280" xml-lang="en-US" l10n="U" oldref="10">Type "Pages" in the <emph>Then</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145305" xml-lang="en-US" l10n="U" oldref="11">Type "Page" in the <emph>Otherwise</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="8">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
-<embed href="text/swriter/01/04090200.xhp#defining_conditions"/>
-<embed href="text/swriter/guide/fields.xhp#fields"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3156228" role="paragraph" l10n="U" oldref="3">You can create a conditional text field that displays the word "pages" instead of "page" in conjunction with a page count field if your document contains more than one page.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156257" role="listitem" l10n="U" oldref="4">Place the cursor in your document where you want to insert the page count.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150513" role="listitem" l10n="U" oldref="5">Choose <item type="menuitem">Insert - Fields - Page Count</item>, and then enter a space.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150537" role="listitem" l10n="U" oldref="6">Choose <item type="menuitem">Insert - Fields - Other</item>, and then click the <item type="menuitem">Functions</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153166" role="listitem" l10n="U" oldref="9">Click "Conditional text" in the <item type="menuitem">Type</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145256" role="listitem" l10n="U" oldref="7">Type <item type="literal">Page &gt; 1</item> in the <item type="menuitem">Condition</item> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145280" role="listitem" l10n="U" oldref="10">Type <item type="literal">Pages</item> in the <item type="menuitem">Then</item> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145305" role="listitem" l10n="U" oldref="11">Type <item type="literal">Page</item> in the <item type="menuitem">Else</item> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155535" role="listitem" l10n="U" oldref="8">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
+      <embed href="text/swriter/01/04090200.xhp#defining_conditions"/>
+      <embed href="text/swriter/guide/fields.xhp#fields"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
index eaffb4defa..4e66700b57 100755
--- a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
+++ b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: delete_from_dict.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,37 +29,35 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidedelete_from_dictxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Removing Words From a User-Defined Dictionary</title>
-<filename>/text/swriter/guide/delete_from_dict.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:57:10">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidedelete_from_dictxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Removing Words From a User-Defined Dictionary</title>
+         <filename>/text/swriter/guide/delete_from_dict.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147688"><bookmark_value>user-defined dictionaries; removing words from</bookmark_value>
-<bookmark_value>custom dictionaries; removing words from</bookmark_value>
-<bookmark_value>deleting;words in user-defined dictionaries</bookmark_value>
+      <bookmark_value>custom dictionaries; removing words from</bookmark_value>
+      <bookmark_value>deleting;words in user-defined dictionaries</bookmark_value>
 </bookmark><comment>MW changed "removing;..." to "deleting;..."</comment>
-<paragraph role="heading" id="hd_id3147688" xml-lang="en-US" level="1" l10n="U" oldref="13"><variable id="delete_from_dict"><link href="text/swriter/guide/delete_from_dict.xhp" name="Removing Words From a User-Defined Dictionary">Removing Words From a User-Defined Dictionary</link>
+<paragraph xml-lang="en-US" id="hd_id3147688" role="heading" level="1" l10n="U"
+                 oldref="13"><variable id="delete_from_dict"><link href="text/swriter/guide/delete_from_dict.xhp" name="Removing Words From a User-Defined Dictionary">Removing Words From a User-Defined Dictionary</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151391" xml-lang="en-US" l10n="U" oldref="16">Select the user-defined dictionary that you want to edit in the <emph>User-defined </emph>list, and then click <emph>Edit</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154233" xml-lang="en-US" l10n="U" oldref="17">Select the word that you want to delete in the <emph>Word</emph> list, and then click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153417" role="listitem" l10n="U" oldref="14">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151391" role="listitem" l10n="U" oldref="16">Select the user-defined dictionary that you want to edit in the <item type="menuitem">User-defined</item>
+               <emph/>list, and then click <item type="menuitem">Edit</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154233" role="listitem" l10n="U" oldref="17">Select the word that you want to delete in the <emph>Word</emph> list, and then click <emph>Delete</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/dragdroptext.xhp b/helpcontent2/source/text/swriter/guide/dragdroptext.xhp
index 3c1b51883c..2b55e1eb02 100644
--- a/helpcontent2/source/text/swriter/guide/dragdroptext.xhp
+++ b/helpcontent2/source/text/swriter/guide/dragdroptext.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragdroptext.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,59 +27,47 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidedragdroptextxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Moving and Copying Text in Documents</title>
-<filename>/text/swriter/guide/dragdroptext.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-18T11:29:30">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155919"><bookmark_value>text sections; moving and copying</bookmark_value>
-<bookmark_value>sections;moving and copying</bookmark_value>
-<bookmark_value>moving; text sections</bookmark_value>
-<bookmark_value>copying; text sections</bookmark_value>
-<bookmark_value>pasting;cut/copied text sections</bookmark_value>
-<bookmark_value>mouse;moving and copying text</bookmark_value>
-</bookmark><comment>mw added "pasting;"</comment>
-<paragraph role="heading" id="hd_id3155919" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="dragdroptext"><link href="text/swriter/guide/dragdroptext.xhp" name="Moving and Copying Text in Documents">Moving and Copying Text in Documents</link>
+      <topic id="textswriterguidedragdroptextxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Moving and Copying Text in Documents</title>
+         <filename>/text/swriter/guide/dragdroptext.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155919"><bookmark_value>sections;moving and copying</bookmark_value>
+      <bookmark_value>moving; text sections</bookmark_value>
+      <bookmark_value>copying; text sections</bookmark_value>
+      <bookmark_value>pasting;cut/copied text sections</bookmark_value>
+      <bookmark_value>mouse;moving and copying text</bookmark_value>
+</bookmark><comment>mw deleted "text sections;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155919" role="heading" level="1" l10n="U"
+                 oldref="10"><variable id="dragdroptext"><link href="text/swriter/guide/dragdroptext.xhp" name="Moving and Copying Text in Documents">Moving and Copying Text in Documents</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152994" xml-lang="en-US" l10n="U" oldref="11">Select the text that you want to move or copy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155606" xml-lang="en-US" l10n="U" oldref="21">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154236" xml-lang="en-US" l10n="U" oldref="13">To move the selected text, drag the text to a different location in the document and release. While you drag, the mouse pointer changes to include a gray box.</paragraph>
-<paragraph role="listitem" id="par_id3153142" xml-lang="en-US" l10n="E">
-<image id="img_id3153148" src="res/helpimg/movedata.png" width="8.47mm" height="8.47mm"><alt id="alt_id3153148" xml-lang="en-US">Mouse cursor moving data</alt>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152994" role="listitem" l10n="U" oldref="11">Select the text that you want to move or copy.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155606" role="listitem" l10n="U" oldref="21">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154236" role="listitem" l10n="U" oldref="13">To move the selected text, drag the text to a different location in the document and release. While you drag, the mouse pointer changes to include a gray box.<br/>
+<image id="img_id3153148" src="res/helpimg/movedata.png" width="0.3335in" height="0.3335in"><alt xml-lang="en-US" id="alt_id3153148">Mouse cursor moving data</alt>
 	</image></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154257" xml-lang="en-US" l10n="U" oldref="14">To copy the selected text, hold down <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you drag. The mouse pointer changes to include a plus sign (+).</paragraph>
-<paragraph role="listitem" id="par_id3152862" xml-lang="en-US" l10n="E">
-<image id="img_id3152868" src="res/helpimg/copydata.png" width="8.47mm" height="8.47mm"><alt id="alt_id3152868" xml-lang="en-US">Mouse cursor copying data</alt>
+            <paragraph xml-lang="en-US" id="par_id3154257" role="listitem" l10n="U" oldref="14">To copy the selected text, hold down <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you drag. The mouse pointer changes to include a plus sign (+).<br/>
+<image id="img_id3152868" src="res/helpimg/copydata.png" width="0.3335in" height="0.3335in"><alt xml-lang="en-US" id="alt_id3152868">Mouse cursor copying data</alt>
 	</image></paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
-<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
-<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
-<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
+         <embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
+         <embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
+         <embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+         <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
index 6608cdf0df..eb4ef58852 100644
--- a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: even_odd_sdw.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,91 +29,85 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideeven_odd_sdwxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Alternating Page Styles on Odd and Even Pages</title>
-<filename>/text/swriter/guide/even_odd_sdw.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-05T15:05:52">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideeven_odd_sdwxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Alternating Page Styles on Odd and Even Pages</title>
+         <filename>/text/swriter/guide/even_odd_sdw.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153407"><bookmark_value>page styles; left and right pages</bookmark_value>
-<bookmark_value>blank pages with alternating page styles</bookmark_value>
-<bookmark_value>empty page with alternating page styles</bookmark_value>
-<bookmark_value>pages; left and right pages</bookmark_value>
-<bookmark_value>formatting; even/odd pages</bookmark_value>
-<bookmark_value>title pages; page styles</bookmark_value>
-<bookmark_value>First Page page style</bookmark_value>
-<bookmark_value>Left Page page style</bookmark_value>
-<bookmark_value>right pages</bookmark_value>
-<bookmark_value>even/odd pages;formatting</bookmark_value>
+      <bookmark_value>blank pages with alternating page styles</bookmark_value>
+      <bookmark_value>empty page with alternating page styles</bookmark_value>
+      <bookmark_value>pages; left and right pages</bookmark_value>
+      <bookmark_value>formatting; even/odd pages</bookmark_value>
+      <bookmark_value>title pages; page styles</bookmark_value>
+      <bookmark_value>First Page page style</bookmark_value>
+      <bookmark_value>Left Page page style</bookmark_value>
+      <bookmark_value>right pages</bookmark_value>
+      <bookmark_value>even/odd pages;formatting</bookmark_value>
 </bookmark><comment>MW made "empty pages;..." and "blank pages;.." to one level entries.</comment>
-<paragraph role="heading" id="hd_id3153407" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="even_odd_sdw"><link href="text/swriter/guide/even_odd_sdw.xhp" name="Alternating Page Styles on Odd and Even Pages">Alternating Page Styles on Odd and Even Pages</link>
+<paragraph xml-lang="en-US" id="hd_id3153407" role="heading" level="1" l10n="U" oldref="1"><variable id="even_odd_sdw"><link href="text/swriter/guide/even_odd_sdw.xhp" name="Alternating Page Styles on Odd and Even Pages">Alternating Page Styles on Odd and Even Pages</link>
 </variable></paragraph>
-<table id="tbl_id3152897">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154265" xml-lang="en-US" l10n="E">
-<image id="img_id3155876" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155876" xml-lang="en-US">Icon</alt>
+      <table id="tbl_id3152897">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph" l10n="E">
+<image id="img_id3155876" src="res/commandimagelist/sc_designerdialog.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3155876">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically apply alternating page styles on even (left) and odd pages (right) in your document. For example, you can use page styles to display different headers and footers on even and odd pages. The current page style is displayed in the <emph>Status Bar</emph> at the bottom of the workplace.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147126" role="paragraph" l10n="U" oldref="2">$[officename] can automatically apply alternating page styles on even (left) and odd pages (right) in your document. For example, you can use page styles to display different headers and footers on even and odd pages. The current page style is displayed in the <emph>Status Bar</emph> at the bottom of the workplace.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150526" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Page Styles </emph>icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153153" xml-lang="en-US" l10n="U" oldref="6">In the list of page styles, right-click "Left Page" and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153179" xml-lang="en-US" l10n="U" oldref="8">Click the <emph>Organizer</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145267" xml-lang="en-US" l10n="U" oldref="17">Select "Right Page" in the <emph>Next Style</emph> box, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145299" xml-lang="en-US" l10n="U" oldref="9">In the list of page styles, right-click "Right Page" and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="18">Select "Left Page" in the <emph>Next Style</emph> box, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155561" xml-lang="en-US" l10n="U" oldref="10">Go to the first page in your document, and double-click "Right Page" in the list of page styles in the Styles and Formatting window.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155588" xml-lang="en-US" l10n="U" oldref="19">To add a header to one of the page styles, choose<emph> Insert - Header</emph>, and choose the page style that you want to add the header to. In the header frame, type the text that you want to use as the header.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147772" xml-lang="en-US" l10n="U" oldref="20">To add a footer to one of the page styles, choose<emph> Insert - Footer</emph>, and choose the page style that you want to add the footer to. In the footer frame, type the text that you want to use as a footer.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id3147254" xml-lang="en-US" l10n="CHG" oldref="12">If you do not want to have a header or a footer on the title page of your document, apply the "First Page" style to the title page.</paragraph>
-<paragraph role="head2" id="hd_id888698" xml-lang="en-US" l10n="NEW">Suppressing printout of empty pages</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW">If two even or two odd pages directly follow each other in your document, Writer will insert an empty page by default. You can suppress those automatically generated empty pages from printing and from exporting to PDF.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7594225" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8147221" xml-lang="en-US" l10n="NEW">Remove the check mark from <emph>Print automatically inserted blank pages</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/pagestyles.xhp#pagestyles"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<paragraph role="paragraph" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="13"><link href="text/swriter/01/04010000.xhp" name="Insert Break dialog">Insert Break dialog</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id8194219" role="heading" level="2" l10n="NEW">To Set Up Alternating Page Styles</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150526" role="listitem" l10n="U" oldref="4">Choose <item type="menuitem">Format - Styles and Formatting</item>, and then click the <item type="menuitem">Page Styles</item>
+               <emph/>icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153153" role="listitem" l10n="U" oldref="6">In the list of page styles, right-click "Left Page" and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153179" role="listitem" l10n="U" oldref="8">Click the <emph>Organizer</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145267" role="listitem" l10n="U" oldref="17">Select "Right Page" in the <emph>Next Style</emph> box, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145299" role="listitem" l10n="U" oldref="9">In the list of page styles, right-click "Right Page" and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155529" role="listitem" l10n="U" oldref="18">Select "Left Page" in the <emph>Next Style</emph> box, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155561" role="listitem" l10n="U" oldref="10">Go to the first page in your document, and double-click "Right Page" in the list of page styles in the Styles and Formatting window.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155588" role="paragraph" l10n="U" oldref="19">To add a header to one of the page styles, choose<emph/>
+         <item type="menuitem">Insert - Header</item>, and choose the page style that you want to add the header to. In the header frame, type the text that you want to use as the header.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147772" role="paragraph" l10n="U" oldref="20">To add a footer to one of the page styles, choose<emph/>
+         <item type="menuitem">Insert - Footer</item>, and choose the page style that you want to add the footer to. In the footer frame, type the text that you want to use as a footer.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147254" role="tip" l10n="CHG" oldref="12">If you do not want to have a header or a footer on the title page of your document, apply the "First Page" style to the title page.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="2" l10n="NEW">To Suppress the Printout of Empty Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">If two even or two odd pages directly follow each other in your document, Writer will insert an empty page by default. You can suppress those automatically generated empty pages from printing and from exporting to PDF.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">Remove the check mark from <emph>Print automatically inserted blank pages</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/pagestyles.xhp#pagestyles"/>
+         <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+         <paragraph xml-lang="en-US" id="par_id3145596" role="paragraph" l10n="U" oldref="13"><link href="text/swriter/01/04010000.xhp" name="Insert Break dialog">Insert Break dialog</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/field_convert.xhp b/helpcontent2/source/text/swriter/guide/field_convert.xhp
index c1d8ec0c61..e8fd92a383 100755
--- a/helpcontent2/source/text/swriter/guide/field_convert.xhp
+++ b/helpcontent2/source/text/swriter/guide/field_convert.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: field_convert.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,41 +27,40 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefield_convertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Converting a Field into Text</title>
-<filename>/text/swriter/guide/field_convert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-16T12:31:11">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefield_convertxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Converting a Field into Text</title>
+         <filename>/text/swriter/guide/field_convert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154079"><bookmark_value>fields; converting into text</bookmark_value>
-<bookmark_value>converting;fields, into text</bookmark_value>
-<bookmark_value>replacing;fields, by text</bookmark_value>
-<bookmark_value>changing;fields, into text</bookmark_value>
+      <bookmark_value>converting;fields, into text</bookmark_value>
+      <bookmark_value>replacing;fields, by text</bookmark_value>
+      <bookmark_value>changing;fields, into text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154079" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="field_convert"><link href="text/swriter/guide/field_convert.xhp" name="Converting a Field into Text">Converting a Field into Text</link>
+<paragraph xml-lang="en-US" id="hd_id3154079" role="heading" level="1" l10n="U" oldref="1"><variable id="field_convert"><link href="text/swriter/guide/field_convert.xhp" name="Converting a Field into Text">Converting a Field into Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149281" xml-lang="en-US" l10n="U" oldref="2">You can change a field to regular text, so that it is no longer updated. After you change a field to text, you cannot change the text back into a field.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="7">Select the field and choose <emph>Edit - Cut</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154238" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Edit - Paste Special</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="10">Click "Unformatted text" in the<emph> Selection</emph> list, and then click<emph> OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/fields.xhp#fields"/>
-<paragraph role="paragraph" id="par_id3157551" xml-lang="en-US" l10n="U" oldref="11"><link href="text/shared/01/02070000.xhp" name="Paste Special">Paste Special</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149281" role="paragraph" l10n="U" oldref="2">You can change a field to regular text, so that it is no longer updated. After you change a field to text, you cannot change the text back into a field.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155608" role="listitem" l10n="U" oldref="7">Select the field and choose <emph>Edit - Cut</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154238" role="listitem" l10n="U" oldref="9">Choose <emph>Edit - Paste Special</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154262" role="listitem" l10n="U" oldref="10">Click "Unformatted text" in the<emph/>
+               <item type="menuitem">Selection</item> list, and then click<emph/>
+               <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/fields.xhp#fields"/>
+      <paragraph xml-lang="en-US" id="par_id3157551" role="paragraph" l10n="U" oldref="11"><link href="text/shared/01/02070000.xhp" name="Paste Special">Paste Special</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/fields.xhp b/helpcontent2/source/text/swriter/guide/fields.xhp
index 2c6a765336..8e3ac32871 100644
--- a/helpcontent2/source/text/swriter/guide/fields.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fields.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,92 +27,89 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefieldsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">About Fields</title>
-<filename>/text/swriter/guide/fields.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-28T08:59:30">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefieldsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">About Fields</title>
+         <filename>/text/swriter/guide/fields.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145576"><bookmark_value>fields;updating/viewing</bookmark_value>
-<bookmark_value>updating;fields</bookmark_value>
-<bookmark_value>Help tips;fields</bookmark_value>
-<bookmark_value>properties;fields</bookmark_value>
-<bookmark_value>disabling;field highlighting</bookmark_value>
-<bookmark_value>changing;field shadings</bookmark_value>
-<bookmark_value>viewing;fields</bookmark_value>
+      <bookmark_value>updating;fields</bookmark_value>
+      <bookmark_value>Help tips;fields</bookmark_value>
+      <bookmark_value>properties;fields</bookmark_value>
+      <bookmark_value>disabling;field highlighting</bookmark_value>
+      <bookmark_value>changing;field shadings</bookmark_value>
+      <bookmark_value>viewing;fields</bookmark_value>
 </bookmark><comment>mw changed "fields;..."</comment>
-<paragraph role="heading" id="hd_id3145576" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="fields"><link href="text/swriter/guide/fields.xhp" name="About Fields">About Fields</link>
+<paragraph xml-lang="en-US" id="hd_id3145576" role="heading" level="1" l10n="U" oldref="3"><variable id="fields"><link href="text/swriter/guide/fields.xhp" name="About Fields">About Fields</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154246" xml-lang="en-US" l10n="U" oldref="4">Fields are used for data that changes in a document, such as the current date or the total number of pages in a document.</paragraph>
-<paragraph role="heading" id="hd_id3154262" xml-lang="en-US" level="2" l10n="U" oldref="5">Viewing Fields</paragraph>
-<paragraph role="paragraph" id="par_id3150509" xml-lang="en-US" l10n="U" oldref="6">Fields consist of a field name and the field content. To switch the field display between the field name or the field content, choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Field Names</emph></link>.</paragraph>
-<paragraph role="paragraph" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="195">To display or hide field highlighting in a document, choose <emph>View - Field Shadings</emph>. To permanently disable this feature, choose <emph>Tools - Options - $[officename] - Appearance</emph>, and clear the check box in front of <emph>Field shadings</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="7">To change the color of field shadings, choose <link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance"><emph>Tools - Options - $[officename] - Appearance</emph></link>, locate the <emph>Field shadings</emph> option, and then select a different color in the <emph>Color setting </emph>box.</paragraph>
-<paragraph role="heading" id="hd_id3153166" xml-lang="en-US" level="2" l10n="U" oldref="8">Field Properties</paragraph>
-<paragraph role="paragraph" id="par_id3153180" xml-lang="en-US" l10n="U" oldref="181">Most field types in a document, including database fields, store and display variable values.</paragraph>
-<paragraph role="paragraph" id="par_id3155533" xml-lang="en-US" l10n="U" oldref="182">The following field types execute an action when you click the field:</paragraph>
-<table id="tbl_id3155548">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="183">Field Type</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147760" xml-lang="en-US" l10n="U" oldref="184">Property</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147789" xml-lang="en-US" l10n="U" oldref="185">Placeholder</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147812" xml-lang="en-US" l10n="U" oldref="186">Opens a dialog to insert the object for which the placeholder was set.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147216" xml-lang="en-US" l10n="U" oldref="187">Insert Reference</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147239" xml-lang="en-US" l10n="U" oldref="188">Moves the mouse pointer to the reference.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147267" xml-lang="en-US" l10n="U" oldref="189">Run macro</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147290" xml-lang="en-US" l10n="U" oldref="190">Runs a macro.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145614" xml-lang="en-US" l10n="U" oldref="191">Input Field</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145637" xml-lang="en-US" l10n="U" oldref="192">Opens a dialog to edit the contents of the field.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3154246" role="paragraph" l10n="U" oldref="4">Fields are used for data that changes in a document, such as the current date or the total number of pages in a document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154262" role="heading" level="2" l10n="U" oldref="5">Viewing Fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150509" role="paragraph" l10n="U" oldref="6">Fields consist of a field name and the field content. To switch the field display between the field name or the field content, choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Field Names</emph></link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="195">To display or hide field highlighting in a document, choose <emph>View - Field Shadings</emph>. To permanently disable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>, and clear the check box in front of <emph>Field shadings</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152885" role="paragraph" l10n="U" oldref="7">To change the color of field shadings, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance"><item type="menuitem">$[officename] - Appearance</item></link></emph>, locate the <item type="menuitem">Field shadings</item> option, and then select a different color in the <item type="menuitem">Color setting</item> box.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153166" role="heading" level="2" l10n="U" oldref="8">Field Properties</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153180" role="paragraph" l10n="U" oldref="181">Most field types in a document, including database fields, store and display variable values.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U" oldref="182">The following field types execute an action when you click the field:</paragraph>
+      <table id="tbl_id3155548">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155582" role="tablehead" l10n="U" oldref="183">Field Type</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147760" role="tablehead" l10n="U" oldref="184">Property</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147789" role="tablecontent" l10n="U" oldref="185">Placeholder</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147812" role="tablecontent" l10n="U" oldref="186">Opens a dialog to insert the object for which the placeholder was set.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147216" role="tablecontent" l10n="U" oldref="187">Insert Reference</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147239" role="tablecontent" l10n="U" oldref="188">Moves the mouse pointer to the reference.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147267" role="tablecontent" l10n="U" oldref="189">Run macro</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147290" role="tablecontent" l10n="U" oldref="190">Runs a macro.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145614" role="tablecontent" l10n="U" oldref="191">Input Field</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145637" role="tablecontent" l10n="U" oldref="192">Opens a dialog to edit the contents of the field.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="note" id="par_id3151244" xml-lang="en-US" l10n="U" oldref="10">Placeholder, hidden text, insert reference, variable, database, and user-defined fields display a help tip when you rest the mouse pointer over the field in a document. To enable this feature, ensure that the <emph>Extended Tips </emph>option is selected in the <emph>Help</emph> menu.</paragraph>
-<paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="2" l10n="U" oldref="11">Updating Fields</paragraph>
-<paragraph role="paragraph" id="par_id3155963" xml-lang="en-US" l10n="U" oldref="12">To update all of the fields in a document, press F9, or choose <emph>Edit - Select All</emph>, and then press F9.</paragraph>
-<paragraph role="paragraph" id="par_id3155984" xml-lang="en-US" l10n="U" oldref="13">To update a field that was inserted from a database, select the field, and then press F9.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
-<embed href="text/swriter/guide/fields_enter.xhp#fields_enter"/>
-<embed href="text/swriter/guide/fields_date.xhp#fields_date"/>
-<embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
-<embed href="text/swriter/guide/conditional_text2.xhp#conditional_text2"/>
-<embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3151244" role="note" l10n="U" oldref="10">Placeholder, hidden text, insert reference, variable, database, and user-defined fields display a help tip when you rest the mouse pointer over the field in a document. To enable this feature, ensure that the Extended Tips<emph/>option (<item type="menuitem">What's This?</item>) is selected in the <item type="menuitem">Help</item> menu.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155937" role="heading" level="2" l10n="U"
+                 oldref="11">Updating Fields</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155963" role="paragraph" l10n="U" oldref="12">To update all of the fields in a document, press F9, or choose <emph>Edit - Select All</emph>, and then press F9.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155984" role="paragraph" l10n="U" oldref="13">To update a field that was inserted from a database, select the field, and then press F9.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
+      <embed href="text/swriter/guide/fields_enter.xhp#fields_enter"/>
+      <embed href="text/swriter/guide/fields_date.xhp#fields_date"/>
+      <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
+      <embed href="text/swriter/guide/conditional_text2.xhp#conditional_text2"/>
+      <embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/fields_date.xhp b/helpcontent2/source/text/swriter/guide/fields_date.xhp
index fa77ce2c4d..f26b0c567f 100755
--- a/helpcontent2/source/text/swriter/guide/fields_date.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields_date.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fields_date.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,50 +27,42 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefields_datexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Fixed or Variable Date Field</title>
-<filename>/text/swriter/guide/fields_date.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-16T12:42:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefields_datexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Fixed or Variable Date Field</title>
+         <filename>/text/swriter/guide/fields_date.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id5111545"><bookmark_value>inserting;date fields</bookmark_value>
-<bookmark_value>dates;inserting</bookmark_value>
-<bookmark_value>date fields;fixed/variable</bookmark_value>
-<bookmark_value>fixed dates</bookmark_value>
-<bookmark_value>variable dates</bookmark_value>
+      <bookmark_value>dates;inserting</bookmark_value>
+      <bookmark_value>date fields;fixed/variable</bookmark_value>
+      <bookmark_value>fixed dates</bookmark_value>
+      <bookmark_value>variable dates</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155165" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="fields_date"><link href="text/swriter/guide/fields_date.xhp" name="Inserting a Fixed or Variable Date Field">Inserting a Fixed or Variable Date Field</link>
+<paragraph xml-lang="en-US" id="hd_id3155165" role="heading" level="1" l10n="U" oldref="1"><variable id="fields_date"><link href="text/swriter/guide/fields_date.xhp" name="Inserting a Fixed or Variable Date Field">Inserting a Fixed or Variable Date Field</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154491" xml-lang="en-US" l10n="U" oldref="2">You can insert the current date as a field that updates each time you open the document, or as a field that does not update.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147679" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Document</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="5">Click 'Date' in the <emph>Type </emph>list and do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="6">To insert the date as a field that updates each time you open the document, click 'Date' in the <emph>Select </emph>list.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154241" xml-lang="en-US" l10n="U" oldref="4">To insert the date as a field that does not update, click 'Date (fixed)' in the <emph>Select </emph>list.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/fields.xhp#fields"/>
-<embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
-<embed href="text/swriter/guide/fields_enter.xhp#fields_enter"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154491" role="paragraph" l10n="U" oldref="2">You can insert the current date as a field that updates each time you open the document, or as a field that does not update.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147679" role="listitem" l10n="U" oldref="3">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Document</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153415" role="listitem" l10n="U" oldref="5">Click “Date” in the <item type="menuitem">Type</item>
+               <emph/>list and do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155602" role="listitem" l10n="U" oldref="6">To insert the date as a field that updates each time you open the document, click ”Date” in the <item type="menuitem">Select</item>
+               <emph/>list.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154241" role="listitem" l10n="U" oldref="4">To insert the date as a field that does not update, click “Date (fixed)” in the <item type="menuitem">Select</item>
+               <emph/>list.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/fields.xhp#fields"/>
+      <embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
+      <embed href="text/swriter/guide/fields_enter.xhp#fields_enter"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/fields_enter.xhp b/helpcontent2/source/text/swriter/guide/fields_enter.xhp
index e1f2fc811c..2e4465e161 100644
--- a/helpcontent2/source/text/swriter/guide/fields_enter.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields_enter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fields_enter.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,44 +29,41 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidefields_enterxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Input Fields</title>
-<filename>/text/swriter/guide/fields_enter.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidefields_enterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Input Fields</title>
+         <filename>/text/swriter/guide/fields_enter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155916"><bookmark_value>text; input fields</bookmark_value>
-<bookmark_value>fields; input fields in text</bookmark_value>
-<bookmark_value>input fields in text</bookmark_value>
-<bookmark_value>inserting;input fields</bookmark_value>
-</bookmark>
-  <comment>MW deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="U" oldref="1"><variable id="fields_enter"><link href="text/swriter/guide/fields_enter.xhp" name="Adding Input Fields">Adding Input Fields</link> 
+      <bookmark_value>fields; input fields in text</bookmark_value>
+      <bookmark_value>input fields in text</bookmark_value>
+      <bookmark_value>inserting;input fields</bookmark_value>
+</bookmark><comment>MW deleted "adding;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="U" oldref="1"><variable id="fields_enter"><link href="text/swriter/guide/fields_enter.xhp" name="Adding Input Fields">Adding Input Fields</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U" oldref="2">An input field is a variable that you can click in a document to open a dialog where you can edit the variable.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145776" role="listitem" l10n="U" oldref="3">Choose <emph>Insert - Fields - Other </emph>and click the <emph>Functions</emph> tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155620" role="listitem" l10n="U" oldref="5">Click <emph>Input field </emph>in the <emph>Type</emph> list.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154257" role="listitem" l10n="U" oldref="6">Click <emph>Insert </emph>and type the text for the variable.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3150708" role="tip" l10n="U" oldref="4">To quickly open all input fields in a document for editing, press Ctrl+Shift+F9.</paragraph>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/fields.xhp#fields"/>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U" oldref="2">An input field is a variable that you can click in a document to open a dialog where you can edit the variable.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145776" role="listitem" l10n="U" oldref="3">Choose <item type="menuitem">Insert - Fields - Other</item>
+               <emph/>and click the <item type="menuitem">Functions</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155620" role="listitem" l10n="U" oldref="5">Click “Input field”<emph/>in the <item type="menuitem">Type</item> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154257" role="listitem" l10n="U" oldref="6">Click <item type="menuitem">Insert</item>
+               <emph/>and type the text for the variable.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3150708" role="tip" l10n="U" oldref="4">To quickly open all input fields in a document for editing, press Ctrl+Shift+F9.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/fields.xhp#fields"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/fields_userdata.xhp b/helpcontent2/source/text/swriter/guide/fields_userdata.xhp
index a4ad8be6ed..22b4139c5c 100644
--- a/helpcontent2/source/text/swriter/guide/fields_userdata.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields_userdata.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fields_userdata.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,215 +27,212 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefields_userdataxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Querying User Data in Fields or Conditions</title>
-<filename>/text/swriter/guide/fields_userdata.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T11:37:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefields_userdataxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Querying User Data in Fields or Conditions</title>
+         <filename>/text/swriter/guide/fields_userdata.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153398"><bookmark_value>fields; user data</bookmark_value>
-<bookmark_value>user data; querying</bookmark_value>
-<bookmark_value>conditions; user data fields</bookmark_value>
-<bookmark_value>hiding;text, from specific users</bookmark_value>
-<bookmark_value>text; hiding from specific users, with conditions</bookmark_value>
-<bookmark_value>user variables in conditions/fields</bookmark_value>
+      <bookmark_value>user data; querying</bookmark_value>
+      <bookmark_value>conditions; user data fields</bookmark_value>
+      <bookmark_value>hiding;text, from specific users</bookmark_value>
+      <bookmark_value>text; hiding from specific users, with conditions</bookmark_value>
+      <bookmark_value>user variables in conditions/fields</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153398" xml-lang="en-US" level="1" l10n="U" oldref="59"><variable id="fields_userdata"><link href="text/swriter/guide/fields_userdata.xhp" name="Querying User Data in Fields or Conditions">Querying User Data in Fields or Conditions</link>
+<paragraph xml-lang="en-US" id="hd_id3153398" role="heading" level="1" l10n="U"
+                 oldref="59"><variable id="fields_userdata"><link href="text/swriter/guide/fields_userdata.xhp" name="Querying User Data in Fields or Conditions">Querying User Data in Fields or Conditions</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154239" xml-lang="en-US" l10n="U" oldref="60">You can access and compare some user data from conditions or fields. For example, you can compare user data with the following operators:</paragraph>
-<table id="tbl_id3154255">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155889" xml-lang="en-US" l10n="U" oldref="94">Operator</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147110" xml-lang="en-US" l10n="U" oldref="95">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150508" xml-lang="en-US" l10n="U" oldref="96">== or EQ</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150531" xml-lang="en-US" l10n="U" oldref="97">equals</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150725" xml-lang="en-US" l10n="U" oldref="98">!= or NEQ</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150748" xml-lang="en-US" l10n="U" oldref="99">is not equal to</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3154239" role="paragraph" l10n="U" oldref="60">You can access and compare some user data from conditions or fields. For example, you can compare user data with the following operators:</paragraph>
+      <table id="tbl_id3154255">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155889" role="tablehead" l10n="U" oldref="94">Operator</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147110" role="tablehead" l10n="U" oldref="95">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150508" role="tablecontent" l10n="U" oldref="96">== or EQ</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150531" role="tablecontent" l10n="U" oldref="97">equals</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150725" role="tablecontent" l10n="U" oldref="98">!= or NEQ</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150748" role="tablecontent" l10n="U" oldref="99">is not equal to</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="paragraph" id="par_id3153167" xml-lang="en-US" l10n="U" oldref="101">If you want, you can use a condition to hide specific text in your document from a specific user.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153190" xml-lang="en-US" l10n="U" oldref="102">Select the text in the document that you want to hide.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="103">Choose <emph>Insert - Section</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="104">In the <emph>Hide </emph>area, select the <emph>Hide</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155533" xml-lang="en-US" l10n="U" oldref="105">In the <emph>With Condition</emph> box, type <emph>user_lastname == "Doe"</emph>, where "Doe" is the last name of the user that you want to hide the text from. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155573" xml-lang="en-US" l10n="U" oldref="107">Click <emph>Insert</emph> and then save the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3147760" xml-lang="en-US" l10n="U" oldref="108">The name of the hidden section can still be seen in the Navigator.</paragraph>
-<paragraph role="paragraph" id="par_id3147777" xml-lang="en-US" l10n="U" oldref="61">The following table is a list of the user variables that you can access when defining a condition or a field:</paragraph>
-<table id="tbl_id3147793">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147819" xml-lang="en-US" l10n="U" oldref="62">User variables</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147218" xml-lang="en-US" l10n="U" oldref="63">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3147245" xml-lang="en-US" l10n="U" oldref="64">user_firstname</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147268" xml-lang="en-US" l10n="U" oldref="65">First name</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3145592" xml-lang="en-US" l10n="U" oldref="66">user_lastname</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="67">Last name</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3145642" xml-lang="en-US" l10n="U" oldref="68">user_initials</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="U" oldref="69">Initials</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3151200" xml-lang="en-US" l10n="U" oldref="70">user_company</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="71">Company</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="72">user_street</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152912" xml-lang="en-US" l10n="U" oldref="73">Street</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="74">user_country</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152963" xml-lang="en-US" l10n="U" oldref="75">Country</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="76">user_zipcode</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145679" xml-lang="en-US" l10n="U" oldref="77">Zip Code</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3145706" xml-lang="en-US" l10n="U" oldref="78">user_city</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145729" xml-lang="en-US" l10n="U" oldref="79">City</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3145756" xml-lang="en-US" l10n="U" oldref="80">user_title</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="81">Title</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="82">user_position</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156307" xml-lang="en-US" l10n="U" oldref="83">Position</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3156334" xml-lang="en-US" l10n="U" oldref="84">user_tel_work</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156357" xml-lang="en-US" l10n="U" oldref="85">Business telephone number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3156384" xml-lang="en-US" l10n="U" oldref="86">user_tel_home</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149728" xml-lang="en-US" l10n="U" oldref="87">Home telephone number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="88">user_fax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149778" xml-lang="en-US" l10n="U" oldref="89">Fax number</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3149806" xml-lang="en-US" l10n="U" oldref="90">user_email</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147294" xml-lang="en-US" l10n="U" oldref="91">E-mail address</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3147321" xml-lang="en-US" l10n="U" oldref="92">user_state</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="93">State</paragraph>
-</tablecell>
-</tablerow>
-</table>
+      <paragraph xml-lang="en-US" id="par_id3153167" role="paragraph" l10n="U" oldref="101">If you want, you can use a condition to hide specific text in your document from a specific user.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153190" role="listitem" l10n="U" oldref="102">Select the text in the document that you want to hide.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145273" role="listitem" l10n="U" oldref="103">Choose <emph>Insert - Section</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145297" role="listitem" l10n="U" oldref="104">In the <item type="menuitem">Hide</item>
+               <emph/>area, select the <item type="menuitem">Hide</item> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155533" role="listitem" l10n="U" oldref="105">In the <emph>With Condition</emph> box, type <emph>user_lastname == "Doe"</emph>, where "Doe" is the last name of the user that you want to hide the text from. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155573" role="listitem" l10n="U" oldref="107">Click <emph>Insert</emph> and then save the document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147760" role="note" l10n="U" oldref="108">The name of the hidden section can still be seen in the Navigator.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147777" role="paragraph" l10n="U" oldref="61">The following table is a list of the user variables that you can access when defining a condition or a field:</paragraph>
+      <table id="tbl_id3147793">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147819" role="tablehead" l10n="U" oldref="62">User variables</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147218" role="tablehead" l10n="U" oldref="63">Meaning</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147245" role="code" l10n="U" oldref="64">user_firstname</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147268" role="paragraph" l10n="U" oldref="65">First name</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145592" role="code" l10n="U" oldref="66">user_lastname</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145615" role="paragraph" l10n="U" oldref="67">Last name</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145642" role="code" l10n="U" oldref="68">user_initials</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145666" role="paragraph" l10n="U" oldref="69">Initials</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151200" role="code" l10n="U" oldref="70">user_company</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151223" role="paragraph" l10n="U" oldref="71">Company</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3151250" role="code" l10n="U" oldref="72">user_street</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152912" role="paragraph" l10n="U" oldref="73">Street</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152940" role="code" l10n="U" oldref="74">user_country</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152963" role="paragraph" l10n="U" oldref="75">Country</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3152990" role="code" l10n="U" oldref="76">user_zipcode</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145679" role="paragraph" l10n="U" oldref="77">Zip Code</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145706" role="code" l10n="U" oldref="78">user_city</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145729" role="paragraph" l10n="U" oldref="79">City</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145756" role="code" l10n="U" oldref="80">user_title</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145779" role="paragraph" l10n="U" oldref="81">Title</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156284" role="code" l10n="U" oldref="82">user_position</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156307" role="paragraph" l10n="U" oldref="83">Position</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156334" role="code" l10n="U" oldref="84">user_tel_work</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156357" role="paragraph" l10n="U" oldref="85">Business telephone number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156384" role="code" l10n="U" oldref="86">user_tel_home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149728" role="paragraph" l10n="U" oldref="87">Home telephone number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149756" role="code" l10n="U" oldref="88">user_fax</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149778" role="paragraph" l10n="U" oldref="89">Fax number</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149806" role="code" l10n="U" oldref="90">user_email</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147294" role="paragraph" l10n="U" oldref="91">E-mail address</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147321" role="code" l10n="U" oldref="92">user_state</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="93">State</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<section id="relatedtopics">
-<embed href="text/swriter/guide/fields.xhp#fields"/>
-<embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
-<embed href="text/swriter/guide/hidden_text.xhp#hidden_text"/>
-<paragraph role="paragraph" id="par_id3147392" xml-lang="en-US" l10n="C"><link href="text/swriter/02/14020000.xhp" name="List of operators">List of operators</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/fields.xhp#fields"/>
+         <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
+         <embed href="text/swriter/guide/hidden_text.xhp#hidden_text"/>
+         <paragraph xml-lang="en-US" id="par_id3147392" role="paragraph" l10n="C"><link href="text/swriter/02/14020000.xhp" name="List of operators">List of operators</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/finding.xhp b/helpcontent2/source/text/swriter/guide/finding.xhp
index 58bfc3e544..789e9dfc29 100644
--- a/helpcontent2/source/text/swriter/guide/finding.xhp
+++ b/helpcontent2/source/text/swriter/guide/finding.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: finding.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,137 +29,118 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidefindingxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Finding and Replacing in Writer</title>
-<filename>text/swriter/guide/finding.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="finding_text">
+      <topic id="textswriterguidefindingxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Finding and Replacing in Writer</title>
+         <filename>text/swriter/guide/finding.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="finding_text">
 <bookmark xml-lang="en-US" branch="index" id="bm_id1163670"><bookmark_value>finding; text/text formats/styles/objects</bookmark_value>
-<bookmark_value>replacing; text and text formats</bookmark_value>
-<bookmark_value>styles;finding</bookmark_value>
-<bookmark_value>searching, see also finding</bookmark_value>
-<bookmark_value>text formats; finding</bookmark_value>
-<bookmark_value>formats; finding and replacing</bookmark_value>
-<bookmark_value>searching; formats</bookmark_value>
-<bookmark_value>objects;finding by Navigator</bookmark_value>
-<bookmark_value>Asian languages;search options</bookmark_value>
-</bookmark><comment>3. mw added 2 index entries and changed "finding;"</comment><comment>2. mw copied 6 index entries from shared/01/02100300.xhp. Then made one entry of two "finding;" entries, one entry of two "replacing;" entries and one entry of two "formats;" entries</comment><comment>1. mw copied 5 entries from shared/01/02100000.xhp and then made one entry of two "finding;" entries.</comment><paragraph role="heading" id="hd_id8568681" xml-lang="en-US" level="1" l10n="NEW"><variable id="finding"><link href="text/swriter/guide/finding.xhp">Finding and Replacing in Writer</link>
+         <bookmark_value>replacing; text and text formats</bookmark_value>
+         <bookmark_value>styles;finding</bookmark_value>
+         <bookmark_value>searching, see also finding</bookmark_value>
+         <bookmark_value>text formats; finding</bookmark_value>
+         <bookmark_value>formats; finding and replacing</bookmark_value>
+         <bookmark_value>searching; formats</bookmark_value>
+         <bookmark_value>objects;finding by Navigator</bookmark_value>
+         <bookmark_value>Asian languages;search options</bookmark_value>
+</bookmark><comment>3. mw added 2 index entries and changed "finding;"</comment><comment>2. mw copied 6 index entries from shared/01/02100300.xhp. Then made one entry of two "finding;" entries, one entry of two "replacing;" entries and one entry of two "formats;" entries</comment><comment>1. mw copied 5 entries from shared/01/02100000.xhp and then made one entry of two "finding;" entries.</comment>
+<paragraph xml-lang="en-US" id="hd_id8568681" role="heading" level="1" l10n="NEW"><variable id="finding"><link href="text/swriter/guide/finding.xhp">Finding and Replacing in Writer</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id611285" xml-lang="en-US" l10n="NEW">In text documents you can find words, formatting, styles, and more. You can navigate from one result to the next, or you can highlight all results at once, then apply another format or replace the words by other text.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id6226081" xml-lang="en-US" level="2" l10n="NEW">The Find &amp; Replace dialog</paragraph>
-<paragraph role="paragraph" id="par_id6702780" xml-lang="en-US" l10n="NEW">To find text within the whole document, open the Find &amp; Replace dialog without any active text selection. If you want to search only a part of your document, first select that part of text, then open the Find &amp; Replace dialog.</paragraph>
-<paragraph role="heading" id="hd_id3158970" xml-lang="en-US" level="3" l10n="NEW">Finding text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6957304" xml-lang="en-US" l10n="NEW">Choose <emph>Edit - Find &amp; Replace</emph> to open the Find &amp; Replace dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2164677" xml-lang="en-US" l10n="NEW">Enter the text to find in the <emph>Search for</emph> text box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5684072" xml-lang="en-US" l10n="NEW">Either click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id4377269" xml-lang="en-US" l10n="NEW">When you click <emph>Find</emph>, Writer will show you the next text that is equal to your entry. You can watch and edit the text, then click <emph>Find</emph> again to advance to the next found text. </paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1371807" xml-lang="en-US" l10n="NEW">If you closed the dialog, you can press a key combination (Ctrl+Shift+F) to find the next text without opening the dialog. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id924100" xml-lang="en-US" l10n="NEW">Alternatively, you can use the icons at the lower right of the document to navigate to the next text or to any other object in the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9359416" xml-lang="en-US" l10n="NEW">When you click <emph>Find All</emph>, Writer selects all text that is equal to your entry. Now you can for example set all found text to bold, or apply a Character Style to all at once.</paragraph>
-<paragraph role="heading" id="hd_id5891598" xml-lang="en-US" level="3" l10n="NEW">Replacing text</paragraph>
-<paragraph role="note" id="par_id1780755" xml-lang="en-US" l10n="NEW">Unlike searching text, replacing text cannot be restricted to the current selection only.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2467421" xml-lang="en-US" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4286935" xml-lang="en-US" l10n="NEW">Enter the text to search in the <emph>Search for </emph>text box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9959410" xml-lang="en-US" l10n="NEW">Enter the text to replace the found text in the <emph>Replace with</emph> text box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id24109" xml-lang="en-US" l10n="NEW">Either click <emph>Replace</emph> or <emph>Replace All</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id703451" xml-lang="en-US" l10n="NEW">When you click <emph>Replace</emph>, Writer will search the whole document for the text in the <emph>Search for</emph> box, starting at the current cursor position. When text is found, Writer highlights the text and waits for your response. Click <emph>Replace</emph> to replace the highlighted text in the document with the text in the <emph>Replace with</emph> text box. Click <emph>Find</emph> to advance to the next found text without replacing the current selection.</paragraph>
-<paragraph role="paragraph" id="par_id7540818" xml-lang="en-US" l10n="NEW">When you click <emph>Replace All</emph>, Writer replaces all text that matches your entry.</paragraph>
-<paragraph role="heading" id="hd_id9908444" xml-lang="en-US" level="3" l10n="NEW">Finding styles</paragraph>
-<paragraph role="paragraph" id="par_id8413953" xml-lang="en-US" l10n="NEW">You want to find all text in your document to which a certain Paragraph Style is assigned, for example the "Heading 2" style.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2696920" xml-lang="en-US" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id896938" xml-lang="en-US" l10n="NEW">Click <emph>More Options</emph> to expand the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9147007" xml-lang="en-US" l10n="NEW">Check <emph>Search for Styles</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id5781426" xml-lang="en-US" l10n="NEW">The <emph>Search for</emph> text box now is a list box, where you can select any of the Paragraph Styles that are applied in the current document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id679342" xml-lang="en-US" l10n="NEW">Select the style to search for, then click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3231299" xml-lang="en-US" level="3" l10n="NEW">Finding formats</paragraph>
-<paragraph role="paragraph" id="par_id8087405" xml-lang="en-US" l10n="NEW">You want to find all text in your document to which a certain direct character formatting is assigned. </paragraph>
-<paragraph role="note" id="par_id3406170" xml-lang="en-US" l10n="NEW">Finding formats only finds direct character attributes, it does not find attributes applied as part of a style.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2448805" xml-lang="en-US" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4542985" xml-lang="en-US" l10n="NEW">Click <emph>More Options</emph> to expand the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4679403" xml-lang="en-US" l10n="NEW">Click the <emph>Format</emph> button.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="5">
-<listitem>
-<paragraph role="paragraph" id="par_id7783745" xml-lang="en-US" l10n="NEW">Click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_id5597094" xml-lang="en-US" level="3" l10n="NEW">More options</paragraph>
-<paragraph role="paragraph" id="par_id9919431" xml-lang="en-US" l10n="NEW">The similarity search can find text that is almost the same as your search text. You can set the number of characters that are allowed to differ.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8533280" xml-lang="en-US" l10n="NEW">Check the <emph>Similarity search</emph> option and optionally click the <emph>...</emph> button to change the settings. (Setting all three numbers to 1 works fine for English text.)</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id4646748" xml-lang="en-US" l10n="NEW">When you have enabled Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, the Find &amp; Replace dialog offers options to search Asian text.</paragraph>
-<paragraph role="heading" id="hd_id2489394" xml-lang="en-US" level="2" l10n="NEW">The Navigator</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4159062" xml-lang="en-US" l10n="NEW">Choose <emph>Edit - Navigator</emph> to open the Navigator window.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9934385" xml-lang="en-US" l10n="NEW">The Navigator is the main tool for finding and selecting objects. You can also use the Navigator to move and arrange chapters, providing an outline view to your document. </paragraph>
-<paragraph role="paragraph" id="par_id7421796" xml-lang="en-US" l10n="NEW">Use the Navigator for inserting objects, links and references within the same document or from other open documents. See the <link href="text/swriter/guide/navigator.xhp">Navigator</link> guide for more information.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6417432" xml-lang="en-US" l10n="NEW">Click the icon with the blue circle at the bottom right part of your document to open the small <emph>Navigation</emph> window.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id4639728" xml-lang="en-US" l10n="NEW">Use the small Navigation window to quickly jump to the next object or find the next text in your document.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/navigator.xhp#navigator"/>
-<embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
-<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
-<embed href="text/shared/01/02100001.xhp#02100001"/>
-<embed href="text/swriter/guide/removing_line_breaks.xhp#removing_line_breaks"/>
-<embed href="text/scalc/guide/finding.xhp#finding"/>
-</section>
-</body>
-</helpdocument>
+         <paragraph xml-lang="en-US" id="par_id611285" role="paragraph" l10n="NEW">In text documents you can find words, formatting, styles, and more. You can navigate from one result to the next, or you can highlight all results at once, then apply another format or replace the words by other text.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id6226081" role="heading" level="2" l10n="NEW">The Find &amp; Replace dialog</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6702780" role="paragraph" l10n="NEW">To find text within the whole document, open the Find &amp; Replace dialog without any active text selection. If you want to search only a part of your document, first select that part of text, then open the Find &amp; Replace dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3158970" role="heading" level="3" l10n="NEW">To Find Text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6957304" role="listitem" l10n="NEW">Choose <emph>Edit - Find &amp; Replace</emph> to open the Find &amp; Replace dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2164677" role="listitem" l10n="NEW">Enter the text to find in the <emph>Search for</emph> text box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5684072" role="listitem" l10n="NEW">Either click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id4377269" role="paragraph" l10n="NEW">When you click <emph>Find</emph>, Writer will show you the next text that is equal to your entry. You can watch and edit the text, then click <emph>Find</emph> again to advance to the next found text. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id1371807" role="paragraph" l10n="NEW">If you closed the dialog, you can press a key combination (Ctrl+Shift+F) to find the next text without opening the dialog. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id924100" role="paragraph" l10n="NEW">Alternatively, you can use the icons at the lower right of the document to navigate to the next text or to any other object in the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9359416" role="paragraph" l10n="NEW">When you click <item type="menuitem">Find All</item>, Writer selects all text that is equal to your entry. Now you can for example set all found text to bold, or apply a character style to all at once.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5891598" role="heading" level="3" l10n="NEW">To Replace Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1780755" role="note" l10n="NEW">Unlike searching text, replacing text cannot be restricted to the current selection only.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2467421" role="listitem" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4286935" role="listitem" l10n="NEW">Enter the text to search in the <emph>Search for </emph>text box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9959410" role="listitem" l10n="NEW">Enter the text to replace the found text in the <emph>Replace with</emph> text box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id24109" role="listitem" l10n="NEW">Either click <emph>Replace</emph> or <emph>Replace All</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id703451" role="paragraph" l10n="NEW">When you click <emph>Replace</emph>, Writer will search the whole document for the text in the <emph>Search for</emph> box, starting at the current cursor position. When text is found, Writer highlights the text and waits for your response. Click <emph>Replace</emph> to replace the highlighted text in the document with the text in the <emph>Replace with</emph> text box. Click <emph>Find</emph> to advance to the next found text without replacing the current selection.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7540818" role="paragraph" l10n="NEW">When you click <emph>Replace All</emph>, Writer replaces all text that matches your entry.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9908444" role="heading" level="3" l10n="NEW">To Find Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8413953" role="paragraph" l10n="NEW">You want to find all text in your document to which a certain Paragraph Style is assigned, for example the "Heading 2" style.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2696920" role="listitem" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id896938" role="listitem" l10n="NEW">Click <emph>More Options</emph> to expand the dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9147007" role="listitem" l10n="NEW">Check <item type="menuitem">Search for Styles</item>.<br/>The <item type="menuitem">Search for</item> text box now is a list box, where you can select any of the Paragraph Styles that are applied in the current document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id679342" role="listitem" l10n="NEW">Select the style to search for, then click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3231299" role="heading" level="3" l10n="NEW">To Find Formats</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8087405" role="paragraph" l10n="NEW">You want to find all text in your document to which a certain direct character formatting is assigned. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3406170" role="note" l10n="NEW">Finding formats only finds direct character attributes, it does not find attributes applied as part of a style.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2448805" role="listitem" l10n="NEW">Choose Edit - Find &amp; Replace to open the Find &amp; Replace dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4542985" role="listitem" l10n="NEW">Click <emph>More Options</emph> to expand the dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4679403" role="listitem" l10n="NEW">Click the <emph>Format</emph> button.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="5">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7783745" role="listitem" l10n="NEW">Click <emph>Find</emph> or <emph>Find All</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5597094" role="heading" level="3" l10n="NEW">More options</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9919431" role="paragraph" l10n="NEW">The similarity search can find text that is almost the same as your search text. You can set the number of characters that are allowed to differ.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8533280" role="paragraph" l10n="NEW">Check the <emph>Similarity search</emph> option and optionally click the <emph>...</emph> button to change the settings. (Setting all three numbers to 1 works fine for English text.)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4646748" role="tip" l10n="NEW">When you have enabled Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, the Find &amp; Replace dialog offers options to search Asian text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2489394" role="heading" level="2" l10n="NEW">The Navigator</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9934385" role="paragraph" l10n="NEW">The Navigator is the main tool for finding and selecting objects. You can also use the Navigator to move and arrange chapters, providing an outline view to your document. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id4159062" role="paragraph" l10n="NEW">Choose <emph>Edit - Navigator</emph> to open the Navigator window.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7421796" role="paragraph" l10n="NEW">Use the Navigator for inserting objects, links and references within the same document or from other open documents. See the <link href="text/swriter/guide/navigator.xhp">Navigator</link> guide for more information.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6417432" role="paragraph" l10n="NEW">Click the icon with the blue circle at the bottom right part of your document to open the small <emph>Navigation</emph> window.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4639728" role="paragraph" l10n="NEW">Use the small Navigation window to quickly jump to the next object or find the next text in your document.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/navigator.xhp#navigator"/>
+         <embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+         <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
+         <embed href="text/shared/01/02100001.xhp#02100001"/>
+         <embed href="text/swriter/guide/removing_line_breaks.xhp#removing_line_breaks"/>
+         <embed href="text/scalc/guide/finding.xhp#finding"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp b/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
index 6a3f21b58e..f47a3048c7 100755
--- a/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footer_nextpage.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,47 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidefooter_nextpagexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Page Numbers of Continuation Pages</title>
-<filename>/text/swriter/guide/footer_nextpage.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidefooter_nextpagexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Page Numbers of Continuation Pages</title>
+         <filename>/text/swriter/guide/footer_nextpage.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145819"><bookmark_value>pages; continuation pages</bookmark_value>
-<bookmark_value>next page number in footers</bookmark_value>
-<bookmark_value>continuation pages</bookmark_value>
-<bookmark_value>page numbers; continuation pages</bookmark_value>
+      <bookmark_value>next page number in footers</bookmark_value>
+      <bookmark_value>continuation pages</bookmark_value>
+      <bookmark_value>page numbers; continuation pages</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145819" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="footer_nextpage"><link href="text/swriter/guide/footer_nextpage.xhp" name="Inserting Page Numbers of Continuation Pages">Inserting Page Numbers of Continuation Pages</link>
+<paragraph xml-lang="en-US" id="hd_id3145819" role="heading" level="1" l10n="U" oldref="1"><variable id="footer_nextpage"><link href="text/swriter/guide/footer_nextpage.xhp" name="Inserting Page Numbers of Continuation Pages">Inserting Page Numbers of Continuation Pages</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154242" xml-lang="en-US" l10n="U" oldref="12">You can easily insert the page number of the next page in a footer by using a field.</paragraph>
-<paragraph role="paragraph" id="par_id3154256" xml-lang="en-US" l10n="U" oldref="4">The page number is only displayed if the following page exists.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Insert - Footer</emph> and select the page style that you want to add the footer to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147109" xml-lang="en-US" l10n="U" oldref="6">Place the cursor in the footer and choose <emph>Insert - Fields - Other</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147134" xml-lang="en-US" l10n="U" oldref="7">In the <emph>Fields</emph> dialog, click the <emph>Document</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150955" xml-lang="en-US" l10n="U" oldref="8">Click 'Page' in the <emph>Type</emph> list and 'Next page' in the <emph>Select</emph> list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150517" xml-lang="en-US" l10n="U" oldref="9">Click a numbering style in the <emph>Format </emph>list.</paragraph>
-<paragraph role="listitem" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="10">If you select 'Text' in the <emph>Format</emph> list, only the text that you enter in the <emph>Value</emph> box is displayed in the field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150727" xml-lang="en-US" l10n="U" oldref="11">Click <emph>Insert</emph> to insert the field with the page number.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/footer_pagenumber.xhp#footer_pagenumber"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154242" role="paragraph" l10n="U" oldref="12">You can easily insert the page number of the next page in a footer by using a field.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154256" role="paragraph" l10n="U" oldref="4">The page number is only displayed if the following page exists.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="U" oldref="5">Choose <emph>Insert - Footer</emph> and select the page style that you want to add the footer to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147109" role="listitem" l10n="U" oldref="6">Place the cursor in the footer and choose <emph>Insert - Fields - Other</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147134" role="listitem" l10n="U" oldref="7">In the <emph>Fields</emph> dialog, click the <emph>Document</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150955" role="listitem" l10n="U" oldref="8">Click 'Page' in the <emph>Type</emph> list and 'Next page' in the <emph>Select</emph> list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150517" role="listitem" l10n="U" oldref="9">Click a numbering style in the <item type="menuitem">Format</item>
+               <emph/>list.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150537" role="listitem" l10n="U" oldref="10">If you select 'Text' in the <emph>Format</emph> list, only the text that you enter in the <emph>Value</emph> box is displayed in the field.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150727" role="listitem" l10n="U" oldref="11">Click <emph>Insert</emph> to insert the field with the page number.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/footer_pagenumber.xhp#footer_pagenumber"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp b/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
index 1208e21487..1ade596d99 100755
--- a/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
+++ b/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footer_pagenumber.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,52 +27,49 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefooter_pagenumberxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Page Numbers in Footers</title>
-<filename>/text/swriter/guide/footer_pagenumber.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T09:45:09">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefooter_pagenumberxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Page Numbers in Footers</title>
+         <filename>/text/swriter/guide/footer_pagenumber.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155624"><bookmark_value>footers; with page numbers</bookmark_value>
-<bookmark_value>pages; numbers and count of</bookmark_value>
-<bookmark_value>page numbers; footers</bookmark_value>
-<bookmark_value>numbering;pages</bookmark_value>
+      <bookmark_value>pages; numbers and count of</bookmark_value>
+      <bookmark_value>page numbers; footers</bookmark_value>
+      <bookmark_value>numbering;pages</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155624" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="footer_pagenumber"><link href="text/swriter/guide/footer_pagenumber.xhp" name="Inserting Page Numbers in Footers">Inserting Page Numbers in Footers</link>
+<paragraph xml-lang="en-US" id="hd_id3155624" role="heading" level="1" l10n="U" oldref="1"><variable id="footer_pagenumber"><link href="text/swriter/guide/footer_pagenumber.xhp" name="Inserting Page Numbers in Footers">Inserting Page Numbers in Footers</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150508" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>Insert - Footer</emph> and select the page style that you want to add the footer to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150534" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Insert - Fields - Page Number</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153155" xml-lang="en-US" l10n="U" oldref="4">If you want, you can align the Page Number field as you would text.</paragraph>
-<paragraph role="paragraph" id="par_id3153169" xml-lang="en-US" l10n="U" oldref="5">You can also add a page count to the footer, for example, in the form "Page 9 of 12":</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155532" xml-lang="en-US" l10n="U" oldref="6">Click in front of the Page Number field and type "Page ", click after the field, enter a space and then type "of ".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155554" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Insert - Fields - Page Count</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/even_odd_sdw.xhp#even_odd_sdw"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id8230842" role="paragraph" l10n="NEW">You can easily insert a page number field in the footer of your document. You can also add a page count to the footer, for example, in the form "Page 9 of 12"</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7867366" role="heading" level="2" l10n="NEW">To Insert a Page Number</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150508" role="listitem" l10n="U" oldref="2">Choose <emph>Insert - Footer</emph> and select the page style that you want to add the footer to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150534" role="listitem" l10n="U" oldref="3">Choose <emph>Insert - Fields - Page Number</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153155" role="paragraph" l10n="U" oldref="4">If you want, you can align the page number field as you would text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2988677" role="heading" level="2" l10n="NEW">To Additionally Add a Page Count</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155532" role="listitem" l10n="U" oldref="6">Click in front of the page number field, type <item type="literal">Page</item> and enter a space; click after the field, enter a space and then type <item type="literal">of</item> and enter another space.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155554" role="listitem" l10n="U" oldref="7">Choose <emph>Insert - Fields - Page Count</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/even_odd_sdw.xhp#even_odd_sdw"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
index 1e1b9c6e47..c27dac09d1 100644
--- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,100 +32,94 @@
  
 	
 <meta>
-<topic id="textswriterguidefootnote_usagexml" indexer="include">
-<title id="tit" xml-lang="en-US">Inserting and Editing Footnotes or Endnotes</title>
-<filename>/text/swriter/guide/footnote_usage.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidefootnote_usagexml" indexer="include">
+         <title xml-lang="en-US" id="tit">Inserting and Editing Footnotes or Endnotes</title>
+         <filename>/text/swriter/guide/footnote_usage.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145819"><bookmark_value>endnotes;inserting and editing</bookmark_value>
-<bookmark_value>inserting;footnotes/endnotes</bookmark_value>
-<bookmark_value>deleting;footnotes</bookmark_value>
-<bookmark_value>editing;footnotes/endnotes</bookmark_value>
-<bookmark_value>organizing;footnotes</bookmark_value>
-<bookmark_value>footnotes; inserting and editing</bookmark_value>
+      <bookmark_value>inserting;footnotes/endnotes</bookmark_value>
+      <bookmark_value>deleting;footnotes</bookmark_value>
+      <bookmark_value>editing;footnotes/endnotes</bookmark_value>
+      <bookmark_value>organizing;footnotes</bookmark_value>
+      <bookmark_value>footnotes; inserting and editing</bookmark_value>
 </bookmark><comment>MW deleted "removing;.."</comment>
-<paragraph role="heading" id="hd_id3145819" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="footnote_usage"><link href="text/swriter/guide/footnote_usage.xhp" name="Inserting and Editing Footnotes or Endnotes">Inserting and Editing Footnotes or Endnotes</link>
+<paragraph xml-lang="en-US" id="hd_id3145819" role="heading" level="1" l10n="U"
+                 oldref="16"><variable id="footnote_usage"><link href="text/swriter/guide/footnote_usage.xhp" name="Inserting and Editing Footnotes or Endnotes">Inserting and Editing Footnotes or Endnotes</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154258" xml-lang="en-US" l10n="CHG" oldref="14">Footnotes reference more information about a topic at the bottom of a page and endnotes reference information at the end of the document. $[officename] automatically numbers the footnotes and endnotes.</paragraph>
-<paragraph role="heading" id="hd_id3155881" xml-lang="en-US" level="2" l10n="U" oldref="24">To insert a footnote or endnote:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155903" xml-lang="en-US" l10n="U" oldref="25">Click in your document where you want to place the anchor of the note.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147120" xml-lang="en-US" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote/Endnote</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150937" xml-lang="en-US" l10n="U" oldref="34">In the <emph>Numbering </emph>area, select the format that you want to use. If you select <emph>Character</emph>, click the browse button (<emph>...</emph>) and select the character that you want to use for the footnote.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150508" xml-lang="en-US" l10n="U" oldref="35">In the <emph>Type </emph>area, select <emph>Footnote </emph>or <emph>Endnote</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150704" xml-lang="en-US" l10n="U" oldref="36">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150729" xml-lang="en-US" l10n="U" oldref="37">Type the note.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3150745">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148843" xml-lang="en-US" l10n="E">
-<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt id="alt_id3148857" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153176" xml-lang="en-US" l10n="CHG" oldref="27">You can also insert footnotes by clicking the <emph>Insert Footnote Directly</emph> icon on the <emph>Insert</emph> toolbar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-<paragraph role="heading" id="hd_id3155543" xml-lang="en-US" level="2" l10n="U" oldref="28">Editing Footnotes or Endnotes</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155563" xml-lang="en-US" l10n="U" oldref="29">To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3155582">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150119" xml-lang="en-US" l10n="E">
-<image id="img_id3150126" src="res/helpimg/refhand.png" width="0.3335in" height="0.3335in"><alt id="alt_id3150126" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      <paragraph xml-lang="en-US" id="par_id3154258" role="paragraph" l10n="CHG" oldref="14">Footnotes reference more information about a topic at the bottom of a page and endnotes reference information at the end of the document. $[officename] automatically numbers the footnotes and endnotes.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155881" role="heading" level="2" l10n="U"
+                 oldref="24">To Insert a Footnote or Endnote</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155903" role="listitem" l10n="U" oldref="25">Click in your document where you want to place the anchor of the note.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147120" role="listitem" l10n="U" oldref="26">Choose <link href="text/swriter/01/04030000.xhp" name="Insert - Footnote"><emph>Insert - Footnote/Endnote</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150937" role="listitem" l10n="U" oldref="34">In the <item type="menuitem">Numbering</item>
+               <emph/>area, select the format that you want to use. If you select <item type="menuitem">Character</item>, click the browse button (<item type="menuitem">...</item>) and select the character that you want to use for the footnote.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150508" role="listitem" l10n="U" oldref="35">In the <item type="menuitem">Type</item>
+               <emph/>area, select <item type="menuitem">Footnote</item>
+               <emph/>or <item type="menuitem">Endnote</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150704" role="listitem" l10n="U" oldref="36">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150729" role="listitem" l10n="U" oldref="37">Type the note.</paragraph>
+         </listitem>
+      </list>
+      <table id="tbl_id3150745">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148843" role="paragraph" l10n="E">
+<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148857">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150167" xml-lang="en-US" l10n="U" oldref="6">The mouse pointer changes to a hand when you rest it over a footnote or endnote anchor in your document.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153176" role="paragraph" l10n="CHG" oldref="27">You can also insert footnotes by clicking the <emph>Insert Footnote Directly</emph> icon on the <emph>Insert</emph> toolbar.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145029" xml-lang="en-US" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press F11 to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145062" xml-lang="en-US" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press PageUp.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145081" xml-lang="en-US" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote/Endnote</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147776" xml-lang="en-US" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147813" xml-lang="en-US" l10n="U" oldref="15">To edit the properties of the text area for footnotes or endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147232" xml-lang="en-US" l10n="U" oldref="41">To remove a footnote, delete the footnote anchor in the text.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/footnote_with_line.xhp#footnote_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3155543" role="heading" level="2" l10n="U"
+                 oldref="28">To Edit a Footnote or Endnote</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150167" role="listitem" l10n="U" oldref="6">The mouse pointer changes to a hand when you rest it over a footnote or endnote anchor in your document.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155563" role="listitem" l10n="U" oldref="29">To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145029" role="listitem" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145062" role="listitem" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press PageUp.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145081" role="listitem" l10n="U" oldref="4">To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose <link href="text/swriter/01/02150000.xhp" name="Edit - Footnote"><emph>Edit - Footnote/Endnote</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147776" role="listitem" l10n="U" oldref="3">To change the formatting that $[officename] applies to footnotes and endnotes, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147813" role="listitem" l10n="U" oldref="15">To edit the properties of the text area for footnotes or endnotes, choose <emph>Format - Page</emph>, and then click the <link href="text/swriter/01/05040600.xhp" name="Footnote"><emph>Footnote</emph></link> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147232" role="listitem" l10n="U" oldref="41">To remove a footnote, delete the footnote anchor in the text.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/footnote_with_line.xhp#footnote_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp b/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
index 985efbf1a1..52e105c355 100755
--- a/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footnote_with_line.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,65 +27,66 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidefootnote_with_linexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spacing Between Footnotes</title>
-<filename>/text/swriter/guide/footnote_with_line.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T14:25:10">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidefootnote_with_linexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Spacing Between Footnotes</title>
+         <filename>/text/swriter/guide/footnote_with_line.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147683"><bookmark_value>spacing; endnotes/footnotes</bookmark_value>
-<bookmark_value>endnotes; spacing</bookmark_value>
-<bookmark_value>footnotes; spacing</bookmark_value>
-<bookmark_value>borders;for footnotes/endnotes</bookmark_value>
-<bookmark_value>lines;footnotes/endnotes</bookmark_value>
+      <bookmark_value>endnotes; spacing</bookmark_value>
+      <bookmark_value>footnotes; spacing</bookmark_value>
+      <bookmark_value>borders;for footnotes/endnotes</bookmark_value>
+      <bookmark_value>lines;footnotes/endnotes</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147683" xml-lang="en-US" level="1" l10n="U" oldref="40"><variable id="footnote_with_line"><link href="text/swriter/guide/footnote_with_line.xhp" name="Spacing Between Footnotes">Spacing Between Footnotes</link>
+<paragraph xml-lang="en-US" id="hd_id3147683" role="heading" level="1" l10n="U"
+                 oldref="40"><variable id="footnote_with_line"><link href="text/swriter/guide/footnote_with_line.xhp" name="Spacing Between Footnotes">Spacing Between Footnotes</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145808" xml-lang="en-US" l10n="U" oldref="39">If you want to increase the spacing between footnote or endnote texts, you can add a top and bottom border to the corresponding paragraph style.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="41">Click in a footnote or endnote.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="42">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154251" xml-lang="en-US" l10n="U" oldref="43">Right-click the Paragraph Style that you want to modify, for example, "Footnote", and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155884" xml-lang="en-US" l10n="U" oldref="45">Click the <link href="text/shared/01/05030500.xhp" name="Borders"><emph>Borders</emph></link> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147110" xml-lang="en-US" l10n="U" oldref="51">In the <emph>Default </emph>area, click the <emph>Set Top and Bottom Borders Only</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="52">In the <emph>Line</emph> area, click a line in the <emph>Style </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150961" xml-lang="en-US" l10n="U" oldref="53">Select "White" in the <emph>Color </emph>box. If the background of the page is not white, select the color that best matches the background color.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="50">In the <emph>Spacing to contents</emph> area, clear the <emph>Synchronize</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150709" xml-lang="en-US" l10n="U" oldref="47">Enter a value in the <emph>Top </emph>and <emph>Bottom </emph>boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150740" xml-lang="en-US" l10n="U" oldref="48">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/footnote_usage.xhp#footnote_usage"/>
-<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="49"><link href="text/shared/01/05030500.xhp" name="Format - Paragraph - Borders">Format - Paragraph - Borders</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145808" role="paragraph" l10n="U" oldref="39">If you want to increase the spacing between footnote or endnote texts, you can add a top and bottom border to the corresponding paragraph style.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155603" role="listitem" l10n="U" oldref="41">Click in a footnote or endnote.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155620" role="listitem" l10n="U" oldref="42">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154251" role="listitem" l10n="U" oldref="43">Right-click the Paragraph Style that you want to modify, for example, "Footnote", and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155884" role="listitem" l10n="U" oldref="45">Click the <link href="text/shared/01/05030500.xhp" name="Borders"><emph>Borders</emph></link> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147110" role="listitem" l10n="U" oldref="51">In the <item type="menuitem">Default</item>
+               <emph/>area, click the <item type="menuitem">Set Top and Bottom Borders Only</item> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150931" role="listitem" l10n="U" oldref="52">In the <item type="menuitem">Line</item> area, click a line in the <item type="menuitem">Style</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150961" role="listitem" l10n="U" oldref="53">Select "White" in the <item type="menuitem">Color</item>
+               <emph/>box. If the background of the page is not white, select the color that best matches the background color.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150519" role="listitem" l10n="U" oldref="50">In the <emph>Spacing to contents</emph> area, clear the <emph>Synchronize</emph> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150709" role="listitem" l10n="U" oldref="47">Enter a value in the <item type="menuitem">Top</item>
+               <emph/>and <item type="menuitem">Bottom</item>
+               <emph/>boxes.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150740" role="listitem" l10n="U" oldref="48">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/footnote_usage.xhp#footnote_usage"/>
+      <paragraph xml-lang="en-US" id="par_id3148846" role="paragraph" l10n="U" oldref="49"><link href="text/shared/01/05030500.xhp" name="Format - Paragraph - Borders">Format - Paragraph - Borders</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
index ac7298c5eb..b3a90819ed 100755
--- a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
+++ b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: form_letters_main.xhp,v $
- * $Revision: 1.11.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,53 +32,55 @@
  
 	
 <meta>
-<topic id="textswriterguideform_letters_mainxml" indexer="include">
-<title id="tit" xml-lang="en-US">Creating a Form Letter</title>
-<filename>/text/swriter/guide/form_letters_main.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3159257"><bookmark_value>form letters</bookmark_value>
-<bookmark_value>mail merge</bookmark_value>
-<bookmark_value>letters; creating form letters</bookmark_value>
-<bookmark_value>wizards;form letters</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3159257" xml-lang="en-US" level="1" l10n="U" oldref="29"><variable id="form_letters"><variable id="form_letters_main"><link href="text/swriter/guide/form_letters_main.xhp" name="Creating a Form Letter">Creating a Form Letter</link>
+      <topic id="textswriterguideform_letters_mainxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Creating a Form Letter</title>
+         <filename>/text/swriter/guide/form_letters_main.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3159257"><bookmark_value>serial letters</bookmark_value>
+      <bookmark_value>form letters</bookmark_value>
+      <bookmark_value>mail merge</bookmark_value>
+      <bookmark_value>letters; creating form letters</bookmark_value>
+      <bookmark_value>wizards;form letters</bookmark_value>
+</bookmark><comment>mw added "serial letters"</comment>
+<paragraph xml-lang="en-US" id="hd_id3159257" role="heading" level="1" l10n="U"
+                 oldref="29"><variable id="form_letters"><variable id="form_letters_main"><link href="text/swriter/guide/form_letters_main.xhp" name="Creating a Form Letter">Creating a Form Letter</link>
 </variable>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="CHG" oldref="1">To create a form letter, you need a text document that contains fields for address data, and an address database. Then you combine or merge the address data and the text document to either print the letters or send them by e-mail.</paragraph>
-<paragraph role="note" id="par_id0805200801132382" xml-lang="en-US" l10n="NEW">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph>
-<paragraph role="paragraph" id="par_idN10653" xml-lang="en-US" l10n="NEW">The <link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> helps you to create form letters.</paragraph>
-<paragraph role="heading" id="par_idN10664" xml-lang="en-US" level="2" l10n="NEW">To create a form letter</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1066B" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Mail Merge Wizard</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10672" xml-lang="en-US" l10n="NEW">You see the Mail Merge Wizard dialog. The following is an example of one of many possible ways to navigate the wizard's pages:</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10676" xml-lang="en-US" l10n="NEW">Select <emph>Start from a template</emph>, and click the <emph>Browse</emph> button.</paragraph>
-<paragraph role="paragraph" id="par_idN10681" xml-lang="en-US" l10n="NEW">You see the Templates dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="CHG">Select <item type="literal">Business Correspondence</item> in the left list, and then <item type="literal">Modern letter</item> in the right list. Click <emph>OK</emph> to close the Templates dialog, and click <emph>Next</emph> in the wizard.<comment>removed the next two paras</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2669759" xml-lang="en-US" l10n="NEW">Select <emph>Letter</emph> and click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106BD" xml-lang="en-US" l10n="CHG">On the next step of the wizard, click the <emph>Select Address List</emph> button to check that you are using the correct address list. Select an address block type, match the data fields if necessary, and click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Next follows the <emph>Create a salutation</emph> step. Deselect the <emph>Insert personalized salutation</emph> box. Under <emph>General salutation</emph>, select the salutation that you want on top of all letters.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106D5" xml-lang="en-US" l10n="CHG">Click <emph>Next</emph> and finally <emph>Finish</emph> to create the mail merge.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/01/01010100.xhp#vor_und_dok"/>
-<embed href="text/swriter/guide/fields.xhp#fields"/>
-<embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="1">To create a form letter, you need a text document that contains fields for address data, and an address database. Then you combine or merge the address data and the text document to either print the letters or send them by e-mail.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0805200801132382" role="note" l10n="NEW">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10653" role="paragraph" l10n="NEW">The <link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> helps you to create form letters.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10664" role="heading" level="1" l10n="NEW">To create a form letter</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1066B" role="paragraph" l10n="NEW">Choose <emph>Tools - Mail Merge Wizard</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10672" role="paragraph" l10n="NEW">You see the Mail Merge Wizard dialog. The following is an example of one of many possible ways to navigate the wizard's pages:</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10676" role="paragraph" l10n="NEW">Select <emph>Start from a template</emph>, and click the <emph>Browse</emph> button.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10681" role="paragraph" l10n="CHG">You see the <emph>New</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10685" role="paragraph" l10n="CHG">Select <item type="literal">Business Correspondence</item> in the left list, and then <item type="literal">Modern letter</item> in the right list. Click <emph>OK</emph> to close the Templates dialog, and click <emph>Next</emph> in the wizard.<comment>removed the next two paras</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2669759" role="paragraph" l10n="NEW">Select <emph>Letter</emph> and click <emph>Next</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106BD" role="paragraph" l10n="CHG">On the next step of the wizard, click the <emph>Select Address List</emph> button to check that you are using the correct address list. Select an address block type, match the data fields if necessary, and click <emph>Next</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="NEW">Next follows the <emph>Create a salutation</emph> step. Deselect the <emph>Insert personalized salutation</emph> box. Under <emph>General salutation</emph>, select the salutation that you want on top of all letters.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="CHG">Click <emph>Next</emph> and finally <emph>Finish</emph> to create the mail merge.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/01/01010100.xhp#vor_und_dok"/>
+      <embed href="text/swriter/guide/fields.xhp#fields"/>
+      <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
+      <embed href="text/shared/guide/database_main.xhp#database_main"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/globaldoc.xhp b/helpcontent2/source/text/swriter/guide/globaldoc.xhp
index 94dab774e1..9f9a6c335e 100644
--- a/helpcontent2/source/text/swriter/guide/globaldoc.xhp
+++ b/helpcontent2/source/text/swriter/guide/globaldoc.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globaldoc.xhp,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,52 +29,53 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideglobaldocxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Master Documents and Subdocuments</title>
-<filename>/text/swriter/guide/globaldoc.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideglobaldocxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Master Documents and Subdocuments</title>
+         <filename>/text/swriter/guide/globaldoc.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145246"><bookmark_value>master documents;properties</bookmark_value>
-<bookmark_value>subdocuments;properties</bookmark_value>
-<bookmark_value>central documents</bookmark_value>
-<bookmark_value>subsidiary documents</bookmark_value>
-<bookmark_value>documents; master documents and subdocuments</bookmark_value>
-<bookmark_value>styles;master documents</bookmark_value>
-</bookmark><comment>Mw made "master documents" and "subdocuments" a two level entry, deleted "references;" and "bookmarks;" and added a new entry and shifted "Navigator;" and "indexes;" to the file globaldoc_howtos.xhp</comment><paragraph role="heading" id="hd_id3145246" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="globaldoc"><link href="text/swriter/guide/globaldoc.xhp">Master Documents and Subdocuments</link>
-</variable></paragraph><comment>MW: This file was split into globaldoc.xhp (concepts) and globaldoc_howtos.xhp (procedures)</comment><paragraph role="paragraph" id="par_id3149806" xml-lang="en-US" l10n="CHG">A master document lets you manage large documents, such as a book with many chapters. The master document can be seen as a container for individual <item type="productname">%PRODUCTNAME</item> Writer files. The individual files are called subdocuments.</paragraph>
-<paragraph role="heading" id="hd_id6537369" xml-lang="en-US" level="2" l10n="NEW">Characteristics of Master Documents</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3150096" xml-lang="en-US" l10n="U" oldref="13">When you print a master document, the contents of all subdocuments, indexes, and any text that you entered are printed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153400" xml-lang="en-US" l10n="U" oldref="12">You can create a table of contents and index in the master document for all of the subdocuments.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3155854" xml-lang="en-US" l10n="CHG" oldref="15">Styles that are used in subdocuments, such as new paragraph styles, are automatically imported into the master document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9033783" xml-lang="en-US" l10n="NEW">When viewing the master document, styles that are already present in the master document take precedence over styles with the same name that are imported from subdocuments. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3419598" xml-lang="en-US" l10n="NEW">Subdocuments never get changed by changes made to the master document.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3155180" xml-lang="en-US" l10n="C">When you add a document to a master document or create a new subdocument, a link is created in the master document. You cannot edit the content of a subdocument directly in the master document, but you can use the Navigator to open any subdocument for edit.</paragraph>
-<paragraph role="heading" id="hd_id7904904" xml-lang="en-US" level="2" l10n="NEW">Example of using styles</paragraph>
-<paragraph role="paragraph" id="par_id5817743" xml-lang="en-US" l10n="NEW">A master document master.odm consists of some text and links to the subdocuments sub1.odt and sub2.odt. In each subdocument a new paragraph style with the same name Style1 is defined and used, and the subdocuments are saved.</paragraph>
-<paragraph role="paragraph" id="par_id9169591" xml-lang="en-US" l10n="NEW">When you save the master document, the styles from the subdocuments are imported into the master document. First, the new style Style1 from the sub1.odt is imported. Next, the new styles from sub2.odt will be imported, but as Style1 now already is present in the master document, this style from sub2.odt will not be imported. </paragraph>
-<paragraph role="paragraph" id="par_id1590014" xml-lang="en-US" l10n="NEW">In the master document you now see the new style Style1 from the first subdocument. All Style1 paragraphs in the master document will be shown using the Style1 attributes from the first subdocument. However, the second subdocument by itself will not be changed. You see the Style1 paragraphs from the second subdocument with different attributes, depending whether you open the sub2.odt document by itself or as part of the master document.</paragraph>
-<paragraph role="tip" id="par_id5878780" xml-lang="en-US" l10n="NEW">To avoid confusion, use the same document template for the master document and its subdocuments. This happens automatically when you create the master document and its subdocuments from an existing document with headings, using the command <emph>File - Send - Create Master Document</emph>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/globaldoc_howtos.xhp#globaldoc_howtos"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-<paragraph role="paragraph" id="par_id3154382" xml-lang="en-US" l10n="C"><link href="text/shared/01/02110000.xhp" name="Navigator in master mode">Navigator in master mode</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <bookmark_value>subdocuments;properties</bookmark_value>
+      <bookmark_value>central documents</bookmark_value>
+      <bookmark_value>subsidiary documents</bookmark_value>
+      <bookmark_value>documents; master documents and subdocuments</bookmark_value>
+      <bookmark_value>styles;master documents</bookmark_value>
+</bookmark><comment>Mw made "master documents" and "subdocuments" a two level entry, deleted "references;" and "bookmarks;" and added a new entry and shifted "Navigator;" and "indexes;" to the file globaldoc_howtos.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3145246" role="heading" level="1" l10n="U" oldref="4"><variable id="globaldoc"><link href="text/swriter/guide/globaldoc.xhp">Master Documents and Subdocuments</link>
+</variable></paragraph><comment>MW: This file was split into globaldoc.xhp (concepts) and globaldoc_howtos.xhp (procedures)</comment>
+<paragraph xml-lang="en-US" id="par_id3149806" role="paragraph" l10n="CHG">A master document lets you manage large documents, such as a book with many chapters. The master document can be seen as a container for individual <item type="productname">%PRODUCTNAME</item> Writer files. The individual files are called subdocuments.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6537369" role="heading" level="2" l10n="NEW">Characteristics of Master Documents</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150096" role="paragraph" l10n="U" oldref="13">When you print a master document, the contents of all subdocuments, indexes, and any text that you entered are printed.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153400" role="paragraph" l10n="U" oldref="12">You can create a table of contents and index in the master document for all of the subdocuments.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="paragraph" l10n="CHG" oldref="15">Styles that are used in subdocuments, such as new paragraph styles, are automatically imported into the master document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9033783" role="paragraph" l10n="NEW">When viewing the master document, styles that are already present in the master document take precedence over styles with the same name that are imported from subdocuments. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3419598" role="paragraph" l10n="NEW">Subdocuments never get changed by changes made to the master document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155180" role="note" l10n="C">When you add a document to a master document or create a new subdocument, a link is created in the master document. You cannot edit the content of a subdocument directly in the master document, but you can use the Navigator to open any subdocument for edit.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7904904" role="heading" level="2" l10n="NEW">Example of Using Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5817743" role="paragraph" l10n="NEW">A master document master.odm consists of some text and links to the subdocuments sub1.odt and sub2.odt. In each subdocument a new paragraph style with the same name Style1 is defined and used, and the subdocuments are saved.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9169591" role="paragraph" l10n="NEW">When you save the master document, the styles from the subdocuments are imported into the master document. First, the new style Style1 from the sub1.odt is imported. Next, the new styles from sub2.odt will be imported, but as Style1 now already is present in the master document, this style from sub2.odt will not be imported. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id1590014" role="paragraph" l10n="NEW">In the master document you now see the new style Style1 from the first subdocument. All Style1 paragraphs in the master document will be shown using the Style1 attributes from the first subdocument. However, the second subdocument by itself will not be changed. You see the Style1 paragraphs from the second subdocument with different attributes, depending whether you open the sub2.odt document by itself or as part of the master document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5878780" role="tip" l10n="NEW">To avoid confusion, use the same document template for the master document and its subdocuments. This happens automatically when you create the master document and its subdocuments from an existing document with headings, using the command <emph>File - Send - Create Master Document</emph>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/globaldoc_howtos.xhp#globaldoc_howtos"/>
+         <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+         <paragraph xml-lang="en-US" id="par_id3154382" role="paragraph" l10n="C"><link href="text/shared/01/02110000.xhp" name="Navigator in master mode">Navigator in master mode</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp b/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
index 4def29c46f..38d8de329d 100644
--- a/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
+++ b/helpcontent2/source/text/swriter/guide/globaldoc_howtos.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globaldoc_howtos.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,143 +29,135 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideglobaldoc_howtosxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Working with Master Documents and Subdocuments</title>
-<filename>/text/swriter/guide/globaldoc_howtos.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideglobaldoc_howtosxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Working with Master Documents and Subdocuments</title>
+         <filename>/text/swriter/guide/globaldoc_howtos.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145246"><bookmark_value>Navigator;master documents</bookmark_value>
-<bookmark_value>master documents;creating/editing/exporting</bookmark_value>
-<bookmark_value>subdocuments;starting on new pages</bookmark_value>
-<bookmark_value>subdocuments;removing from master documents</bookmark_value>
-<bookmark_value>removing;subdocuments</bookmark_value>
-<bookmark_value>indexes; master documents</bookmark_value>
-</bookmark><comment>MW created 4 new index entries. 2 index entries were taken from globaldoc.xhp.</comment><paragraph role="heading" id="hd_id3145246" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="globaldoc_howtos"><link href="text/swriter/guide/globaldoc_howtos.xhp">Working with Master Documents and Subdocuments</link>
-</variable></paragraph><comment>MW: this is a new guide created from splitting globaldoc.xhp</comment><paragraph role="paragraph" id="par_id1522873" xml-lang="en-US" l10n="NEW">A master document lets you manage large documents, such as a book with many chapters. The master document can be seen as a container for individual <item type="productname">%PRODUCTNAME</item> Writer files. The individual files are called subdocuments.</paragraph>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="2" l10n="U" oldref="29">To Create a Master Document: </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149634" xml-lang="en-US" l10n="U" oldref="30">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>File - New - Master Document</emph>.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149612" xml-lang="en-US" l10n="U" oldref="32">Open an existing document and choose <emph>File - Send - Create Master Document</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="listitem" id="par_id3149873" xml-lang="en-US" l10n="CHG" oldref="28">If you are creating a new master document, the first entry in the Navigator should be a <emph>Text </emph>entry. Type an introduction or enter some text. This ensures that after you edit an existing style in the master document, you see the changed style when viewing the subdocuments.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145114" xml-lang="en-US" l10n="CHG" oldref="33">In the <emph>Navigator</emph> for master documents (should open automatically, else press F5 to open), click and hold the <emph>Insert </emph>icon, and do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="34">To insert an existing file as a subdocument, choose <emph>File</emph>, locate the file that you want to include, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145405" xml-lang="en-US" l10n="U" oldref="35">To create a new subdocument, choose <emph>New Document</emph>, type a name for the file, and then click <emph>Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id8550981" xml-lang="en-US" l10n="CHG">To insert some text between subdocuments, choose <emph>Text</emph>. Then type the text. You cannot insert text next to an existing text entry in the Navigator.<comment>i81372</comment></paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3153382" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>File - Save</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154242" xml-lang="en-US" level="2" l10n="U" oldref="37">To Edit a Master Document:</paragraph>
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="20">Use the Navigator for rearranging and editing the subdocuments in a master document.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155879" xml-lang="en-US" l10n="CHG" oldref="38">To open a subdocument for editing, double-click the name of the subdocument in the Navigator.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155931" xml-lang="en-US" l10n="CHG" oldref="39">To remove a subdocument from the master document, right-click the subdocument in the Navigator list and choose <emph>Delete</emph>. The subdocument file is not deleted, only the entry in the Navigator is removed.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148677" xml-lang="en-US" l10n="CHG" oldref="8">To add text to a master document, right-click an item in the Navigator list, and then choose <emph>Insert - Text</emph>. A text section is inserted before the selected item in the master document where you can type the text that you want. You cannot insert text next to an existing text entry in the Navigator.<comment>i81372</comment></paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149982" xml-lang="en-US" l10n="U" oldref="10">To reorder the subdocuments in a master document, drag a subdocument to a new location in the Navigator list. You can also select a subdocument in the list, and click the <emph>Move down</emph> or <emph>Move up </emph>icon.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153022" xml-lang="en-US" l10n="CHG" oldref="40">To add an index, such as a table of contents, right-click in the Navigator list, and then choose <emph>Insert - Index</emph>.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3154206">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148949" xml-lang="en-US" l10n="E">
-<image id="img_id3148959" src="sw/imglst/sc20246.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148959" xml-lang="en-US">Icon</alt>
+      <bookmark_value>master documents;creating/editing/exporting</bookmark_value>
+      <bookmark_value>subdocuments;creating/editing/removing</bookmark_value>
+      <bookmark_value>removing;subdocuments</bookmark_value>
+      <bookmark_value>indexes; master documents</bookmark_value>
+</bookmark><comment>MW created 4 new index entries. 2 index entries were taken from globaldoc.xhp.</comment><comment>MW made one index entry out of 2 "subdocuments;" entries</comment>
+<paragraph xml-lang="en-US" id="hd_id3145246" role="heading" level="1" l10n="U" oldref="4"><variable id="globaldoc_howtos"><link href="text/swriter/guide/globaldoc_howtos.xhp">Working with Master Documents and Subdocuments</link>
+</variable></paragraph><comment>MW: this is a new guide created from splitting globaldoc.xhp</comment>
+<paragraph xml-lang="en-US" id="par_id1522873" role="paragraph" l10n="NEW">A master document lets you manage large documents, such as a book with many chapters. The master document can be seen as a container for individual <item type="productname">%PRODUCTNAME</item> Writer files. The individual files are called subdocuments.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153127" role="heading" level="2" l10n="U"
+                 oldref="29">To Create a Master Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149634" role="listitem" l10n="U" oldref="30">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="unordered"/>
+      <list type="ordered" startwith="2">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149873" role="listitem" l10n="CHG" oldref="28">If you are creating a new master document, the first entry in the Navigator should be a <item type="menuitem">Text</item>
+               <emph/>entry. Type an introduction or enter some text. This ensures that after having edited an existing style in the master document, you see the changed style when viewing the subdocuments.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145114" role="listitem" l10n="CHG" oldref="33">In the <item type="menuitem">Navigator</item> for master documents (should open automatically, else press F5 to open), click and hold the <item type="menuitem">Insert</item>
+               <emph/>icon, and do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="unordered"/>
+      <list type="ordered" startwith="4">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153382" role="listitem" l10n="U" oldref="36">Choose <emph>File - Save</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154242" role="heading" level="2" l10n="U"
+                 oldref="37">To Edit a Master Document</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="20">Use the Navigator for rearranging and editing the subdocuments in a master document.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155879" role="listitem" l10n="CHG" oldref="38">To open a subdocument for editing, double-click the name of the subdocument in the Navigator.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155931" role="listitem" l10n="CHG" oldref="39">To remove a subdocument from the master document, right-click the subdocument in the Navigator list and choose <emph>Delete</emph>. The subdocument file is not deleted, only the entry in the Navigator is removed.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148677" role="listitem" l10n="CHG" oldref="8">To add text to a master document, right-click an item in the Navigator list, and then choose <emph>Insert - Text</emph>. A text section is inserted before the selected item in the master document where you can type the text that you want. You cannot insert text next to an existing text entry in the Navigator.<comment>i81372</comment></paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149982" role="listitem" l10n="U" oldref="10">To reorder the subdocuments in a master document, drag a subdocument to a new location in the Navigator list. You can also select a subdocument in the list, and click the <item type="menuitem">Move down</item> or <item type="menuitem">Move up</item>
+               <emph/>icon.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153022" role="listitem" l10n="CHG" oldref="40">To add an index, such as a table of contents, right-click in the Navigator list, and then choose <emph>Insert - Index</emph>.</paragraph>
+         </listitem>
+      </list>
+      <table id="tbl_id3154206">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148949" role="paragraph" l10n="E">
+<image id="img_id3148959" src="sw/imglst/sc20246.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3148959">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="21">To update an index in a master document, select the index in the Navigator, and then click the <emph>Update</emph> icon.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="note" id="par_idN10C40" xml-lang="en-US" l10n="NEW">When you insert an object like a frame or a picture into a master document, do not anchor the object "to page". Instead, set the anchor "to paragraph" on the <emph>Format - (Object type) - Type</emph> tab page, and then set the object's position relative to "Entire Page" in the <emph>Horizontal</emph> and <emph>Vertical</emph> list boxes.</paragraph>
-<paragraph role="heading" id="hd_id3153656" xml-lang="en-US" level="3" l10n="U" oldref="41">To Start Each Subdocument on a New Page:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152760" xml-lang="en-US" l10n="U" oldref="42">Ensure that each subdocument starts with a heading that uses the same paragraph style, for example "Heading 1".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="43">In the master document, choose <emph>Format - Styles and Formatting</emph>, and click the <emph>Paragraph Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153907" xml-lang="en-US" l10n="U" oldref="44">Right-click "Heading 1" and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="45">Click the <emph>Text Flow </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149770" xml-lang="en-US" l10n="CHG" oldref="46">In the <emph>Breaks </emph>area, select <emph>Insert</emph>, and then select <emph>Page </emph>in the <emph>Type </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="17">If you want each subdocument to start on an odd page, select <emph>With Page Style</emph>, and select "Right page" in the box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145205" xml-lang="en-US" l10n="U" oldref="47">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145228" xml-lang="en-US" level="3" l10n="CHG" oldref="48">To Export a Master Document as a <item type="productname">%PRODUCTNAME</item> Text Document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150315" xml-lang="en-US" l10n="U" oldref="49">Choose <item type="menuitem">File - Export</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148580" xml-lang="en-US" l10n="U" oldref="50">In the <emph>File format</emph> list, select a text document file format and click <emph>Export</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id8371227" xml-lang="en-US" l10n="NEW">The subdocuments will be exported as sections. Use <item type="menuitem">Format - Sections</item> to unprotect and remove sections, if you prefer a plain text document without sections.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-<paragraph role="paragraph" id="par_id3154382" xml-lang="en-US" l10n="C"><link href="text/shared/01/02110000.xhp" name="Navigator in master mode">Navigator in master mode</link></paragraph>
-</section>
-</body>
-</helpdocument>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="21">To update an index in a master document, select the index in the Navigator, and then click the <emph>Update</emph> icon.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="par_idN10C40" role="note" l10n="NEW">When you insert an object like a frame or a picture into a master document, do not anchor the object "to page". Instead, set the anchor "to paragraph" on the <emph>Format - (Object type) - Type</emph> tab page, and then set the object's position relative to "Entire Page" in the <emph>Horizontal</emph> and <emph>Vertical</emph> list boxes.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153656" role="heading" level="3" l10n="U"
+                 oldref="41">To Start Each Subdocument on a New Page</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152760" role="listitem" l10n="U" oldref="42">Ensure that each subdocument starts with a heading that uses the same paragraph style, for example "Heading 1".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153876" role="listitem" l10n="U" oldref="43">In the master document, choose <emph>Format - Styles and Formatting</emph>, and click the <emph>Paragraph Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153907" role="listitem" l10n="U" oldref="44">Right-click "Heading 1" and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147124" role="listitem" l10n="U" oldref="45">Click the <item type="menuitem">Text Flow</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149770" role="listitem" l10n="CHG" oldref="46">In the <item type="menuitem">Breaks</item>
+               <emph/>area, select <item type="menuitem">Insert</item>, and then select “Page”<emph/>in the <item type="menuitem">Type</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150224" role="listitem" l10n="U" oldref="17">If you want each subdocument to start on an odd page, select <emph>With Page Style</emph>, and select "Right page" in the box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145205" role="listitem" l10n="U" oldref="47">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="3" l10n="CHG"
+                 oldref="48">To Export a Master Document as a <item type="productname">%PRODUCTNAME</item> Text Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150315" role="listitem" l10n="U" oldref="49">Choose <item type="menuitem">File - Export</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148580" role="listitem" l10n="U" oldref="50">In the <emph>File format</emph> list, select a text document file format and click <emph>Export</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8371227" role="note" l10n="NEW">The subdocuments will be exported as sections. Use <item type="menuitem">Format - Sections</item> to unprotect and remove sections, if you prefer a plain text document without sections.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+         <paragraph xml-lang="en-US" id="par_id3154382" role="paragraph" l10n="C"><link href="text/shared/01/02110000.xhp" name="Navigator in master mode">Navigator in master mode</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/header_footer.xhp b/helpcontent2/source/text/swriter/guide/header_footer.xhp
index 1c2cae78e2..c09957bfd6 100644
--- a/helpcontent2/source/text/swriter/guide/header_footer.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_footer.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: header_footer.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,53 +29,53 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideheader_footerxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">About Headers and Footers</title>
-<filename>/text/swriter/guide/header_footer.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T15:27:24">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideheader_footerxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">About Headers and Footers</title>
+         <filename>/text/swriter/guide/header_footer.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155863"><bookmark_value>headers;about</bookmark_value>
-<bookmark_value>footers;about</bookmark_value>
-<bookmark_value>HTML documents; headers and footers</bookmark_value>
+      <bookmark_value>footers;about</bookmark_value>
+      <bookmark_value>HTML documents; headers and footers</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155863" xml-lang="en-US" level="1" l10n="U" oldref="38"><variable id="header_footer"><link href="text/swriter/guide/header_footer.xhp" name="About Headers and Footers">About Headers and Footers</link>
+<paragraph xml-lang="en-US" id="hd_id3155863" role="heading" level="1" l10n="U"
+                 oldref="38"><variable id="header_footer"><link href="text/swriter/guide/header_footer.xhp" name="About Headers and Footers">About Headers and Footers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="35">Headers and footers are areas in the top and the bottom page margins, where you can add text or graphics. Headers and footers are added to the current page style. Any page that uses the same style automatically receives the header or footer that you add. You can insert <link href="text/swriter/01/04090000.xhp" name="Fields">Fields</link>, such as page numbers and chapter headings, in headers and footers in a text document.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="39">To add a header to a page, choose <emph>Insert - Header</emph>, and then select the page style for the current page from the submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147119" xml-lang="en-US" l10n="U" oldref="43">To add a footer to a page, choose <emph>Insert - Footer</emph>, and then select the page style for the current page from the submenu.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3150511" xml-lang="en-US" l10n="U" oldref="44">The page style for the current page is displayed in the <emph>Status Bar</emph>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="40">You can also choose <emph>Format - Page</emph>, click the <emph>Header</emph> or <emph>Footer </emph>tab, and then select <emph>Header on </emph>or <emph>Footer on</emph>. Clear the <emph>Same content left/right</emph> check box if you want to define different headers and footers for even and odd pages.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146876" xml-lang="en-US" l10n="U" oldref="36">To use different headers or footers in your document, you must add them to different <link href="text/swriter/guide/header_pagestyles.xhp" name="Page Styles">Page Styles</link>, and then apply the styles to the pages where you want the headers or footer to appear.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150704" xml-lang="en-US" level="2" l10n="U" oldref="41">Headers and Footers in HTML Documents</paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="CHG" oldref="34">Some of the header and footer options are also available for HTML documents. Headers and footers are not supported by HTML and instead are exported with special tags, so that they can be viewed in a browser. Headers and footers are only exported in HTML documents if they are enabled in Web Layout mode. When you reopen the document in $[officename], the headers and footers are displayed correctly, including any fields that you inserted. </paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="C"><link href="text/swriter/guide/header_pagestyles.xhp" name="Page Styles">Page Styles</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="35">Headers and footers are areas in the top and the bottom page margins, where you can add text or graphics. Headers and footers are added to the current page style. Any page that uses the same style automatically receives the header or footer that you add. You can insert <link href="text/swriter/01/04090000.xhp" name="Fields">Fields</link>, such as page numbers and chapter headings, in headers and footers in a text document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150511" role="note" l10n="U" oldref="44">The page style for the current page is displayed in the <emph>Status Bar</emph>.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155896" role="listitem" l10n="U" oldref="39">To add a header to a page, choose <emph>Insert - Header</emph>, and then select the page style for the current page from the submenu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147119" role="listitem" l10n="U" oldref="43">To add a footer to a page, choose <emph>Insert - Footer</emph>, and then select the page style for the current page from the submenu.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153726" role="listitem" l10n="U" oldref="40">You can also choose <item type="menuitem">Format - Page</item>, click the <item type="menuitem">Header</item> or <item type="menuitem">Footer</item>
+               <emph/>tab, and then select <item type="menuitem">Header on</item>
+               <emph/>or <item type="menuitem">Footer on</item>. Clear the <item type="menuitem">Same content left/right</item> check box if you want to define different headers and footers for even and odd pages.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146876" role="listitem" l10n="U" oldref="36">To use different headers or footers in your document, you must add them to different <link href="text/swriter/guide/header_pagestyles.xhp" name="Page Styles">Page Styles</link>, and then apply the styles to the pages where you want the headers or footer to appear.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150704" role="heading" level="2" l10n="U"
+                 oldref="41">Headers and Footers in HTML Documents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="CHG" oldref="34">Some of the header and footer options are also available for HTML documents. Headers and footers are not supported by HTML and instead are exported with special tags, so that they can be viewed in a browser. Headers and footers are only exported in HTML documents if they are enabled in Web Layout mode. When you reopen the document in $[officename], the headers and footers are displayed correctly, including any fields that you inserted. </paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+         <embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
+         <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+         <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+         <paragraph xml-lang="en-US" id="par_id3153174" role="paragraph" l10n="C"><link href="text/swriter/guide/header_pagestyles.xhp" name="Page Styles">Page Styles</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp b/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
index de4cf45256..2d5b51411b 100755
--- a/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: header_pagestyles.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,81 +27,86 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideheader_pagestylesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Different Headers and Footers</title>
-<filename>/text/swriter/guide/header_pagestyles.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-19T14:13:16">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideheader_pagestylesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Different Headers and Footers</title>
+         <filename>/text/swriter/guide/header_pagestyles.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155920"><bookmark_value>headers;defining for left and right pages</bookmark_value>
-<bookmark_value>footers;defining for left and right pages</bookmark_value>
-<bookmark_value>page styles; changing</bookmark_value>
-<bookmark_value>defining; headers/footers</bookmark_value>
-<bookmark_value>mirrored page layout</bookmark_value>
+      <bookmark_value>footers;defining for left and right pages</bookmark_value>
+      <bookmark_value>page styles; changing</bookmark_value>
+      <bookmark_value>defining; headers/footers</bookmark_value>
+      <bookmark_value>mirrored page layout</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155920" xml-lang="en-US" level="1" l10n="U" oldref="25"><variable id="header_pagestyles"><link href="text/swriter/guide/header_pagestyles.xhp" name="Defining Different Headers and Footers">Defining Different Headers and Footers</link>
+<paragraph xml-lang="en-US" id="hd_id3155920" role="heading" level="1" l10n="U"
+                 oldref="25"><variable id="header_pagestyles"><link href="text/swriter/guide/header_pagestyles.xhp" name="Defining Different Headers and Footers">Defining Different Headers and Footers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="26">You can use different headers and footers on different pages in your document, so long as the pages use different page styles. $[officename] provides several predefined page styles, such as <emph>First page</emph>, <emph>Left page</emph> and <emph>Right page</emph>, or you can create a custom page style.</paragraph>
-<paragraph role="paragraph" id="par_id3147105" xml-lang="en-US" l10n="U" oldref="27">You can also use the mirrored page layout if you want to add a header to a page style that has different inner and outer page margins. To apply this option to a page style, choose <emph>Format - Page</emph>, click the<emph> Page</emph> tab, and in the<emph> Layout settings</emph> area, choose<emph> Mirrored</emph> in the<emph> Page layout</emph> box.</paragraph>
-<paragraph role="paragraph" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="28">For example, you can use page styles to define different headers for even and odd pages in a document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150929" xml-lang="en-US" l10n="U" oldref="29">Open a new text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150946" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Format - Styles and Formatting</emph> and click the <emph>Page Styles</emph> icon in the Styles and Formatting window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150510" xml-lang="en-US" l10n="U" oldref="30">Right-click "Right Page" in the list of page styles and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150536" xml-lang="en-US" l10n="U" oldref="33">In the <emph>Page Styles</emph> dialog, click the <emph>Header </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="34">Select<emph> Header on</emph> and click the <emph>Organizer</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146865" xml-lang="en-US" l10n="U" oldref="35">In the <emph>Next Style </emph>box, select "Left Page".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146889" xml-lang="en-US" l10n="U" oldref="36">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150714" xml-lang="en-US" l10n="U" oldref="37">In the <emph>Styles and Formatting</emph> window, right-click "Left Page" in the list of page styles and choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150748" xml-lang="en-US" l10n="U" oldref="38">In the <emph>Page Styles</emph> dialog, click the <emph>Header </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="39">Select<emph> Header on</emph> and click the <emph>Organizer</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147061" xml-lang="en-US" l10n="U" oldref="40">In the <emph>Next Style </emph>box, select "Right Page".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147086" xml-lang="en-US" l10n="U" oldref="41">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145263" xml-lang="en-US" l10n="U" oldref="42">Double-click "Right Page" in the list of page styles to apply the style to the current page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145284" xml-lang="en-US" l10n="U" oldref="43">Enter text or graphics in the header for the Left Page style. After the next page is added to your document, enter text or graphics in the header for the Right Page style. </paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154263" role="paragraph" l10n="U" oldref="26">You can use different headers and footers on different pages in your document, so long as the pages use different page styles. $[officename] provides several predefined page styles, such as <emph>First page</emph>, <emph>Left page</emph> and <emph>Right page</emph>, or you can create a custom page style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147105" role="paragraph" l10n="U" oldref="27">You can also use the mirrored page layout if you want to add a header to a page style that has different inner and outer page margins. To apply this option to a page style, choose <item type="menuitem">Format - Page</item>, click the<emph/>
+         <item type="menuitem">Page</item> tab, and in the<emph/>
+         <item type="menuitem">Layout settings</item> area, choose “Mirrored” in the<emph/>
+         <item type="menuitem">Page layout</item> box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150224" role="paragraph" l10n="U" oldref="28">For example, you can use page styles to define different headers for even and odd pages in a document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150929" role="listitem" l10n="U" oldref="29">Open a new text document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150946" role="listitem" l10n="U" oldref="31">Choose <emph>Format - Styles and Formatting</emph> and click the <emph>Page Styles</emph> icon in the Styles and Formatting window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150510" role="listitem" l10n="U" oldref="30">Right-click "Right Page" in the list of page styles and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150536" role="listitem" l10n="U" oldref="33">In the <item type="menuitem">Page Styles</item> dialog, click the <item type="menuitem">Header</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153750" role="listitem" l10n="U" oldref="34">Select<emph/>
+               <item type="menuitem">Header on</item> and click the <item type="menuitem">Organizer</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146865" role="listitem" l10n="U" oldref="35">In the <item type="menuitem">Next Style</item>
+               <emph/>box, select "Left Page".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146889" role="listitem" l10n="U" oldref="36">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150714" role="listitem" l10n="U" oldref="37">In the <emph>Styles and Formatting</emph> window, right-click "Left Page" in the list of page styles and choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150748" role="listitem" l10n="U" oldref="38">In the <item type="menuitem">Page Styles</item> dialog, click the <item type="menuitem">Header</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153172" role="listitem" l10n="U" oldref="39">Select<emph/>
+               <item type="menuitem">Header on</item> and click the <item type="menuitem">Organizer</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147061" role="listitem" l10n="U" oldref="40">In the <item type="menuitem">Next Style</item>
+               <emph/>box, select "Right Page".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147086" role="listitem" l10n="U" oldref="41">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145263" role="listitem" l10n="U" oldref="42">Double-click "Right Page" in the list of page styles to apply the style to the current page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145284" role="listitem" l10n="U" oldref="43">Enter text or graphics in the header for the Left Page style. After the next page is added to your document, enter text or graphics in the header for the Right Page style. </paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp b/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
index 219de3dd30..0222ea0dc9 100644
--- a/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: header_with_chapter.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,78 +27,85 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideheader_with_chapterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Chapter Name and Number in a Header or a Footer</title>
-<filename>/text/swriter/guide/header_with_chapter.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T13:21:50">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideheader_with_chapterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Chapter Name and Number in a Header or a Footer</title>
+         <filename>/text/swriter/guide/header_with_chapter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155919"><bookmark_value>running titles in headers</bookmark_value>
-<bookmark_value>floating titles in headers</bookmark_value>
-<bookmark_value>headers; chapter information</bookmark_value>
-<bookmark_value>chapter names in headers</bookmark_value>
-<bookmark_value>names; chapter names in headers</bookmark_value>
+      <bookmark_value>floating titles in headers</bookmark_value>
+      <bookmark_value>headers; chapter information</bookmark_value>
+      <bookmark_value>chapter names in headers</bookmark_value>
+      <bookmark_value>names; chapter names in headers</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155919" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="header_with_chapter"><link href="text/swriter/guide/header_with_chapter.xhp" name="Inserting a Chapter Name and Number in a Header or a Footer">Inserting a Chapter Name and Number in a Header or a Footer</link>
+<paragraph xml-lang="en-US" id="hd_id3155919" role="heading" level="1" l10n="U" oldref="3"><variable id="header_with_chapter"><link href="text/swriter/guide/header_with_chapter.xhp" name="Inserting a Chapter Name and Number in a Header or a Footer">Inserting a Chapter Name and Number in a Header or a Footer</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153414" xml-lang="en-US" l10n="U" oldref="22">Before you can insert chapter information into a header or footer, you must first set the outline numbering options for the paragraph style that you want to use for chapter titles.</paragraph>
-<paragraph role="heading" id="hd_id3154244" xml-lang="en-US" level="2" l10n="U" oldref="23">To create a paragraph style for chapter titles:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155874" xml-lang="en-US" l10n="U" oldref="24">Choose <emph>Tools - Outline Numbering</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155898" xml-lang="en-US" l10n="U" oldref="25">In the <emph>Style </emph>box, select the paragraph style that you want to use for chapter titles, for example, "Heading 1".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="26">Select the numbering style for the chapter titles in the <emph>Number </emph>box, for example, "1,2,3...".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150219" xml-lang="en-US" l10n="U" oldref="27">Type "Chapter" followed by a space in the <emph>Before </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150245" xml-lang="en-US" l10n="U" oldref="28">Enter a space in the <emph>After </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150949" xml-lang="en-US" l10n="U" oldref="29">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150505" xml-lang="en-US" level="2" l10n="U" oldref="30">To insert the chapter name and number in a header or a footer:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150527" xml-lang="en-US" l10n="U" oldref="5">Apply the paragraph style that you defined for chapter titles to the chapter headings in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153729" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>Insert - Header </emph>or <emph>Insert - Footer</emph>, and then select the page style for the current page from the submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153762" xml-lang="en-US" l10n="U" oldref="7">Click in the header or footer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146863" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Insert - Fields - Other</emph> and click the<emph> Document</emph> tab.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="5">
-<listitem>
-<paragraph role="listitem" id="par_id3153175" xml-lang="en-US" l10n="U" oldref="10">Click "Chapter" in the <emph>Type </emph>list and "Chapter number and name" in the <emph>Format </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147065" xml-lang="en-US" l10n="U" oldref="11">Click <emph>Insert</emph> and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3147095" xml-lang="en-US" l10n="U" oldref="12">The header on every page that uses the current page style automatically displays the chapter name and number.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="U" oldref="22">Before you can insert chapter information into a header or footer, you must first set the outline numbering options for the paragraph style that you want to use for chapter titles.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154244" role="heading" level="2" l10n="U"
+                 oldref="23">To Create a Paragraph Style for Chapter Titles</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155874" role="listitem" l10n="U" oldref="24">Choose <emph>Tools - Outline Numbering</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155898" role="listitem" l10n="U" oldref="25">In the <item type="menuitem">Style</item>
+               <emph/>box, select the paragraph style that you want to use for chapter titles, for example, "Heading 1".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147124" role="listitem" l10n="U" oldref="26">Select the numbering style for the chapter titles in the <item type="menuitem">Number</item>
+               <emph/>box, for example, "1,2,3...".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150219" role="listitem" l10n="U" oldref="27">Type "Chapter" followed by a space in the <item type="menuitem">Before</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150245" role="listitem" l10n="U" oldref="28">Enter a space in the <item type="menuitem">After</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150949" role="listitem" l10n="U" oldref="29">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150505" role="heading" level="2" l10n="U"
+                 oldref="30">To Insert the Chapter Name and Number in a Header or a Footer</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150527" role="listitem" l10n="U" oldref="5">Apply the paragraph style that you defined for chapter titles to the chapter headings in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153729" role="listitem" l10n="U" oldref="6">Choose <item type="menuitem">Insert - Header</item>
+               <emph/>or <item type="menuitem">Insert - Footer</item>, and then select the page style for the current page from the submenu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153762" role="listitem" l10n="U" oldref="7">Click in the header or footer.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146863" role="listitem" l10n="U" oldref="9">Choose <item type="menuitem">Insert - Fields - Other</item> and click the<emph/>
+               <item type="menuitem">Document</item> tab.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="5">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153175" role="listitem" l10n="U" oldref="10">Click "Chapter" in the <item type="menuitem">Type</item>
+               <emph/>list and "Chapter number and name" in the <item type="menuitem">Format</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147065" role="listitem" l10n="U" oldref="11">Click <emph>Insert</emph> and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147095" role="paragraph" l10n="U" oldref="12">The header on every page that uses the current page style automatically displays the chapter name and number.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/header_with_line.xhp b/helpcontent2/source/text/swriter/guide/header_with_line.xhp
index b631c1107e..cb096a691e 100644
--- a/helpcontent2/source/text/swriter/guide/header_with_line.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_with_line.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: header_with_line.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,55 +27,49 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideheader_with_linexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Headers or Footers</title>
-<filename>/text/swriter/guide/header_with_line.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-16T15:12:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154866"><bookmark_value>inserting; lines under headers</bookmark_value>
-<bookmark_value>lines; under headers/above footers</bookmark_value>
-<bookmark_value>headers;formatting</bookmark_value>
-<bookmark_value>footers;formatting</bookmark_value>
-<bookmark_value>shadows;headers/footers</bookmark_value>
-<bookmark_value>borders;for headers/footers</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3154866" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="header_with_line"><link href="text/swriter/guide/header_with_line.xhp" name="Formatting Headers or Footers">Formatting Headers or Footers</link>
+      <topic id="textswriterguideheader_with_linexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting Headers or Footers</title>
+         <filename>/text/swriter/guide/header_with_line.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154866"><bookmark_value>inserting;lines under headers/above footers</bookmark_value>
+      <bookmark_value>lines; under headers/above footers</bookmark_value>
+      <bookmark_value>headers;formatting</bookmark_value>
+      <bookmark_value>footers;formatting</bookmark_value>
+      <bookmark_value>shadows;headers/footers</bookmark_value>
+      <bookmark_value>borders;for headers/footers</bookmark_value>
+</bookmark><comment>MW changed "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3154866" role="heading" level="1" l10n="U"
+                 oldref="20"><variable id="header_with_line"><link href="text/swriter/guide/header_with_line.xhp" name="Formatting Headers or Footers">Formatting Headers or Footers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154243" xml-lang="en-US" l10n="U" oldref="21">You can apply direct formatting to the text in a header or footer. You can also adjust the spacing of the text relative to the header or footer frame or apply a border to the header or footer.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155873" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Page </emph>and select the <emph>Header </emph>or <emph>Footer </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147109" xml-lang="en-US" l10n="U" oldref="27">Set the spacing options that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="23">To add a border or a shadow to the header or the footer, click <emph>More</emph>. The <emph>Border/Background </emph>dialog opens.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150520" xml-lang="en-US" l10n="U" oldref="24">To add a separator line between the header or the footer and the content of the page, click the bottom edge of the square in the <emph>Line arrangement</emph> area. Click a line style in the <emph>Style</emph> box.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153742" xml-lang="en-US" l10n="U" oldref="25">To adjust the spacing between the content of the header or footer and the line, clear the <emph>Synchronize</emph> box, and then enter a value in the<emph> Bottom</emph> box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154243" role="paragraph" l10n="U" oldref="21">You can apply direct formatting to the text in a header or footer. You can also adjust the spacing of the text relative to the header or footer frame or apply a border to the header or footer.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155873" role="listitem" l10n="U" oldref="22">Choose <item type="menuitem">Format - Page</item>
+               <emph/>and select the <item type="menuitem">Header</item>
+               <emph/>or <item type="menuitem">Footer</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147109" role="listitem" l10n="U" oldref="27">Set the spacing options that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147128" role="listitem" l10n="U" oldref="23">To add a border or a shadow to the header or the footer, click <item type="menuitem">More</item>. The <item type="menuitem">Border/Background</item>
+               <emph/>dialog opens.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="unordered"/>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_pagestyles.xhp#header_pagestyles"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/hidden_text.xhp b/helpcontent2/source/text/swriter/guide/hidden_text.xhp
index 8f262371a0..b2741900b1 100755
--- a/helpcontent2/source/text/swriter/guide/hidden_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/hidden_text.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidden_text.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,117 +29,115 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidehidden_textxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Hiding Text</title>
-<filename>/text/swriter/guide/hidden_text.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidehidden_textxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Hiding Text</title>
+         <filename>/text/swriter/guide/hidden_text.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148856"><bookmark_value>text; hiding</bookmark_value>
-<bookmark_value>sections;hiding</bookmark_value>
-<bookmark_value>paragraphs;hiding</bookmark_value>
-<bookmark_value>hiding;text, with conditions</bookmark_value>
-</bookmark>
-  <comment>mw deleted "comparisons;" and copied two entries to hidden_text_display.xhp and 2 entries to nonprintable_text.xhp</comment>
-  <paragraph xml-lang="en-US" id="hd_id3148856" role="heading" level="1" l10n="U" oldref="1"><variable id="hidden_text"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link> 
+      <bookmark_value>sections;hiding</bookmark_value>
+      <bookmark_value>paragraphs;hiding</bookmark_value>
+      <bookmark_value>hiding;text, with conditions</bookmark_value>
+      <bookmark_value>variables;for hiding text</bookmark_value>
+</bookmark><comment>mw deleted "comparisons;" and copied two entries to hidden_text_display.xhp and 2 entries to nonprintable_text.xhp</comment><comment>MW added "variables;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3148856" role="heading" level="1" l10n="U" oldref="1"><variable id="hidden_text"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="2">You can use fields and sections to hide or display text in your document if a condition is met.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U" oldref="19">Before you can hide text, you must first create a variable to use in the condition for hiding the text.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153131" role="listitem" l10n="U" oldref="20">Click in your document and choose <emph>Insert - Fields - Other</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149640" role="listitem" l10n="U" oldref="21">Click the <emph>Variables </emph>tab and click "Set Variable" in the <emph>Type </emph>list.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="22">Click "General" in the <emph>Format </emph>list.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149620" role="listitem" l10n="U" oldref="23">Type a name for the variable in the <emph>Name </emph>box, for example, "Hide".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149869" role="listitem" l10n="U" oldref="24">Enter a value for the variable in the <emph>Value </emph>box, for example, "1".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145108" role="listitem" l10n="U" oldref="25">To hide the variable in your document, select <emph>Invisible</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149585" role="listitem" l10n="U" oldref="26">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3156245" role="heading" level="2" l10n="U" oldref="27">To hide text:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145391" role="listitem" l10n="U" oldref="28">Click in the document where you want to add the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145409" role="listitem" l10n="U" oldref="5">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Functions </emph>tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155325" role="listitem" l10n="U" oldref="29">Click "Hidden Text" in the <emph>Type </emph>list.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154404" role="listitem" l10n="U" oldref="30">Enter a statement in the <emph>Condition </emph>box. For example, using the variable you previously defined, enter "Hide==1".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153371" role="listitem" l10n="U" oldref="31">Type the text that you want to hide in the <emph>Hidden text </emph>box.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154233" role="listitem" l10n="U" oldref="32">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3154256" role="heading" level="2" l10n="U" oldref="33">To hide a paragraph:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154853" role="listitem" l10n="U" oldref="34">Click in the paragraph where you want to add the text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154872" role="listitem" l10n="U" oldref="35">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Functions </emph>tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155902" role="listitem" l10n="U" oldref="6">Click "Hidden Paragraph" in the <emph>Type </emph>list.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155947" role="listitem" l10n="U" oldref="36">Enter a statement in the <emph>Condition </emph>box. For example, using the variable you previously defined, enter "Hide==1".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149991" role="listitem" l10n="U" oldref="37">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3793450" role="note" l10n="NEW">You must enable this feature by removing the check mark from menu <emph>View - Hidden Paragraphs</emph>. When the check mark is set, you cannot hide any paragraph.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3148675" role="heading" level="2" l10n="U" oldref="38">To hide a section:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148697" role="listitem" l10n="U" oldref="39">Select the text that you want to hide in your document.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153019" role="listitem" l10n="U" oldref="9">Choose <emph>Insert - Section</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148950" role="listitem" l10n="U" oldref="40">In the<emph> Hide</emph> area, select<emph> Hide</emph>, and then enter an expression in the<emph> Condition</emph> box. For example, using the variable you previously defined, enter "Hide==1".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153636" role="listitem" l10n="U" oldref="41">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
-   <embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
-   <paragraph xml-lang="en-US" id="par_id3846858" role="paragraph" l10n="NEW"><link href="text/swriter/guide/hidden_text_display.xhp" name="Displaying Hidden Text">Displaying Hidden Text</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id8148442" role="paragraph" l10n="NEW"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3148603" role="paragraph" l10n="U" oldref="10"><link href="text/swriter/01/04090000.xhp" name="Insert - Fields - Other">Insert - Fields - Other</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147011" role="paragraph" l10n="U" oldref="11"><link href="text/swriter/01/04020000.xhp" name="Insert - Section">Insert - Section</link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147029" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/02/14020000.xhp" name="List of Operators">List of Operators</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="2">You can use fields and sections to hide or display text in your document if a condition is met.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U" oldref="19">Before you can hide text, you must first create a variable to use in the condition for hiding the text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5174108" role="heading" level="2" l10n="NEW">To Create a Variable</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153131" role="listitem" l10n="U" oldref="20">Click in your document and choose <emph>Insert - Fields - Other</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149640" role="listitem" l10n="U" oldref="21">Click the <emph>Variables </emph>tab and click "Set Variable" in the <emph>Type </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="22">Click "General" in the <emph>Format </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149620" role="listitem" l10n="U" oldref="23">Type a name for the variable in the <item type="menuitem">Name</item> box, for example, <item type="literal">Hide</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149869" role="listitem" l10n="U" oldref="24">Enter a value for the variable in the <item type="menuitem">Value</item> box, for example, <item type="literal">1</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145108" role="listitem" l10n="U" oldref="25">To hide the variable in your document, select <emph>Invisible</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149585" role="listitem" l10n="U" oldref="26">Click <item type="menuitem">Insert</item> and <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3156245" role="heading" level="2" l10n="U"
+                 oldref="27">To Hide Text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145391" role="listitem" l10n="U" oldref="28">Click in the document where you want to add the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145409" role="listitem" l10n="U" oldref="5">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Functions </emph>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155325" role="listitem" l10n="U" oldref="29">Click "Hidden Text" in the <emph>Type </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154404" role="listitem" l10n="U" oldref="30">Enter a statement in the <item type="menuitem">Condition</item> box. For example, using the variable you previously defined, enter <item type="literal">Hide==1</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153371" role="listitem" l10n="U" oldref="31">Type the text that you want to hide in the <emph>Hidden text </emph>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154233" role="listitem" l10n="U" oldref="32">Click <item type="menuitem">Insert</item> and <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154256" role="heading" level="2" l10n="U"
+                 oldref="33">To Hide a Paragraph</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154853" role="listitem" l10n="U" oldref="34">Click in the paragraph where you want to add the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154872" role="listitem" l10n="U" oldref="35">Choose <emph>Insert - Fields - Other</emph> and click the <emph>Functions </emph>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155902" role="listitem" l10n="U" oldref="6">Click "Hidden Paragraph" in the <emph>Type </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155947" role="listitem" l10n="U" oldref="36">Enter a statement in the <item type="menuitem">Condition</item> box. For example, using the variable you previously defined, enter <item type="literal">Hide==1</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149991" role="listitem" l10n="U" oldref="37">Click <item type="menuitem">Insert</item> and <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3793450" role="note" l10n="NEW">You must enable this feature by removing the check mark from menu <emph>View - Hidden Paragraphs</emph>. When the check mark is set, you cannot hide any paragraph.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148675" role="heading" level="2" l10n="U"
+                 oldref="38">To Hide a Section</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148697" role="listitem" l10n="U" oldref="39">Select the text that you want to hide in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153019" role="listitem" l10n="U" oldref="9">Choose <emph>Insert - Section</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148950" role="listitem" l10n="U" oldref="40">In the <item type="menuitem">Hide</item> area, select <item type="menuitem">Hide</item>, and then enter an expression in the <item type="menuitem">Condition</item> box. For example, using the variable you previously defined, enter <item type="literal">Hide==1</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153636" role="listitem" l10n="U" oldref="41">Click <item type="menuitem">Insert</item>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
+         <embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
+         <paragraph xml-lang="en-US" id="par_id3846858" role="paragraph" l10n="NEW"><link href="text/swriter/guide/hidden_text_display.xhp" name="Displaying Hidden Text">Displaying Hidden Text</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id8148442" role="paragraph" l10n="NEW"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148603" role="paragraph" l10n="U" oldref="10"><link href="text/swriter/01/04090000.xhp" name="Insert - Fields - Other">Insert - Fields - Other</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147011" role="paragraph" l10n="U" oldref="11"><link href="text/swriter/01/04020000.xhp" name="Insert - Section">Insert - Section</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147029" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/02/14020000.xhp" name="List of Operators">List of Operators</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/hidden_text_display.xhp b/helpcontent2/source/text/swriter/guide/hidden_text_display.xhp
index e49165ff8c..3872aa75c4 100644
--- a/helpcontent2/source/text/swriter/guide/hidden_text_display.xhp
+++ b/helpcontent2/source/text/swriter/guide/hidden_text_display.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidden_text_display.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,37 +29,38 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidehidden_text_displayxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Displaying Hidden Text</title>
-<filename>/text/swriter/guide/hidden_text_display.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidehidden_text_displayxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Displaying Hidden Text</title>
+         <filename>/text/swriter/guide/hidden_text_display.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148856"><bookmark_value>hidden text; displaying</bookmark_value>
-<bookmark_value>displaying;hidden text</bookmark_value>
-</bookmark><comment>MW copied two entries from hidden_text.xhp</comment><paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="hidden_text_display"><link href="text/swriter/guide/hidden_text_display.xhp" name="Displaying Hidden Text">Displaying Hidden Text</link>
-</variable></paragraph><comment>MW created this guide from splitting hidden_text.xhp</comment><paragraph role="paragraph" id="par_id5659962" xml-lang="en-US" l10n="NEW">If you have a text that was hidden by defining a condition with a variable, you have several options to display the hidden text. Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152777" xml-lang="en-US" l10n="CHG" oldref="7">Enable the check mark at <emph>View - Hidden Paragraphs</emph>.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153902" xml-lang="en-US" l10n="U" oldref="44">Double-click in front of the variable that you used to define the condition for hiding the text, and enter a different value for the variable.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147114" xml-lang="en-US" l10n="U" oldref="45">Double-click in front of the hidden text field or the hidden paragraph field, and change the condition statement.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id1865901" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link></paragraph>
-<embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
-<paragraph role="paragraph" id="par_id3147029" xml-lang="en-US" l10n="U" oldref="46"><link href="text/swriter/02/14020000.xhp" name="List of Operators">List of Operators</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <bookmark_value>displaying;hidden text</bookmark_value>
+</bookmark><comment>MW copied two entries from hidden_text.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3148856" role="heading" level="1" l10n="U" oldref="1"><variable id="hidden_text_display"><link href="text/swriter/guide/hidden_text_display.xhp" name="Displaying Hidden Text">Displaying Hidden Text</link>
+</variable></paragraph><comment>MW created this guide from splitting hidden_text.xhp</comment>
+<paragraph xml-lang="en-US" id="par_id5659962" role="paragraph" l10n="NEW">If you have a text that was hidden by defining a condition with a variable, you have several options to display the hidden text. Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152777" role="listitem" l10n="CHG" oldref="7">Enable the check mark at <emph>View - Hidden Paragraphs</emph>.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153902" role="listitem" l10n="U" oldref="44">Double-click in front of the variable that you used to define the condition for hiding the text, and enter a different value for the variable.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147114" role="listitem" l10n="U" oldref="45">Double-click in front of the hidden text field or the hidden paragraph field, and change the condition statement.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id1865901" role="paragraph" l10n="NEW"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link></paragraph>
+         <embed href="text/swriter/guide/conditional_text.xhp#conditional_text"/>
+         <paragraph xml-lang="en-US" id="par_id3147029" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/02/14020000.xhp" name="List of Operators">List of Operators</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/hyperlinks.xhp b/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
index 0f0ac3bb4e..729c4fb9ae 100755
--- a/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
+++ b/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperlinks.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,46 +29,48 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidehyperlinksxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Hyperlinks With the Navigator</title>
-<filename>/text/swriter/guide/hyperlinks.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidehyperlinksxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Hyperlinks With the Navigator</title>
+         <filename>/text/swriter/guide/hyperlinks.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155845"><bookmark_value>hyperlinks; inserting from Navigator</bookmark_value>
-<bookmark_value>inserting; hyperlinks from Navigator</bookmark_value>
-<bookmark_value>cross-references; inserting with Navigator</bookmark_value>
-<bookmark_value>Navigator;inserting hyperlinks</bookmark_value>
-</bookmark><comment>mw deleted "adding;"</comment><paragraph role="heading" id="hd_id3155845" xml-lang="en-US" level="1" l10n="U" oldref="21"><variable id="hyperlinks"><link href="text/swriter/guide/hyperlinks.xhp" name="Inserting Hyperlinks With the Navigator">Inserting Hyperlinks With the Navigator</link>
+      <bookmark_value>inserting; hyperlinks from Navigator</bookmark_value>
+      <bookmark_value>cross-references; inserting with Navigator</bookmark_value>
+      <bookmark_value>Navigator;inserting hyperlinks</bookmark_value>
+</bookmark><comment>mw deleted "adding;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155845" role="heading" level="1" l10n="U"
+                 oldref="21"><variable id="hyperlinks"><link href="text/swriter/guide/hyperlinks.xhp" name="Inserting Hyperlinks With the Navigator">Inserting Hyperlinks With the Navigator</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="20">You can insert a cross-reference as a hyperlink in your document using the Navigator. You can even cross-reference items from other <item type="productname">%PRODUCTNAME</item> documents. If you click the hyperlink when the document is opened in <item type="productname">%PRODUCTNAME</item>, you are taken to the cross-referenced item.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149833" xml-lang="en-US" l10n="U" oldref="32">Open the document(s) containing the items you want to cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="23">On the Standard bar, click the <emph>Navigator</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156108" xml-lang="en-US" l10n="U" oldref="25">Click the arrow next to the <emph>Drag Mode</emph> icon, and ensure that <emph>Insert as Hyperlink </emph>is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153396" xml-lang="en-US" l10n="U" oldref="31">In the list at the bottom of the Navigator, select the document containing the item that you want to cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153416" xml-lang="en-US" l10n="U" oldref="24">In the Navigator list, click the plus sign next to the item that you want to insert as a hyperlink.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153133" xml-lang="en-US" l10n="U" oldref="26">Drag the item to where you want to insert the hyperlink in the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="U" oldref="27">The name of the item is inserted in the document as an underlined hyperlink.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/navigator.xhp#navigator"/>
-<embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="20">You can insert a cross-reference as a hyperlink in your document using the Navigator. You can even cross-reference items from other <item type="productname">%PRODUCTNAME</item> documents. If you click the hyperlink when the document is opened in <item type="productname">%PRODUCTNAME</item>, you are taken to the cross-referenced item.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149833" role="listitem" l10n="U" oldref="32">Open the document(s) containing the items you want to cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148846" role="listitem" l10n="U" oldref="23">On the Standard bar, click the <emph>Navigator</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156108" role="listitem" l10n="U" oldref="25">Click the arrow next to the <item type="menuitem">Drag Mode</item> icon, and ensure that <item type="menuitem">Insert as Hyperlink</item>
+               <emph/>is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="31">In the list at the bottom of the Navigator, select the document containing the item that you want to cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153416" role="listitem" l10n="U" oldref="24">In the Navigator list, click the plus sign next to the item that you want to insert as a hyperlink.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153133" role="listitem" l10n="U" oldref="26">Drag the item to where you want to insert the hyperlink in the document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149635" role="paragraph" l10n="U" oldref="27">The name of the item is inserted in the document as an underlined hyperlink.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/navigator.xhp#navigator"/>
+      <embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp b/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
index acb0339c16..92bf4539eb 100644
--- a/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
+++ b/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyphen_prevent.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,46 +29,55 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidehyphen_preventxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Preventing Hyphenation of Specific Words</title>
-<filename>/text/swriter/guide/hyphen_prevent.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidehyphen_preventxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Preventing Hyphenation of Specific Words</title>
+         <filename>/text/swriter/guide/hyphen_prevent.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>hyphenation;preventing for specific words</bookmark_value>
-<bookmark_value>words;wrapping/not wrapping in text</bookmark_value>
-<bookmark_value>switching off;hyphenation for specific words</bookmark_value>
-</bookmark>
-  <comment>mw copied 2 entries from using_hyphen.xhp and added a new entry</comment>
-  <paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U" oldref="20"><variable id="hyphen_prevent"><link href="text/swriter/guide/hyphen_prevent.xhp" name="Preventing Hyphenation of Specific Words">Preventing Hyphenation of Specific Words</link> 
-</variable></paragraph>
-  <comment>MW created this guide from splitting using_hyphen.xhp</comment>
-  <paragraph xml-lang="en-US" id="par_id5640125" role="paragraph" l10n="NEW">If your text is <link href="text/swriter/guide/using_hyphen.xhp">automatically hyphenated</link> and certain hyphenated words look ugly, or if you want specific words never to be hyphenated you can switch off hyphenation for those words:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153634" role="listitem" l10n="U" oldref="40">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph> </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153658" role="listitem" l10n="U" oldref="41">Select a dictionary in the <emph>User-defined dictionary </emph>list, and then click <emph>Edit</emph>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3147125" role="listitem" l10n="U" oldref="43">If the list is empty, click <emph>New</emph> to create a dictionary.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150218" role="listitem" l10n="U" oldref="42">In the<emph> Word</emph> box, type the word you want to exclude from hyphenation, followed by an equal sign (=), for example, "pretentious=".</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150247" role="listitem" l10n="U" oldref="65">Click <emph>New</emph>, and then click <emph>Close</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3147036" role="tip" l10n="U" oldref="29">To quickly exclude a word from hyphenation, select the word, choose <emph>Format - Character</emph>, click the <emph>Font </emph>tab, and select "None" in the <emph>Language </emph>box.</paragraph>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
-  <paragraph xml-lang="en-US" id="par_id3154361" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
- </body>
+      <bookmark_value>words;wrapping/not wrapping in text</bookmark_value>
+      <bookmark_value>switching off;hyphenation for specific words</bookmark_value>
+</bookmark><comment>mw copied 2 entries from using_hyphen.xhp and added a new entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U"
+                 oldref="20"><variable id="hyphen_prevent"><link href="text/swriter/guide/hyphen_prevent.xhp" name="Preventing Hyphenation of Specific Words">Preventing Hyphenation of Specific Words</link>
+</variable></paragraph><comment>MW created this guide from splitting using_hyphen.xhp</comment>
+<paragraph xml-lang="en-US" id="par_id5640125" role="paragraph" l10n="NEW">If your text is <link href="text/swriter/guide/using_hyphen.xhp">automatically hyphenated</link> and certain hyphenated words look ugly, or if you want specific words never to be hyphenated you can switch off hyphenation for those words:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153634" role="listitem" l10n="U" oldref="40">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
+            </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153658" role="listitem" l10n="U" oldref="41">Select a dictionary in the <emph>User-defined dictionary </emph>list, and then click <emph>Edit</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147125" role="listitem" l10n="U" oldref="43">If the list is empty, click <emph>New</emph> to create a dictionary.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150218" role="listitem" l10n="U" oldref="42">In the<emph> Word</emph> box, type the word you want to exclude from hyphenation, followed by an equal sign (=), for example, "pretentious=".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150247" role="listitem" l10n="U" oldref="65">Click <emph>New</emph>, and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3147036" role="tip" l10n="U" oldref="29">To quickly exclude a word from hyphenation, select the word, choose <emph>Format - Character</emph>, click the <emph>Font </emph>tab, and select "None" in the <emph>Language </emph>box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200910262761" role="paragraph" l10n="NEW">Some words contain special characters that %PRODUCTNAME treats as a hyphen. If you do not want such words to be hyphenated, you can insert a special code that prevents hyphenation at the position where the special code is inserted. Proceed as follows:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0302200910262850" role="paragraph" l10n="NEW">Enable the special features of complex text layout (CTL) languages: Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item> and check <emph>Enabled for complex text layout (CTL)</emph>. Click OK.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0302200910262837" role="paragraph" l10n="NEW">Position the cursor at the place where no hyphenation should occur.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0302200910262867" role="paragraph" l10n="NEW">Choose <item type="menuitem">Insert - Formatting Mark - No-width no break</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id0302200910572128" role="paragraph" l10n="NEW">Once the special character is inserted, you might disable CTL again. Support of CTL was only necessary to insert the special character.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
+      <paragraph xml-lang="en-US" id="par_id3154361" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/indenting.xhp b/helpcontent2/source/text/swriter/guide/indenting.xhp
index feea737185..6222508d59 100644
--- a/helpcontent2/source/text/swriter/guide/indenting.xhp
+++ b/helpcontent2/source/text/swriter/guide/indenting.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indenting.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,41 +29,42 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideindentingxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Indenting Paragraphs</title>
-<filename>/text/swriter/guide/indenting.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideindentingxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Indenting Paragraphs</title>
+         <filename>/text/swriter/guide/indenting.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155869"><bookmark_value>formatting; indenting paragraphs</bookmark_value>
-<bookmark_value>indents;in text</bookmark_value>
-<bookmark_value>paragraphs; indents</bookmark_value>
-<bookmark_value>hanging indents in paragraphs</bookmark_value>
-<bookmark_value>right indents in paragraphs</bookmark_value>
-<bookmark_value>lines of text; indents</bookmark_value>
-<bookmark_value>changing;indents</bookmark_value>
-</bookmark><comment>mw made indents a two level entry, changed "paragraphs;"  and copied "changing;indents" from writer guide "ruler.xhp"</comment><paragraph role="heading" id="hd_id129398" xml-lang="en-US" level="1" l10n="NEW"><variable id="indenting"><link href="text/swriter/guide/indenting.xhp">Indenting Paragraphs</link>
-</variable></paragraph><comment>see i66307</comment><paragraph role="note" id="par_id5589159" xml-lang="en-US" l10n="NEW">To change the measurement units, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
-<paragraph role="paragraph" id="par_id9936216" xml-lang="en-US" l10n="NEW">You can change the indents for the current paragraph, or for all selected paragraphs, or for a Paragraph Style.</paragraph>
-<paragraph role="tip" id="par_id7953123" xml-lang="en-US" l10n="NEW">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <item type="menuitem">View - Ruler</item>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4013794" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Format - Paragraph - Indents &amp; Spacing</item> to change the indents for the current paragraph or for all selected paragraphs. You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1631824" xml-lang="en-US" l10n="NEW">Right-click a paragraph and choose <item type="menuitem">Edit Paragraph Style - Indents &amp; Spacing</item> to change the indents for all paragraphs that have the same Paragraph Style.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7271645" xml-lang="en-US" l10n="NEW">Indents are calculated with respect to the left and right page margins. If you want the paragraph to extend into the page margin, enter a negative number. </paragraph>
-<paragraph role="paragraph" id="par_id2136295" xml-lang="en-US" l10n="NEW">The indents are different regarding the writing direction. For example, look at the "Before text" indent value in left-to-right languages. The left edge of the paragraph is indented with respect to the left page margin. In right-to-left languages, the right edge of the paragraph is indented with respect to the right page margin.</paragraph>
-<paragraph role="paragraph" id="par_id4186223" xml-lang="en-US" l10n="NEW">For a hanging indent, enter a positive value for "Before text" and a negative value for "First line".</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id1491134" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/05030100.xhp">Format - Paragraph - Indents &amp; Spacing</link></paragraph>
-<embed href="text/swriter/guide/ruler.xhp#ruler"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-</body>
-</helpdocument>
+      <bookmark_value>indents;in text</bookmark_value>
+      <bookmark_value>paragraphs; indents</bookmark_value>
+      <bookmark_value>hanging indents in paragraphs</bookmark_value>
+      <bookmark_value>right indents in paragraphs</bookmark_value>
+      <bookmark_value>lines of text; indents</bookmark_value>
+      <bookmark_value>changing;indents</bookmark_value>
+</bookmark><comment>mw made indents a two level entry, changed "paragraphs;"  and copied "changing;indents" from writer guide "ruler.xhp"</comment>
+<paragraph xml-lang="en-US" id="hd_id129398" role="heading" level="1" l10n="NEW"><variable id="indenting"><link href="text/swriter/guide/indenting.xhp">Indenting Paragraphs</link>
+</variable></paragraph><comment>see i66307</comment>
+<paragraph xml-lang="en-US" id="par_id5589159" role="note" l10n="NEW">To change the measurement units, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id9936216" role="paragraph" l10n="NEW">You can change the indents for the current paragraph, or for all selected paragraphs, or for a Paragraph Style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7953123" role="tip" l10n="NEW">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <item type="menuitem">View - Ruler</item>.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4013794" role="paragraph" l10n="NEW">Choose <item type="menuitem">Format - Paragraph - Indents &amp; Spacing</item> to change the indents for the current paragraph or for all selected paragraphs. You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1631824" role="paragraph" l10n="NEW">Right-click a paragraph and choose <item type="menuitem">Edit Paragraph Style - Indents &amp; Spacing</item> to change the indents for all paragraphs that have the same Paragraph Style.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id7271645" role="paragraph" l10n="NEW">Indents are calculated with respect to the left and right page margins. If you want the paragraph to extend into the page margin, enter a negative number. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2136295" role="paragraph" l10n="NEW">The indents are different regarding the writing direction. For example, look at the <item type="menuitem">Before text </item>indent value in left-to-right languages. The left edge of the paragraph is indented with respect to the left page margin. In right-to-left languages, the right edge of the paragraph is indented with respect to the right page margin.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4186223" role="paragraph" l10n="NEW">For a hanging indent, enter a positive value for <item type="menuitem">Before text</item> and a negative value for <item type="menuitem">First line</item>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id1491134" role="paragraph" l10n="NEW"><link href="text/shared/01/05030100.xhp">Format - Paragraph - Indents &amp; Spacing</link></paragraph>
+      <embed href="text/swriter/guide/ruler.xhp#ruler"/>
+      <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_delete.xhp b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
index 272f8b9aa0..3b832ae028 100755
--- a/helpcontent2/source/text/swriter/guide/indices_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_delete.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,55 +27,46 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_deletexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Editing or Deleting Index and Table Entries</title>
-<filename>/text/swriter/guide/indices_delete.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-01T15:03:44">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_deletexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Editing or Deleting Index and Table Entries</title>
+         <filename>/text/swriter/guide/indices_delete.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155186"><bookmark_value>indexes; editing or deleting entries</bookmark_value>
-<bookmark_value>tables of contents; editing or deleting entries</bookmark_value>
-<bookmark_value>deleting;entries of indexes/tables of contents</bookmark_value>
-<bookmark_value>editing;table/index entries</bookmark_value>
+      <bookmark_value>tables of contents; editing or deleting entries</bookmark_value>
+      <bookmark_value>deleting;entries of indexes/tables of contents</bookmark_value>
+      <bookmark_value>editing;table/index entries</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="indices_delete"><link href="text/swriter/guide/indices_delete.xhp" name="Editing or Deleting Index and Table Entries">Editing or Deleting Index and Table Entries</link>
+<paragraph xml-lang="en-US" id="hd_id3155186" role="heading" level="1" l10n="U"
+                 oldref="11"><variable id="indices_delete"><link href="text/swriter/guide/indices_delete.xhp" name="Editing or Deleting Index and Table Entries">Editing or Deleting Index and Table Entries</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="12">Index entries are inserted as fields into your document. To view fields in your document, choose <emph>View </emph>and ensure that <emph>Field Shadings </emph>is selected. </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155507" xml-lang="en-US" l10n="U" oldref="13">Place the cursor immediately in front of the index entry in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155526" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Edit - Index Entry</emph>, and do one of the following: </paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154238" xml-lang="en-US" l10n="U" oldref="17">To change the entry, enter different text in the <emph>Entry</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="18">To remove the entry, click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155893" xml-lang="en-US" l10n="U" oldref="15">To cycle through the index entries in your document, click the next or the previous arrows in the <link href="text/swriter/01/02160000.xhp" name="Edit Index Entry dialog"><emph>Edit Index Entry</emph> dialog</link>.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155855" role="paragraph" l10n="U" oldref="12">Index entries are inserted as fields into your document. To view fields in your document, choose <item type="menuitem">View</item>
+         <emph/>and ensure that <item type="menuitem">Field Shadings</item>
+         <emph/>is selected. </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155507" role="listitem" l10n="U" oldref="13">Place the cursor immediately in front of the index entry in your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155526" role="listitem" l10n="U" oldref="16">Choose <emph>Edit - Index Entry</emph>, and do one of the following: </paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <paragraph xml-lang="en-US" id="par_id3155893" role="paragraph" l10n="U" oldref="15">To cycle through the index entries in your document, click the next or the previous arrows in the <link href="text/swriter/01/02160000.xhp" name="Edit Index Entry dialog"><emph>Edit Index Entry</emph> dialog</link>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_edit.xhp b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
index aaf7fdaa70..e3c0851cc8 100755
--- a/helpcontent2/source/text/swriter/guide/indices_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_edit.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,46 +27,46 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_editxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Updating, Editing and Deleting Indexes and Tables of Contents</title>
-<filename>/text/swriter/guide/indices_edit.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T09:35:02">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_editxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Updating, Editing and Deleting Indexes and Tables of Contents</title>
+         <filename>/text/swriter/guide/indices_edit.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>indexes; editing/updating/deleting</bookmark_value>
-<bookmark_value>tables of contents; editing and deleting</bookmark_value>
-<bookmark_value>updating;indexes/tables of contents</bookmark_value>
-<bookmark_value>editing;indexes/tables of contents</bookmark_value>
-<bookmark_value>deleting;indexes/tables of contents</bookmark_value>
+      <bookmark_value>tables of contents; editing and deleting</bookmark_value>
+      <bookmark_value>updating;indexes/tables of contents</bookmark_value>
+      <bookmark_value>editing;indexes/tables of contents</bookmark_value>
+      <bookmark_value>deleting;indexes/tables of contents</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="56"><variable id="indices_edit"><link href="text/swriter/guide/indices_edit.xhp" name="Updating, Editing and Deleting Indexes and Tables of Contents">Updating, Editing and Deleting Indexes and Tables of Contents</link>
+<paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U"
+                 oldref="56"><variable id="indices_edit"><link href="text/swriter/guide/indices_edit.xhp" name="Updating, Editing and Deleting Indexes and Tables of Contents">Updating, Editing and Deleting Indexes and Tables of Contents</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155856" xml-lang="en-US" l10n="U" oldref="57">Place the cursor in the index or table of contents.</paragraph>
-<paragraph role="listitem" id="par_id3155871" xml-lang="en-US" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select<emph> Enable</emph> in the<emph> Cursor in protected areas</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="U" oldref="58">Right-click and choose an editing option from the menu.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155872" xml-lang="en-US" l10n="U" oldref="60">You can also make changes directly to an index or table of contents. Right-click in the index or table of contents, choose <emph>Edit Index/Table</emph>, click <emph>Index/Table</emph> tab, and then clear the <emph>Protected from manual changes</emph> check box.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155856" role="listitem" l10n="U" oldref="57">Place the cursor in the index or table of contents.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155871" role="listitem" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</item>, and then select<emph/>
+               <item type="menuitem">Enable</item> in the<emph/>
+               <item type="menuitem">Cursor in protected areas</item> section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="58">Right-click and choose an editing option from the menu.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155872" role="paragraph" l10n="U" oldref="60">You can also make changes directly to an index or table of contents. Right-click in the index or table of contents, choose <emph>Edit Index/Table</emph>, click <emph>Index/Table</emph> tab, and then clear the <emph>Protected from manual changes</emph> check box.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_enter.xhp b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
index ff4c8076ef..b0729eea40 100755
--- a/helpcontent2/source/text/swriter/guide/indices_enter.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_enter.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,67 +29,58 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideindices_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Index or Table of Contents Entries</title>
-<filename>/text/swriter/guide/indices_enter.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideindices_enterxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Index or Table of Contents Entries</title>
+         <filename>/text/swriter/guide/indices_enter.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149689"><bookmark_value>indexes; defining entries in</bookmark_value>
-<bookmark_value>tables of contents; defining entries in</bookmark_value>
-<bookmark_value>entries; defining in indexes/tables of contents</bookmark_value>
+      <bookmark_value>tables of contents; defining entries in</bookmark_value>
+      <bookmark_value>entries; defining in indexes/tables of contents</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="indices_enter"><link href="text/swriter/guide/indices_enter.xhp" name="Defining Index or Table of Contents Entries">Defining Index or Table of Contents Entries</link>
+<paragraph xml-lang="en-US" id="hd_id3149689" role="heading" level="1" l10n="U" oldref="4"><variable id="indices_enter"><link href="text/swriter/guide/indices_enter.xhp" name="Defining Index or Table of Contents Entries">Defining Index or Table of Contents Entries</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3155862" xml-lang="en-US" level="2" l10n="U" oldref="6">Defining Index Entries</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156380" xml-lang="en-US" l10n="U" oldref="7">Click in a word, or select the words in your document that you want to use as an index entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Insert - Indexes and Tables - Entry</emph>, and do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="11">To change the text that appears in the index, type the text that you want in the <emph>Entry</emph> box. The text that you type here does not replace the selected text in the document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154258" xml-lang="en-US" l10n="U" oldref="8">To add an index mark to similar words in your document, select <emph>Apply to all similar texts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155889" xml-lang="en-US" l10n="U" oldref="10">To add the entries to a custom index, click the <emph>New User-defined Index</emph> icon, enter the name of the index, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147119" xml-lang="en-US" level="2" l10n="U" oldref="12">Defining Table of Contents Entries</paragraph>
-<paragraph role="paragraph" id="par_id3147132" xml-lang="en-US" l10n="CHG" oldref="5">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents.</paragraph>
-<paragraph role="heading" id="hd_id3150230" xml-lang="en-US" level="3" l10n="U" oldref="13">To use a custom paragraph style as a table of contents entry:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150933" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Tools - Outline Numbering</emph> and click the <emph>Numbering</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150964" xml-lang="en-US" l10n="U" oldref="15">Select the paragraph style that you want to include in your table of contents in the <emph>Paragraph Style</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150523" xml-lang="en-US" l10n="U" oldref="16">In the <emph>Level</emph> list, click the hierarchical level that you want to apply the paragraph style to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153730" xml-lang="en-US" l10n="U" oldref="17">Click <emph>OK</emph>. You can now apply the style to headings in your document and include them in your table of contents. </paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3155862" role="heading" level="2" l10n="U" oldref="6">To Define Index Entries</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156380" role="listitem" l10n="U" oldref="7">Click in a word, or select the words in your document that you want to use as an index entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147409" role="listitem" l10n="U" oldref="9">Choose <emph>Insert - Indexes and Tables - Entry</emph>, and do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <paragraph xml-lang="en-US" id="hd_id3147119" role="heading" level="2" l10n="U"
+                 oldref="12">To Define Table of Contents Entries</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147132" role="paragraph" l10n="CHG" oldref="5">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150230" role="heading" level="3" l10n="U"
+                 oldref="13">To Use a Custom Paragraph Style as a Table of Contents Entry</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150933" role="listitem" l10n="U" oldref="14">Choose <emph>Tools - Outline Numbering</emph> and click the <emph>Numbering</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150964" role="listitem" l10n="U" oldref="15">Select the paragraph style that you want to include in your table of contents in the <emph>Paragraph Style</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150523" role="listitem" l10n="U" oldref="16">In the <emph>Level</emph> list, click the hierarchical level that you want to apply the paragraph style to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153730" role="listitem" l10n="U" oldref="17">Click <emph>OK</emph>. You can now apply the style to headings in your document and include them in your table of contents. </paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_form.xhp b/helpcontent2/source/text/swriter/guide/indices_form.xhp
index 0cc0a25857..128a6886d2 100644
--- a/helpcontent2/source/text/swriter/guide/indices_form.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_form.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_form.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,84 +27,82 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_formxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting an Index or a Table of Contents</title>
-<filename>/text/swriter/guide/indices_form.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-07T14:26:30">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_formxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting an Index or a Table of Contents</title>
+         <filename>/text/swriter/guide/indices_form.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155855"><bookmark_value>indexes; formatting</bookmark_value>
-<bookmark_value>editing; index format</bookmark_value>
-<bookmark_value>tables of contents; formatting</bookmark_value>
-<bookmark_value>entries; in tables of contents, as hyperlinks</bookmark_value>
-<bookmark_value>tables of contents; hyperlinks as entries</bookmark_value>
-<bookmark_value>hyperlinks; in tables of contents and indexes</bookmark_value>
-<bookmark_value>formatting;indexes and tables of contents</bookmark_value>
+      <bookmark_value>editing; index format</bookmark_value>
+      <bookmark_value>tables of contents; formatting</bookmark_value>
+      <bookmark_value>entries; in tables of contents, as hyperlinks</bookmark_value>
+      <bookmark_value>tables of contents; hyperlinks as entries</bookmark_value>
+      <bookmark_value>hyperlinks; in tables of contents and indexes</bookmark_value>
+      <bookmark_value>formatting;indexes and tables of contents</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155855" xml-lang="en-US" level="1" l10n="U" oldref="38"><variable id="indices_form"><link href="text/swriter/guide/indices_form.xhp" name="Formatting an Index or a Table of Contents">Formatting an Index or a Table of Contents</link>
+<paragraph xml-lang="en-US" id="hd_id3155855" role="heading" level="1" l10n="U"
+                 oldref="38"><variable id="indices_form"><link href="text/swriter/guide/indices_form.xhp" name="Formatting an Index or a Table of Contents">Formatting an Index or a Table of Contents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154259" xml-lang="en-US" l10n="U" oldref="39">You can apply different paragraph styles, assign hyperlinks to entries, change the layout of indexes, and change the background color of indexes in the <emph>Insert Index</emph> dialog.</paragraph>
-<paragraph role="heading" id="hd_id3155888" xml-lang="en-US" level="2" l10n="U" oldref="44">To apply a different paragraph style to an index level:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147110" xml-lang="en-US" l10n="U" oldref="45">Right-click in the index or table of contents, and then choose <emph>Edit Index/Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147135" xml-lang="en-US" l10n="U" oldref="46">Click the <emph>Styles </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150229" xml-lang="en-US" l10n="U" oldref="47">Click an index level in the <emph>Levels </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150934" xml-lang="en-US" l10n="U" oldref="48">Click the style that you want to apply in the <emph>Paragraph Style </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150960" xml-lang="en-US" l10n="U" oldref="56">Click the assign button <emph>&lt;</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150516" xml-lang="en-US" l10n="U" oldref="49">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146878" xml-lang="en-US" level="2" l10n="U" oldref="40">To assign hyperlinks to entries in a table of contents:</paragraph>
-<paragraph role="paragraph" id="par_id3146890" xml-lang="en-US" l10n="U" oldref="50">You can assign a cross-reference as a hyperlink to entries in a table of contents.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150712" xml-lang="en-US" l10n="U" oldref="51">Right-click in the table of contents, and then choose <emph>Edit Index/Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150738" xml-lang="en-US" l10n="U" oldref="42">Click the <emph>Entries</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148399" xml-lang="en-US" l10n="U" oldref="52">Click the heading level that you want to assign hyperlinks to in the <emph>Level </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148424" xml-lang="en-US" l10n="U" oldref="53">In the <emph>Structure </emph>area, click in the box in front of <emph>E#</emph>, and then click <emph>Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153171" xml-lang="en-US" l10n="U" oldref="54">Click in the box behind the <emph>E</emph>, and then click <emph>Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147060" xml-lang="en-US" l10n="U" oldref="55">Repeat for each heading level that you want to create hyperlinks for, or click the <emph>All levels</emph> button to apply the formatting to all levels.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3154259" role="paragraph" l10n="U" oldref="39">You can apply different paragraph styles, assign hyperlinks to entries, change the layout of indexes, and change the background color of indexes in the <emph>Insert Index</emph> dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155888" role="heading" level="2" l10n="U"
+                 oldref="44">To Apply a Different Paragraph Style to an Index Level</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147110" role="listitem" l10n="U" oldref="45">Right-click in the index or table of contents, and then choose <emph>Edit Index/Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147135" role="listitem" l10n="U" oldref="46">Click the <emph>Styles </emph>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150229" role="listitem" l10n="U" oldref="47">Click an index level in the <emph>Levels </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150934" role="listitem" l10n="U" oldref="48">Click the style that you want to apply in the <emph>Paragraph Style </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150960" role="listitem" l10n="U" oldref="56">Click the assign button <emph>&lt;</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150516" role="listitem" l10n="U" oldref="49">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3146878" role="heading" level="2" l10n="U"
+                 oldref="40">To Assign Hyperlinks to Entries in a Table of Contents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146890" role="paragraph" l10n="U" oldref="50">You can assign a cross-reference as a hyperlink to entries in a table of contents.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150712" role="listitem" l10n="U" oldref="51">Right-click in the table of contents, and then choose <emph>Edit Index/Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150738" role="listitem" l10n="U" oldref="42">Click the <emph>Entries</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148399" role="listitem" l10n="U" oldref="52">In the <item type="menuitem">Level</item> list click the heading level that you want to assign hyperlinks to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148424" role="listitem" l10n="U" oldref="53">In the <emph>Structure </emph>area, click in the box in front of <emph>E#</emph>, and then click <emph>Hyperlink</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153171" role="listitem" l10n="U" oldref="54">Click in the box behind the <emph>E</emph>, and then click <emph>Hyperlink</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147060" role="listitem" l10n="CHG" oldref="55">Repeat for each heading level that you want to create hyperlinks for, or click the <item type="menuitem">All</item> button to apply the formatting to all levels.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_index.xhp b/helpcontent2/source/text/swriter/guide/indices_index.xhp
index eb6b887fbf..755b4d6e09 100755
--- a/helpcontent2/source/text/swriter/guide/indices_index.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_index.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_index.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,57 +29,55 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_indexxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating Alphabetical Indexes</title>
-<filename>/text/swriter/guide/indices_index.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-07-21T12:33:39">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_indexxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating Alphabetical Indexes</title>
+         <filename>/text/swriter/guide/indices_index.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155911"><bookmark_value>concordance files;indexes</bookmark_value>
-<bookmark_value>indexes; alphabetical indexes</bookmark_value>
-<bookmark_value>alphabetical indexes</bookmark_value>
+      <bookmark_value>indexes; alphabetical indexes</bookmark_value>
+      <bookmark_value>alphabetical indexes</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155911" xml-lang="en-US" level="1" l10n="U" oldref="24"><variable id="indices_index"><link href="text/swriter/guide/indices_index.xhp" name="Creating Alphabetical Indexes">Creating Alphabetical Indexes</link>
+<paragraph xml-lang="en-US" id="hd_id3155911" role="heading" level="1" l10n="U"
+                 oldref="24"><variable id="indices_index"><link href="text/swriter/guide/indices_index.xhp" name="Creating Alphabetical Indexes">Creating Alphabetical Indexes</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154233" xml-lang="en-US" l10n="U" oldref="25">Click in your document where you want to insert the index.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154252" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155884" xml-lang="en-US" l10n="U" oldref="31">On the <emph>Index/Table</emph> tab, select "Alphabetical Index" in the <emph>Type</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147114" xml-lang="en-US" l10n="U" oldref="36">If you want to use a concordance file, select <emph>Concordance file</emph> in the <emph>Options </emph>area, click the <emph>File</emph>, and then locate an existing file or create a new concordance file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150223" xml-lang="en-US" l10n="U" oldref="28">Set the formatting options for the index, either on the current tab, or on any of the other tabs of this dialog. For example, if you want to use single letter headings in your index, click the <emph>Entries</emph> tab, and then select <emph>Alphabetical delimiter</emph>. To change the formatting of levels in the index, click the <emph>Styles</emph> tab. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150946" xml-lang="en-US" l10n="U" oldref="27">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150502" xml-lang="en-US" l10n="U" oldref="37">To update the index, right-click in the index, and then choose <emph>Update Index/Table</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3152760" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/04120250.xhp" name="Creating a concordance file">Creating a concordance file</link></paragraph>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154233" role="listitem" l10n="U" oldref="25">Click in your document where you want to insert the index.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154252" role="listitem" l10n="U" oldref="26">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155884" role="listitem" l10n="U" oldref="31">On the <emph>Index/Table</emph> tab, select "Alphabetical Index" in the <emph>Type</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147114" role="listitem" l10n="U" oldref="36">If you want to use a concordance file, select <item type="menuitem">Concordance file</item> in the <item type="menuitem">Options</item>
+               <emph/>area, click the <item type="menuitem">File</item> button, and then locate an existing file or create a new concordance file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150223" role="listitem" l10n="U" oldref="28">Set the formatting options for the index, either on the current tab, or on any of the other tabs of this dialog. For example, if you want to use single letter headings in your index, click the <emph>Entries</emph> tab, and then select <emph>Alphabetical delimiter</emph>. To change the formatting of levels in the index, click the <emph>Styles</emph> tab. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150946" role="listitem" l10n="U" oldref="27">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150502" role="listitem" l10n="U" oldref="37">To update the index, right-click in the index, and then choose <emph>Update Index/Table</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3152760" role="paragraph" l10n="U" oldref="38"><link href="text/swriter/01/04120250.xhp" name="Creating a concordance file">Creating a concordance file</link></paragraph>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_literature.xhp b/helpcontent2/source/text/swriter/guide/indices_literature.xhp
index 3b0d3ac492..850956c246 100644
--- a/helpcontent2/source/text/swriter/guide/indices_literature.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_literature.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_literature.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,98 +29,108 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideindices_literaturexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating a Bibliography</title>
-<filename>/text/swriter/guide/indices_literature.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideindices_literaturexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating a Bibliography</title>
+         <filename>/text/swriter/guide/indices_literature.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149687"><bookmark_value>indexes;creating bibliographies</bookmark_value>
-<bookmark_value>databases;creating bibliographies</bookmark_value>
-<bookmark_value>bibliographies</bookmark_value>
-<bookmark_value>entries;bibliographies</bookmark_value>
-<bookmark_value>storing bibliographic information</bookmark_value>
+      <bookmark_value>databases;creating bibliographies</bookmark_value>
+      <bookmark_value>bibliographies</bookmark_value>
+      <bookmark_value>entries;bibliographies</bookmark_value>
+      <bookmark_value>storing bibliographic information</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="1" l10n="U" oldref="46"><variable id="indices_literature"><link href="text/swriter/guide/indices_literature.xhp" name="Creating a Bibliography">Creating a Bibliography</link>
+<paragraph xml-lang="en-US" id="hd_id3149687" role="heading" level="1" l10n="U"
+                 oldref="46"><variable id="indices_literature"><link href="text/swriter/guide/indices_literature.xhp" name="Creating a Bibliography">Creating a Bibliography</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155864" xml-lang="en-US" l10n="U" oldref="60">A bibliography is a list of works that you reference in a document.</paragraph>
-<paragraph role="heading" id="hd_id3153402" xml-lang="en-US" level="2" l10n="U" oldref="61">Storing Bibliographic Information</paragraph>
-<paragraph role="paragraph" id="par_id3153414" xml-lang="en-US" l10n="U" oldref="62">$[officename] stores bibliographic information in a bibliography database, or in an individual document.</paragraph>
-<paragraph role="heading" id="hd_id3154244" xml-lang="en-US" level="3" l10n="U" oldref="63">To store information in the bibliography database:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155872" xml-lang="en-US" l10n="U" oldref="50">Choose <link href="text/shared/01/02250000.xhp" name="Tools - Bibliography Database"><emph>Tools - Bibliography Database</emph></link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155900" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>Insert - Record</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147123" xml-lang="en-US" l10n="U" oldref="65">Type a name for the bibliography entry in the <emph>Short name </emph>box, and then add additional information to the record in the remaining boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150219" xml-lang="en-US" l10n="U" oldref="66">Close the<emph> Bibliography Database</emph> window. </paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150242" xml-lang="en-US" level="3" l10n="U" oldref="67">To store bibliographic information in an individual document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150945" xml-lang="en-US" l10n="U" oldref="68">Click in your document where you want to add the bibliography entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150964" xml-lang="en-US" l10n="U" oldref="51">Choose <link href="text/swriter/01/04120300.xhp" name="Insert - Indexes and Tables - Bibliography Entry"><emph>Insert - Indexes and Tables - Bibliography Entry</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150525" xml-lang="en-US" l10n="U" oldref="69">Select <emph>From document content</emph> and click <emph>New</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153738" xml-lang="en-US" l10n="U" oldref="70">Type a name for the bibliography entry in the <emph>Short name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153763" xml-lang="en-US" l10n="U" oldref="71">Select the publication source for the record in the <emph>Type </emph>box, and then add additional information in the remaining boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146873" xml-lang="en-US" l10n="U" oldref="72">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146897" xml-lang="en-US" l10n="U" oldref="73">In the <emph>Insert Bibliography Entry </emph>dialog, click <emph>Insert</emph>, and then <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/swriter/01/04120300.xhp#speicherhinweis"/>
-<paragraph role="heading" id="hd_id3150741" xml-lang="en-US" level="2" l10n="U" oldref="74">Inserting Bibliography Entries From the Bibliography Database</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148402" xml-lang="en-US" l10n="U" oldref="75">Click in your document where you want to add the bibliography entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148421" xml-lang="en-US" l10n="U" oldref="52">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="3">
-<listitem>
-<paragraph role="listitem" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="53">Select <emph>From bibliography database</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147059" xml-lang="en-US" l10n="U" oldref="54">Select the name of the bibliography entry that you want to insert in the <emph>Short name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="76">Click <emph>Insert</emph> and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="77"><link href="text/swriter/01/04120300.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-<paragraph role="paragraph" id="par_id6367076" xml-lang="en-US" l10n="NEW">Some external tools exist that can interact with %PRODUCTNAME. One example is called <link href="http://bibus-biblio.sourceforge.net/wiki/index.php/Main_Page">Bibus</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155864" role="paragraph" l10n="U" oldref="60">A bibliography is a list of works that you reference in a document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153402" role="heading" level="2" l10n="U"
+                 oldref="61">Storing Bibliographic Information</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="U" oldref="62">$[officename] stores bibliographic information in a bibliography database, or in an individual document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154244" role="heading" level="3" l10n="U"
+                 oldref="63">To Store Information in the Bibliography Database</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155872" role="listitem" l10n="U" oldref="50">Choose <link href="text/shared/01/02250000.xhp" name="Tools - Bibliography Database"><emph>Tools - Bibliography Database</emph></link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155900" role="listitem" l10n="U" oldref="64">Choose <emph>Insert - Record</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147123" role="listitem" l10n="U" oldref="65">Type a name for the bibliography entry in the <item type="menuitem">Short name</item>
+               <emph/>box, and then add additional information to the record in the remaining boxes.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150219" role="listitem" l10n="U" oldref="66">Close the<emph/>
+               <item type="menuitem">Bibliography Database</item> window. </paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150242" role="heading" level="3" l10n="U"
+                 oldref="67">To Store Bibliographic Information in an Individual Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150945" role="listitem" l10n="U" oldref="68">Click in your document where you want to add the bibliography entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150964" role="listitem" l10n="U" oldref="51">Choose <link href="text/swriter/01/04120300.xhp" name="Insert - Indexes and Tables - Bibliography Entry"><emph>Insert - Indexes and Tables - Bibliography Entry</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150525" role="listitem" l10n="U" oldref="69">Select <emph>From document content</emph> and click <emph>New</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153738" role="listitem" l10n="U" oldref="70">Type a name for the bibliography entry in the <item type="menuitem">Short name</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153763" role="listitem" l10n="U" oldref="71">Select the publication source for the record in the <item type="menuitem">Type</item>
+               <emph/>box, and then add additional information in the remaining boxes.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146873" role="listitem" l10n="U" oldref="72">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146897" role="listitem" l10n="U" oldref="73">In the <item type="menuitem">Insert Bibliography Entry</item>
+               <emph/>dialog, click <item type="menuitem">Insert</item>, and then <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/swriter/01/04120300.xhp#speicherhinweis"/>
+      <paragraph xml-lang="en-US" id="hd_id3150741" role="heading" level="2" l10n="U"
+                 oldref="74">Inserting Bibliography Entries From the Bibliography Database</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148402" role="listitem" l10n="U" oldref="75">Click in your document where you want to add the bibliography entry.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148421" role="listitem" l10n="U" oldref="52">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph>.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="3">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153231" role="listitem" l10n="U" oldref="53">Select <emph>From bibliography database</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147059" role="listitem" l10n="U" oldref="54">Select the name of the bibliography entry that you want to insert in the <item type="menuitem">Short name</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147085" role="listitem" l10n="U" oldref="76">Click <emph>Insert</emph> and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="77"><link href="text/swriter/01/04120300.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
+         <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+         <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+         <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+         <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+         <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+         <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+         <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+         <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+         <paragraph xml-lang="en-US" id="par_id6367076" role="paragraph" l10n="NEW">Some external tools exist that can interact with %PRODUCTNAME. One example is called <link href="http://bibus-biblio.sourceforge.net/wiki/index.php/Main_Page">Bibus</link>.</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp b/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
index 8b635314a0..dfb2f76e29 100755
--- a/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_multidoc.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,42 +29,44 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideindices_multidocxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Indexes Covering Several Documents</title>
-<filename>/text/swriter/guide/indices_multidoc.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideindices_multidocxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Indexes Covering Several Documents</title>
+         <filename>/text/swriter/guide/indices_multidoc.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153418"><bookmark_value>indexes;multiple documents</bookmark_value>
-<bookmark_value>multiple documents;indexes</bookmark_value>
-<bookmark_value>merging;indexes</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="1" l10n="U" oldref="43"><variable id="indices_multidoc"><link href="text/swriter/guide/indices_multidoc.xhp" name="Indexes Covering Several Documents">Indexes Covering Several Documents</link>
+      <bookmark_value>multiple documents;indexes</bookmark_value>
+      <bookmark_value>merging;indexes</bookmark_value>
+      <bookmark_value>master documents;indexes</bookmark_value>
+</bookmark><comment>MW inserted "master documents;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153418" role="heading" level="1" l10n="U"
+                 oldref="43"><variable id="indices_multidoc"><link href="text/swriter/guide/indices_multidoc.xhp" name="Indexes Covering Several Documents">Indexes Covering Several Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155872" xml-lang="en-US" l10n="U" oldref="44">There are several ways to create an index that spans several documents:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="42">Create an <link href="text/swriter/01/04120210.xhp" name="index in each individual document">index in each individual document</link>, copy and paste the indexes into a single document, and then edit them.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147118" xml-lang="en-US" l10n="CHG" oldref="45">Select each index, choose <link href="text/swriter/01/04020000.xhp" name="Insert - Section"><emph>Insert - Section</emph></link>, and then enter a name for the index. In a separate document, choose<emph> Insert - Section</emph>, select <emph>Link</emph>, click the browse button (...), and then locate and insert a named index section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150230" xml-lang="en-US" l10n="CHG" oldref="46">Create a <link href="text/shared/01/01010001.xhp" name="master document">master document</link>, add as subdocuments the files that you want to include in the index, and then choose <emph>Insert - Index and Tables - Indexes and Tables</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155872" role="paragraph" l10n="U" oldref="44">There are several ways to create an index that spans several documents:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155895" role="listitem" l10n="U" oldref="42">Create an <link href="text/swriter/01/04120210.xhp" name="index in each individual document">index in each individual document</link>, copy and paste the indexes into a single document, and then edit them.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147118" role="listitem" l10n="CHG" oldref="45">Select each index, choose <link href="text/swriter/01/04020000.xhp" name="Insert - Section"><item type="menuitem">Insert - Section</item></link>, and then enter a name for the index. In a separate document, choose<emph/>
+               <item type="menuitem">Insert - Section</item>, select <item type="menuitem">Link</item>, click the browse button (<item type="menuitem">...</item>), and then locate and insert a named index section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150230" role="listitem" l10n="CHG" oldref="46">Create a <link href="text/shared/01/01010001.xhp" name="master document">master document</link>, add as subdocuments the files that you want to include in the index, and then choose <emph>Insert - Index and Tables - Indexes and Tables</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_toc.xhp b/helpcontent2/source/text/swriter/guide/indices_toc.xhp
index 07a0ab6350..e85642c04e 100755
--- a/helpcontent2/source/text/swriter/guide/indices_toc.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_toc.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_toc.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,63 +29,65 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_tocxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating a Table of Contents</title>
-<filename>/text/swriter/guide/indices_toc.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T14:59:12">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_tocxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating a Table of Contents</title>
+         <filename>/text/swriter/guide/indices_toc.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147104"><bookmark_value>tables of contents; creating and updating</bookmark_value>
-<bookmark_value>updating; tables of contents</bookmark_value>
+      <bookmark_value>updating; tables of contents</bookmark_value>
 </bookmark><comment>mw deleted "creating;"</comment>
-<paragraph role="heading" id="hd_id3147104" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="indices_toc"><link href="text/swriter/guide/indices_toc.xhp" name="Creating a Table of Contents">Creating a Table of Contents</link>
+<paragraph xml-lang="en-US" id="hd_id3147104" role="heading" level="1" l10n="U"
+                 oldref="16"><variable id="indices_toc"><link href="text/swriter/guide/indices_toc.xhp" name="Creating a Table of Contents">Creating a Table of Contents</link>
 </variable></paragraph>
-<section id="tomanual">
-<paragraph role="paragraph" id="par_id3150942" xml-lang="en-US" l10n="U" oldref="45">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents. After you apply these styles, you can then create a table of contents.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150510" xml-lang="en-US" l10n="U" oldref="17">Click in your document where you want to create the table of contents.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150528" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, and then click the <link href="text/swriter/01/04120211.xhp" name="Index/Table"><emph>Index/Table</emph></link> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153746" xml-lang="en-US" l10n="U" oldref="46">Select "Table of Contents" in the <emph>Type</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="47">Select any options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146872" xml-lang="en-US" l10n="U" oldref="19">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146896" xml-lang="en-US" l10n="U" oldref="20">If you want to use a different paragraph style as a table of contents entry, select the <emph>Additional Styles </emph>check box in the <emph>Create from</emph> area, and then click the (<emph>...</emph>) button next to the check box. In the <emph>Assign Styles</emph> dialog, click the style in the list, and then click the <emph>&gt;&gt; </emph>or the <emph>&lt;&lt; </emph>button to define the outline level for the paragraph style.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3153148" xml-lang="en-US" level="2" l10n="U" oldref="21">Updating a Table of Contents</paragraph>
-<paragraph role="paragraph" id="par_id3153161" xml-lang="en-US" l10n="U" oldref="22">Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153183" xml-lang="en-US" l10n="U" oldref="48">Right-click in the table of contents and choose <emph>Update Index/Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147066" xml-lang="en-US" l10n="U" oldref="44">Choose <emph>Tools - Update - All Indexes and Tables</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <section id="tomanual">
+         <paragraph xml-lang="en-US" id="par_id3150942" role="paragraph" l10n="U" oldref="45">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents. After you apply these styles, you can then create a table of contents.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id5876949" role="heading" level="2" l10n="NEW">To Insert a Table of Contents</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3150510" role="listitem" l10n="U" oldref="17">Click in your document where you want to create the table of contents.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3150528" role="listitem" l10n="U" oldref="18">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, and then click the <link href="text/swriter/01/04120211.xhp" name="Index/Table"><emph>Index/Table</emph></link> tab.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3153746" role="listitem" l10n="U" oldref="46">Select "Table of Contents" in the <emph>Type</emph> box.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3146856" role="listitem" l10n="U" oldref="47">Select any options that you want.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id3146872" role="listitem" l10n="U" oldref="19">Click <emph>OK</emph>.</paragraph>
+            </listitem>
+         </list>
+         <paragraph xml-lang="en-US" id="par_id3146896" role="paragraph" l10n="U" oldref="20">If you want to use a different paragraph style as a table of contents entry, select the <item type="menuitem">Additional Styles</item>
+            <emph/>check box in the <item type="menuitem">Create from</item> area, and then click the (<item type="menuitem">...</item>) button next to the check box. In the <item type="menuitem">Assign Styles</item> dialog, click the style in the list, and then click the <item type="menuitem">&gt;&gt;</item>
+            <emph/>or the <item type="menuitem">&lt;&lt;</item>
+            <emph/>button to define the outline level for the paragraph style.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="hd_id3153148" role="heading" level="2" l10n="U"
+                 oldref="21">To Update a Table of Contents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153161" role="paragraph" l10n="U" oldref="22">Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153183" role="listitem" l10n="U" oldref="48">Right-click in the table of contents and choose <emph>Update Index/Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147066" role="listitem" l10n="U" oldref="44">Choose <emph>Tools - Update - All Indexes and Tables</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/indices_userdef.xhp b/helpcontent2/source/text/swriter/guide/indices_userdef.xhp
index 57c7468b85..415b83a9a3 100644
--- a/helpcontent2/source/text/swriter/guide/indices_userdef.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_userdef.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: indices_userdef.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,76 +27,83 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideindices_userdefxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">User-Defined Indexes</title>
-<filename>/text/swriter/guide/indices_userdef.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-09T10:35:16">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideindices_userdefxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">User-Defined Indexes</title>
+         <filename>/text/swriter/guide/indices_userdef.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154896"><bookmark_value>indexes; creating user-defined indexes</bookmark_value>
-<bookmark_value>user-defined indexes</bookmark_value>
+      <bookmark_value>user-defined indexes</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154896" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="indices_userdef"><link href="text/swriter/guide/indices_userdef.xhp" name="User-Defined Indexes">User-Defined Indexes</link>
+<paragraph xml-lang="en-US" id="hd_id3154896" role="heading" level="1" l10n="U"
+                 oldref="30"><variable id="indices_userdef"><link href="text/swriter/guide/indices_userdef.xhp" name="User-Defined Indexes">User-Defined Indexes</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155184" xml-lang="en-US" l10n="U" oldref="31">You can create as many user-defined indexes as you want.</paragraph>
-<paragraph role="heading" id="hd_id3155915" xml-lang="en-US" level="2" l10n="U" oldref="47">Creating a User-Defined Index</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155867" xml-lang="en-US" l10n="U" oldref="48">Select a word or words that you want to add to a user-defined index.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153410" xml-lang="en-US" l10n="U" oldref="49">Choose <emph>Insert - Indexes and Tables - Entry</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="U" oldref="50">Click the <emph>New User-defined Index</emph> button next to the <emph>Index </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="U" oldref="51">Type a name for the index in the <emph>Name </emph>box and click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147114" xml-lang="en-US" l10n="U" oldref="52">Click<emph> Insert</emph> to add the selected word(s) to the new index. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147139" xml-lang="en-US" l10n="U" oldref="53">Click<emph> Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150231" xml-lang="en-US" level="2" l10n="U" oldref="54">Inserting a User-Defined Index</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150933" xml-lang="en-US" l10n="U" oldref="32">Click in the document where you want to insert the index.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150952" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150509" xml-lang="en-US" l10n="U" oldref="55">On the <emph>Index/Table</emph> tab, select the name of the user-defined index that you created in the <emph>Type </emph>box.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3146881" xml-lang="en-US" l10n="U" oldref="56">Select any options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146897" xml-lang="en-US" l10n="U" oldref="34">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150720" xml-lang="en-US" l10n="U" oldref="20">If you want to use a different paragraph style as a table of contents entry, select <emph>Styles</emph>, and then click the (<emph>...</emph>) button next to the box. Click the style in the list, and then click the <emph>&gt;&gt; </emph>or the <emph>&lt;&lt; </emph>button to define the outline level for the paragraph style.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
-<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
-<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
-<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
-<embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
-<embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
-<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
-<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155184" role="paragraph" l10n="U" oldref="31">You can create as many user-defined indexes as you want.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155915" role="heading" level="2" l10n="U"
+                 oldref="47">To Create a User-Defined Index</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155867" role="listitem" l10n="U" oldref="48">Select a word or words that you want to add to a user-defined index.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153410" role="listitem" l10n="U" oldref="49">Choose <emph>Insert - Indexes and Tables - Entry</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="50">Click the <item type="menuitem">New User-defined Index</item> button next to the <item type="menuitem">Index</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="U" oldref="51">Type a name for the index in the <item type="menuitem">Name</item>
+               <emph/>box and click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147114" role="listitem" l10n="U" oldref="52">Click<emph/>
+               <item type="menuitem">Insert</item> to add the selected word(s) to the new index. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147139" role="listitem" l10n="U" oldref="53">Click<emph/>
+               <item type="menuitem">Close</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3150231" role="heading" level="2" l10n="U"
+                 oldref="54">To Insert a User-Defined Index</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150933" role="listitem" l10n="U" oldref="32">Click in the document where you want to insert the index.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150952" role="listitem" l10n="U" oldref="33">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150509" role="listitem" l10n="U" oldref="55">On the <item type="menuitem">Index/Table</item> tab, select the name of the user-defined index that you created in the <item type="menuitem">Type</item>
+               <emph/>box.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="4">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146881" role="listitem" l10n="U" oldref="56">Select any options that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3146897" role="listitem" l10n="U" oldref="34">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3150720" role="paragraph" l10n="U" oldref="20">If you want to use a different paragraph style as a table of contents entry, select <item type="menuitem">Styles</item>, and then click the (<item type="menuitem">...</item>) button next to the box. Click the style in the list, and then click the <item type="menuitem">&gt;&gt;</item>
+         <emph/>or the <item type="menuitem">&lt;&lt;</item>
+         <emph/>button to define the outline level for the paragraph style.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
+      <embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
+      <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
+      <embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
+      <embed href="text/swriter/guide/indices_delete.xhp#indices_delete"/>
+      <embed href="text/swriter/guide/indices_index.xhp#indices_index"/>
+      <embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
+      <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
index 871fd84aa0..027ed5b36b 100755
--- a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_beforetable.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
index 99ae85a903..c9f9d3fd71 100755
--- a/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
index 68d82ec9c2..d2a6d8a453 100755
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_dialog.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,40 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideinsert_graphic_dialogxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Graphic From a File</title>
-<filename>/text/swriter/guide/insert_graphic_dialog.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T15:13:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideinsert_graphic_dialogxml" indexer="include"
+             status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Graphic From a File</title>
+         <filename>/text/swriter/guide/insert_graphic_dialog.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154896"><bookmark_value>pictures; inserting by dialog</bookmark_value>
-<bookmark_value>inserting; pictures, by dialog</bookmark_value>
+      <bookmark_value>inserting; pictures, by dialog</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154896" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_graphic_dialog"><link href="text/swriter/guide/insert_graphic_dialog.xhp" name="Inserting a Graphic From a File">Inserting a Graphic From a File</link>
+<paragraph xml-lang="en-US" id="hd_id3154896" role="heading" level="1" l10n="U" oldref="1"><variable id="insert_graphic_dialog"><link href="text/swriter/guide/insert_graphic_dialog.xhp" name="Inserting a Graphic From a File">Inserting a Graphic From a File</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155914" xml-lang="en-US" l10n="U" oldref="2">Click in the document where you want to insert the graphic.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155864" xml-lang="en-US" l10n="U" oldref="3">Choose <link href="text/shared/01/04140000.xhp" name="Insert - Picture - From File"><emph>Insert - Picture - From File</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156021" xml-lang="en-US" l10n="U" oldref="4">Locate the graphic file that you want to insert, and then click <emph>Open</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153396" xml-lang="en-US" l10n="U" oldref="5">By default, the inserted graphic is centered above the paragraph that you clicked in.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155914" role="listitem" l10n="U" oldref="2">Click in the document where you want to insert the graphic.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155864" role="listitem" l10n="U" oldref="3">Choose <link href="text/shared/01/04140000.xhp" name="Insert - Picture - From File"><emph>Insert - Picture - From File</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156021" role="listitem" l10n="U" oldref="4">Locate the graphic file that you want to insert, and then click <emph>Open</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153396" role="paragraph" l10n="U" oldref="5">By default, the inserted graphic is centered above the paragraph that you clicked in.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
+      <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+      <embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
+      <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
+      <embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_fromchart.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_fromchart.xhp
index 29808aca23..dc271b369e 100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_fromchart.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_fromchart.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_fromchart.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,51 +27,46 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideinsert_graphic_fromchartxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Calc Chart into a Text Document</title>
-<filename>/text/swriter/guide/insert_graphic_fromchart.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-15T14:55:23">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideinsert_graphic_fromchartxml" indexer="include"
+             status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Calc Chart into a Text Document</title>
+         <filename>/text/swriter/guide/insert_graphic_fromchart.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152999"><bookmark_value>charts;copying from Calc into Writer</bookmark_value>
-<bookmark_value>copying; charts from $[officename] Calc</bookmark_value>
-<bookmark_value>text documents;inserting Calc charts</bookmark_value>
+      <bookmark_value>copying; charts from $[officename] Calc</bookmark_value>
+      <bookmark_value>text documents;inserting Calc charts</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3152999" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_graphic_fromchart"><link href="text/swriter/guide/insert_graphic_fromchart.xhp" name="Inserting a Calc Chart into a Text Document">Inserting a Calc Chart into a Text Document</link>
+<paragraph xml-lang="en-US" id="hd_id3152999" role="heading" level="1" l10n="U" oldref="1"><variable id="insert_graphic_fromchart"><link href="text/swriter/guide/insert_graphic_fromchart.xhp" name="Inserting a Calc Chart into a Text Document">Inserting a Calc Chart into a Text Document</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155890" xml-lang="en-US" l10n="CHG" oldref="16">You can insert a copy of a chart that is not updated when you modify the chart data in the spreadsheet.</paragraph>
-<paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="2" l10n="U" oldref="2">To insert a copy of a Calc chart in a text document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149054" xml-lang="en-US" l10n="U" oldref="3">Open the text document that you want to copy the chart to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="4">Open the spreadsheet containing the chart that you want to copy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153396" xml-lang="en-US" l10n="U" oldref="5">In the spreadsheet, click the chart. Eight handles appear.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153414" xml-lang="en-US" l10n="U" oldref="7">Drag the chart from the spreadsheet to the text document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3145102" xml-lang="en-US" l10n="U" oldref="9">You can resize and move the chart in the text document as you would any object. To edit the chart data, double-click the chart.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155890" role="paragraph" l10n="CHG" oldref="16">You can insert a copy of a chart that is not updated when you modify the chart data in the spreadsheet.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149054" role="listitem" l10n="U" oldref="3">Open the text document that you want to copy the chart to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="U" oldref="4">Open the spreadsheet containing the chart that you want to copy.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="5">In the spreadsheet, click the chart. Eight handles appear.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153414" role="listitem" l10n="U" oldref="7">Drag the chart from the spreadsheet to the text document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145102" role="paragraph" l10n="U" oldref="9">You can resize and move the chart in the text document as you would any object. To edit the chart data, double-click the chart.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
+      <embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
+      <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+      <embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
+      <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
+      <embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
index 183a31fd6a..6dabe2564a 100755
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_fromdraw.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
index ab569f0678..f0e6a1a10e 100755
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_gallery.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
index b512922d37..7880116537 100755
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_graphic_scan.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,43 +29,42 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideinsert_graphic_scanxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Scanned Image</title>
-<filename>/text/swriter/guide/insert_graphic_scan.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideinsert_graphic_scanxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Scanned Image</title>
+         <filename>/text/swriter/guide/insert_graphic_scan.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156017"><bookmark_value>inserting;scanned images</bookmark_value>
-<bookmark_value>pictures; scanning</bookmark_value>
-<bookmark_value>scanning pictures</bookmark_value>
+      <bookmark_value>pictures; scanning</bookmark_value>
+      <bookmark_value>scanning pictures</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3156017" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_graphic_scan"><link href="text/swriter/guide/insert_graphic_scan.xhp" name="Inserting a Scanned Image">Inserting a Scanned Image</link>
+<paragraph xml-lang="en-US" id="hd_id3156017" role="heading" level="1" l10n="U" oldref="1"><variable id="insert_graphic_scan"><link href="text/swriter/guide/insert_graphic_scan.xhp" name="Inserting a Scanned Image">Inserting a Scanned Image</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="2">To insert a scanned image, the scanner must be connected to your system and the scanner software drivers must be installed.</paragraph>
-<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="WIN">The scanner must support the TWAIN standard. 
+      <paragraph xml-lang="en-US" id="par_id3149692" role="paragraph" l10n="U" oldref="2">To insert a scanned image, the scanner must be connected to your system and the scanner software drivers must be installed.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="WIN">The scanner must support the TWAIN standard. 
 </caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX">The scanner must support the SANE standard.
 </caseinline></switchinline></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="4">Click in the document where you want to insert the scanned image.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155864" xml-lang="en-US" l10n="U" oldref="5">Choose <link href="text/shared/01/04060000.xhp" name="Insert - Picture - Scan"><emph>Insert - Picture - Scan</emph></link>, and choose the scanning source from the submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153416" xml-lang="en-US" l10n="U" oldref="8">Follow the scanning instructions.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155915" role="listitem" l10n="U" oldref="4">Click in the document where you want to insert the scanned image.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155864" role="listitem" l10n="U" oldref="5">Choose <link href="text/shared/01/04060000.xhp" name="Insert - Picture - Scan"><emph>Insert - Picture - Scan</emph></link>, and choose the scanning source from the submenu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153416" role="listitem" l10n="U" oldref="8">Follow the scanning instructions.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
+      <embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
+      <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+      <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
+      <embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
+      <embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/insert_line.xhp b/helpcontent2/source/text/swriter/guide/insert_line.xhp
index 9f902deaf8..8b54651864 100644
--- a/helpcontent2/source/text/swriter/guide/insert_line.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_line.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_line.xhp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,70 +29,70 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideinsert_linexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting a Horizontal Line</title>
-<filename>/text/swriter/guide/insert_line.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideinsert_linexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting a Horizontal Line</title>
+         <filename>/text/swriter/guide/insert_line.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151178"><bookmark_value>horizontal lines</bookmark_value>
-<bookmark_value>lines; inserting horizontal lines</bookmark_value>
-<bookmark_value>rulers;horizontal lines</bookmark_value>
-<bookmark_value>inserting; horizontal lines</bookmark_value>
+      <bookmark_value>lines; inserting horizontal lines</bookmark_value>
+      <bookmark_value>rules</bookmark_value>
+      <bookmark_value>inserting; horizontal lines</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3151178" xml-lang="en-US" level="1" l10n="U" oldref="76"><variable id="insert_line"><link href="text/swriter/guide/insert_line.xhp" name="Inserting a Horizontal Line">Inserting a Horizontal Line</link>
+<paragraph xml-lang="en-US" id="hd_id3151178" role="heading" level="1" l10n="U"
+                 oldref="76"><variable id="insert_line"><link href="text/swriter/guide/insert_line.xhp" name="Inserting a Horizontal Line">Inserting a Horizontal Line</link>
 </variable></paragraph>
-<paragraph role="tip" id="par_id2165898" xml-lang="en-US" l10n="CHG">This guide is about inserting graphical ruler lines. You can also insert other lines, see <link href="text/shared/guide/line_intext.xhp">Drawing Lines in Text</link>.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149691" xml-lang="en-US" l10n="U" oldref="82">Click in the document where you want to insert the line.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155186" xml-lang="en-US" l10n="CHG" oldref="77">Choose <emph>Insert - Horizontal Ruler</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="3">
-<listitem>
-<paragraph role="listitem" id="par_id3155902" xml-lang="en-US" l10n="U" oldref="83">Click the line that you want to insert in the <emph>Selection </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147124" xml-lang="en-US" l10n="U" oldref="84">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id5338602" xml-lang="en-US" level="2" l10n="NEW">The "Plain" type</paragraph>
-<paragraph role="paragraph" id="par_id5342265" xml-lang="en-US" l10n="CHG">If you select the "Plain" type of ruler, an empty paragraph is inserted at the position of the cursor. This paragraph has the style "Horizontal Line", with a line as the lower border of the paragraph. You can edit that Paragraph Style to change the properties of all "Plain" rulers in your document. For example you can set the left indent to 3 inches, or you can change the line style, thickness, and color.</paragraph>
-<paragraph role="heading" id="hd_id707113" xml-lang="en-US" level="3" l10n="NEW">To edit the "Plain" ruler style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5267494" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph> to open the Styles and Formatting window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5074922" xml-lang="en-US" l10n="NEW">In the listbox at the bottom, select to display "All Styles".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8491470" xml-lang="en-US" l10n="NEW">Right-click the "Horizontal Line" paragraph style.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3253883" xml-lang="en-US" l10n="NEW">Choose Modify.</paragraph>
-<paragraph role="paragraph" id="par_id3196203" xml-lang="en-US" l10n="CHG">For example, open the Borders tab page to set the thickness and style of the lines. Open the Indents &amp; Spacing tab page to set the indents of the line.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id8385265" xml-lang="en-US" level="2" l10n="NEW">The graphical type</paragraph>
-<paragraph role="paragraph" id="par_id2582476" xml-lang="en-US" l10n="NEW">Select any ruler type below of the "Plain" ruler type. This inserts a new paragraph at the position of the cursor. A picture showing a graphical horizontal line is inserted.</paragraph>
-<paragraph role="paragraph" id="par_id3150217" xml-lang="en-US" l10n="U" oldref="78">The inserted line is anchored to the current paragraph and centered between the page margins.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2111575" xml-lang="en-US" l10n="NEW">To edit the graphical line, right-click the line and choose <emph>Picture</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id3150231" xml-lang="en-US" l10n="U" oldref="79">You can also insert one of these lines by dragging it from the<emph> Rulers</emph> folder in the <emph>Gallery</emph> into the current document.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/line_intext.xhp#line_intext"/>
-<embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/>
-<paragraph role="paragraph" id="par_id3150944" xml-lang="en-US" l10n="U" oldref="80"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></paragraph>
-</body>
+      <paragraph xml-lang="en-US" id="par_id2165898" role="tip" l10n="CHG">This guide is about inserting graphical rules. You can also insert other lines, see <link href="text/shared/guide/line_intext.xhp">Drawing Lines in Text</link>.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149691" role="listitem" l10n="U" oldref="82">Click in the document where you want to insert the line.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155186" role="listitem" l10n="CHG" oldref="77">Choose <emph>Insert - Horizontal Rule</emph>.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="3">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155902" role="listitem" l10n="U" oldref="83">Click the line that you want to insert in the <emph>Selection </emph>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147124" role="listitem" l10n="U" oldref="84">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id5338602" role="heading" level="2" l10n="NEW">The "Plain" type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5342265" role="paragraph" l10n="CHG">If you select the "Plain" type of rules, an empty paragraph is inserted at the position of the cursor. This paragraph has the style "Horizontal Line", with a line as the lower border of the paragraph. You can edit that Paragraph Style to change the properties of all "Plain" rules in your document. For example you can set the left indent to 3 inches, or you can change the line style, thickness, and color.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id707113" role="heading" level="3" l10n="NEW">To edit the "Plain" rule style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5267494" role="paragraph" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph> to open the Styles and Formatting window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5074922" role="paragraph" l10n="NEW">In the listbox at the bottom, select to display "All Styles".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id8491470" role="paragraph" l10n="NEW">Right-click the "Horizontal Line" paragraph style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3253883" role="paragraph" l10n="NEW">Choose Modify.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3196203" role="paragraph" l10n="CHG">For example, open the Borders tab page to set the thickness and style of the lines. Open the Indents &amp; Spacing tab page to set the indents of the line.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id8385265" role="heading" level="2" l10n="NEW">The graphical type</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2582476" role="paragraph" l10n="NEW">Select any rule type below of the "Plain" rule type. This inserts a new paragraph at the position of the cursor. A picture showing a graphical horizontal line is inserted.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150217" role="paragraph" l10n="U" oldref="78">The inserted line is anchored to the current paragraph and centered between the page margins.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2111575" role="paragraph" l10n="NEW">To edit the graphical line, right-click the line and choose <emph>Picture</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3150231" role="tip" l10n="U" oldref="79">You can also insert one of these lines by dragging it from the <emph>Rulers</emph> folder in the <emph>Gallery</emph> into the current document.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/line_intext.xhp#line_intext"/>
+      <embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/>
+      <paragraph xml-lang="en-US" id="par_id3150944" role="paragraph" l10n="U" oldref="80"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></paragraph>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp b/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
index ea1b58d1f2..fe8e2d8f81 100755
--- a/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insert_tab_innumbering.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp b/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
index 5f7a053500..649e2179d8 100755
--- a/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
+++ b/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: join_numbered_lists.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,56 +27,58 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidejoin_numbered_listsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Combining Numbered Lists</title>
-<filename>/text/swriter/guide/join_numbered_lists.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-23T11:41:41">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidejoin_numbered_listsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Combining Numbered Lists</title>
+         <filename>/text/swriter/guide/join_numbered_lists.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150495"><bookmark_value>numbering; combining</bookmark_value>
-<bookmark_value>merging;numbered lists</bookmark_value>
-<bookmark_value>joining;numbered lists</bookmark_value>
-<bookmark_value>lists;combining numbered lists</bookmark_value>
-<bookmark_value>paragraphs;numbering non-consecutive</bookmark_value>
+      <bookmark_value>merging;numbered lists</bookmark_value>
+      <bookmark_value>joining;numbered lists</bookmark_value>
+      <bookmark_value>lists;combining numbered lists</bookmark_value>
+      <bookmark_value>paragraphs;numbering non-consecutive</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="1" l10n="U" oldref="32"><variable id="join_numbered_lists"><link href="text/swriter/guide/join_numbered_lists.xhp" name="Combining Numbered Lists">Combining Numbered Lists</link>
+<paragraph xml-lang="en-US" id="hd_id3150495" role="heading" level="1" l10n="U"
+                 oldref="32"><variable id="join_numbered_lists"><link href="text/swriter/guide/join_numbered_lists.xhp" name="Combining Numbered Lists">Combining Numbered Lists</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="33">You can combine numbered lists into a single consecutively numbered list.</paragraph>
-<paragraph role="heading" id="hd_id3149452" xml-lang="en-US" level="2" l10n="U" oldref="34">To combine consecutive numbered lists:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="35">Select all of the paragraphs in the lists.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155911" xml-lang="en-US" l10n="CHG" oldref="36">On the <emph>Formatting</emph> Bar, click the <emph>Numbering On/Off </emph>icon twice.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3155870" xml-lang="en-US" level="2" l10n="U" oldref="37">To create a numbered list from non-consecutive paragraphs:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="38">Hold down Ctrl and drag a selection in the first numbered paragraph. You only have to select one character.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149644" xml-lang="en-US" l10n="U" oldref="39">Continue to hold down Ctrl, and drag a selection in each numbered paragraph of the lists you want to combine.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145102" xml-lang="en-US" l10n="CHG" oldref="40">On the <emph>Formatting</emph> Bar, click the <emph>Numbering On/Off </emph>icon twice.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149692" role="paragraph" l10n="U" oldref="33">You can combine numbered lists into a single consecutively numbered list.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149452" role="heading" level="2" l10n="U"
+                 oldref="34">To Combine Consecutive Numbered Lists</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154479" role="listitem" l10n="U" oldref="35">Select all of the paragraphs in the lists.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155911" role="listitem" l10n="CHG" oldref="36">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item>
+               <emph/>icon twice.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3155870" role="heading" level="2" l10n="U"
+                 oldref="37">To Create a Numbered List From Non-consecutive Paragraphs:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153417" role="listitem" l10n="U" oldref="38">Hold down Ctrl and drag a selection in the first numbered paragraph. You only have to select one character.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149644" role="listitem" l10n="U" oldref="39">Continue to hold down Ctrl, and drag a selection in each numbered paragraph of the lists you want to combine.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145102" role="listitem" l10n="CHG" oldref="40">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item>
+               <emph/>icon twice.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+      <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+      <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+      <embed href="text/swriter/guide/captions.xhp#captions"/>
+      <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp b/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
index 4f1f210ba0..ab0a5d9b77 100755
--- a/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
+++ b/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jump2statusbar.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,30 +27,26 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidejump2statusbarxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Going to Specific Bookmark</title>
-<filename>/text/swriter/guide/jump2statusbar.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T15:52:38">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidejump2statusbarxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Going to Specific Bookmark</title>
+         <filename>/text/swriter/guide/jump2statusbar.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145778"><bookmark_value>bookmarks; positioning cursor</bookmark_value>
-<bookmark_value>jumping;to bookmarks</bookmark_value>
+      <bookmark_value>jumping;to bookmarks</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145778" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="jump2statusbar"><link href="text/swriter/guide/jump2statusbar.xhp" name="Going to Specific Bookmark">Going to Specific Bookmark</link>
+<paragraph xml-lang="en-US" id="hd_id3145778" role="heading" level="1" l10n="U"
+                 oldref="30"><variable id="jump2statusbar"><link href="text/swriter/guide/jump2statusbar.xhp" name="Going to Specific Bookmark">Going to Specific Bookmark</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="31">To go to a specific bookmark in your document, <switchinline select="sys"><caseinline select="MAC">hold down Ctrl and click 
+      <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="31">To go to a specific bookmark in your document, <switchinline select="sys"><caseinline select="MAC">hold down Ctrl and click 
 </caseinline><defaultinline>right-click</defaultinline></switchinline> in the <emph>Page</emph> field on the <emph>Status Bar</emph>, and then choose the bookmark.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153396" xml-lang="en-US" l10n="U" oldref="32"><link href="text/swriter/01/04040000.xhp" name="Insert Bookmark">Insert Bookmark</link></paragraph>
-</body>
-</helpdocument>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3153396" role="paragraph" l10n="U" oldref="32"><link href="text/swriter/01/04040000.xhp" name="Insert Bookmark">Insert Bookmark</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/keyboard.xhp b/helpcontent2/source/text/swriter/guide/keyboard.xhp
index 79fa73fe6a..3f56e3ae11 100755
--- a/helpcontent2/source/text/swriter/guide/keyboard.xhp
+++ b/helpcontent2/source/text/swriter/guide/keyboard.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,68 +29,70 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidekeyboardxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Using Shortcut Keys ($[officename] Writer Accessibility)</title>
-<filename>/text/swriter/guide/keyboard.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-05T14:26:39">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidekeyboardxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using Shortcut Keys ($[officename] Writer Accessibility)</title>
+         <filename>/text/swriter/guide/keyboard.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151169"><bookmark_value>keyboard; accessibility $[officename] Writer</bookmark_value>
-<bookmark_value>accessibility; $[officename] Writer</bookmark_value>
+      <bookmark_value>accessibility; $[officename] Writer</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3151169" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="keyboard"><link href="text/swriter/guide/keyboard.xhp" name="Using Shortcut Keys ($[officename] Writer Accessibility)">Using Shortcut Keys ($[officename] Writer Accessibility)</link>
+<paragraph xml-lang="en-US" id="hd_id3151169" role="heading" level="1" l10n="U" oldref="1"><variable id="keyboard"><link href="text/swriter/guide/keyboard.xhp" name="Using Shortcut Keys ($[officename] Writer Accessibility)">Using Shortcut Keys ($[officename] Writer Accessibility)</link>
 </variable></paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="CHG" oldref="3">Press the keys <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+&lt;underlined character&gt; to open a menu. In an open menu, press the underlined character to run a command. For example, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+I to open the <emph>Insert</emph> menu, and then T to insert a table.</paragraph>
-<paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="4">To open a context menu, press Shift+F10. To close a context menu, press Escape.</paragraph>
-<paragraph role="heading" id="hd_id3155918" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Inserting Sections</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN106AA" xml-lang="en-US" l10n="NEW">Choose <emph>View - Toolbars - Insert</emph> to open the <emph>Insert</emph> toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155870" xml-lang="en-US" l10n="CHG" oldref="6">Press F6 until the focus is on the<emph> Insert</emph> toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149630" xml-lang="en-US" l10n="CHG" oldref="8">Press the right arrow key until the <emph>Section</emph> icon is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145100" xml-lang="en-US" l10n="CHG" oldref="20">Press the down arrow key, and then press the right arrow key to set the width of the section that you want to insert.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156237" xml-lang="en-US" l10n="U" oldref="11">Press Enter.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3156253" xml-lang="en-US" l10n="CHG" oldref="19">Press F6 to place the cursor inside the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153367" xml-lang="en-US" level="2" l10n="U" oldref="13">Inserting Text Tables</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="CHG" oldref="14">Press F6 until the focus is on the<emph> Standard</emph> toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154849" xml-lang="en-US" l10n="CHG" oldref="21">Press the right arrow key until the <emph>Table</emph> icon is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155872" xml-lang="en-US" l10n="U" oldref="22">Press the down arrow key, and then use the arrow keys to select the number of columns and rows to include in the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24">Press Enter.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1072C" xml-lang="en-US" l10n="NEW">Press F6 to place the cursor inside the document.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
-<embed href="text/swriter/04/01020000.xhp#text_keys"/>
-</body>
-</helpdocument>
+      <embed href="text/shared/00/00000099.xhp#keys"/>
+      <paragraph xml-lang="en-US" id="par_id3149685" role="paragraph" l10n="CHG" oldref="3">Press the keys <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+&lt;underlined character&gt; to open a menu. In an open menu, press the underlined character to run a command. For example, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+I to open the <item type="menuitem">Insert</item> menu, and then T to insert a table.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155186" role="paragraph" l10n="U" oldref="4">To open a context menu, press Shift+F10. To close a context menu, press Escape.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155918" role="heading" level="2" l10n="CHG"
+                 oldref="5">To Insert Sections</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106AA" role="listitem" l10n="NEW">Choose <emph>View - Toolbars - Insert</emph> to open the <emph>Insert</emph> toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155870" role="listitem" l10n="CHG" oldref="6">Press F6 until the focus is on the<emph/>
+               <item type="menuitem">Insert</item> toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149630" role="listitem" l10n="CHG" oldref="8">Press the right arrow key until the <emph>Section</emph> icon is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145100" role="listitem" l10n="CHG" oldref="20">Press the down arrow key, and then press the right arrow key to set the width of the section that you want to insert.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156237" role="listitem" l10n="U" oldref="11">Press Enter.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156253" role="paragraph" l10n="CHG" oldref="19">Press F6 to place the cursor inside the document.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153367" role="heading" level="2" l10n="U"
+                 oldref="13">To Insert Text Tables</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="CHG" oldref="14">Press F6 until the focus is on the<emph/>
+               <item type="menuitem">Standard</item> toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154849" role="listitem" l10n="CHG" oldref="21">Press the right arrow key until the <emph>Table</emph> icon is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155872" role="listitem" l10n="U" oldref="22">Press the down arrow key, and then use the arrow keys to select the number of columns and rows to include in the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155892" role="listitem" l10n="U" oldref="24">Press Enter.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1072C" role="paragraph" l10n="NEW">Press F6 to place the cursor inside the document.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
+      <embed href="text/swriter/04/01020000.xhp#text_keys"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/load_styles.xhp b/helpcontent2/source/text/swriter/guide/load_styles.xhp
index af923cdf79..aed007936e 100644
--- a/helpcontent2/source/text/swriter/guide/load_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/load_styles.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: load_styles.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,47 +32,42 @@
  
 	
 <meta>
-<topic id="textswriterguideload_stylesxml" indexer="include">
-<title id="tit" xml-lang="en-US">Using Styles From Another Document or Template</title>
-<filename>/text/swriter/guide/load_styles.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideload_stylesxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Using Styles From Another Document or Template</title>
+         <filename>/text/swriter/guide/load_styles.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145086"><bookmark_value>formatting styles; importing</bookmark_value>
-<bookmark_value>styles; importing from other files</bookmark_value>
-<bookmark_value>importing;styles from other files</bookmark_value>
-<bookmark_value>loading;styles from other files</bookmark_value>
+      <bookmark_value>styles; importing from other files</bookmark_value>
+      <bookmark_value>importing;styles from other files</bookmark_value>
+      <bookmark_value>loading;styles from other files</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145086" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="load_styles"><link href="text/swriter/guide/load_styles.xhp" name="Using Styles From Another Document or Template">Using Styles From Another Document or Template</link>
+<paragraph xml-lang="en-US" id="hd_id3145086" role="heading" level="1" l10n="U"
+                 oldref="10"><variable id="load_styles"><link href="text/swriter/guide/load_styles.xhp" name="Using Styles From Another Document or Template">Using Styles From Another Document or Template</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154491" xml-lang="en-US" l10n="U" oldref="11">You can import styles from another document or template into the current document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155910" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph>Format - Styles and Formatting</emph> to open the <emph>Styles and Formatting</emph> window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10703" xml-lang="en-US" l10n="NEW">Click the arrow next to the <emph>New Style from Selection</emph> icon to open the submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1070B" xml-lang="en-US" l10n="NEW">Choose <emph>Load styles</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149632" xml-lang="en-US" l10n="U" oldref="15">Use the check boxes at the bottom of the dialog to select the style types that you want to import. To replace styles in the current document that have the same name as the ones you are importing, select <emph>Overwrite</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="16">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="17">Click an entry in the <emph>Categories </emph>list, then click the template containing the styles that you want to use in the <emph>Templates </emph>list, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153377" xml-lang="en-US" l10n="CHG" oldref="13">Click <emph>From File</emph>, locate the file containing the styles that you want to use, click the name, and then click <emph>Open</emph>.</paragraph>
-</listitem>
+      <paragraph xml-lang="en-US" id="par_id3154491" role="paragraph" l10n="U" oldref="11">You can import styles from another document or template into the current document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155910" role="listitem" l10n="CHG" oldref="12">Choose <emph>Format - Styles and Formatting</emph> to open the <emph>Styles and Formatting</emph> window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10703" role="listitem" l10n="NEW">Click the arrow next to the <emph>New Style from Selection</emph> icon to open the submenu.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1070B" role="listitem" l10n="NEW">Choose <emph>Load styles</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149632" role="listitem" l10n="U" oldref="15">Use the check boxes at the bottom of the dialog to select the style types that you want to import. To replace styles in the current document that have the same name as the ones you are importing, select <emph>Overwrite</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145098" role="listitem" l10n="U" oldref="16">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
 </list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-</body>
-</helpdocument>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/main.xhp b/helpcontent2/source/text/swriter/guide/main.xhp
index 3a4bd68c4d..728c52d6b6 100755
--- a/helpcontent2/source/text/swriter/guide/main.xhp
+++ b/helpcontent2/source/text/swriter/guide/main.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.xhp,v $
- * $Revision: 1.15.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/makefile.mk b/helpcontent2/source/text/swriter/guide/makefile.mk
index 7c065b6131..d70e6b8856 100644
--- a/helpcontent2/source/text/swriter/guide/makefile.mk
+++ b/helpcontent2/source/text/swriter/guide/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.18.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -189,4 +185,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/swriter/guide/navigator.xhp b/helpcontent2/source/text/swriter/guide/navigator.xhp
index f1e8346412..ad5f1e748d 100755
--- a/helpcontent2/source/text/swriter/guide/navigator.xhp
+++ b/helpcontent2/source/text/swriter/guide/navigator.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigator.xhp,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,35 +32,35 @@
  
 	
 <meta>
-<topic id="textswriterguidenavigatorxml" indexer="include">
-<title id="tit" xml-lang="en-US">Navigator for Text Documents</title>
-<filename>/text/swriter/guide/navigator.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidenavigatorxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Navigator for Text Documents</title>
+         <filename>/text/swriter/guide/navigator.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154897"><bookmark_value>Navigator; overview in texts</bookmark_value>
-<bookmark_value>hyperlinks;jumping to</bookmark_value>
-<bookmark_value>objects;quickly moving to, within text</bookmark_value>
-<bookmark_value>frames;jumping to</bookmark_value>
-<bookmark_value>tables;jumping to</bookmark_value>
-<bookmark_value>headings;jumping to</bookmark_value>
-<bookmark_value>pages;jumping to</bookmark_value>
-<bookmark_value>jumping;to text elements</bookmark_value>
-<bookmark_value>overviews;Navigator in text documents</bookmark_value>
+      <bookmark_value>hyperlinks;jumping to</bookmark_value>
+      <bookmark_value>objects;quickly moving to, within text</bookmark_value>
+      <bookmark_value>frames;jumping to</bookmark_value>
+      <bookmark_value>tables;jumping to</bookmark_value>
+      <bookmark_value>headings;jumping to</bookmark_value>
+      <bookmark_value>pages;jumping to</bookmark_value>
+      <bookmark_value>jumping;to text elements</bookmark_value>
+      <bookmark_value>overviews;Navigator in text documents</bookmark_value>
 </bookmark><comment>MW added "pages;"</comment>
-<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="navigator"><link href="text/swriter/guide/navigator.xhp" name="Navigator for Text Documents">Navigator for Text Documents</link>
+<paragraph xml-lang="en-US" id="hd_id3154897" role="heading" level="1" l10n="U" oldref="1"><variable id="navigator"><link href="text/swriter/guide/navigator.xhp" name="Navigator for Text Documents">Navigator for Text Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153402" xml-lang="en-US" l10n="U" oldref="2">The <emph>Navigator </emph>displays the different parts of your document, such as headings, tables, frames, objects, or hyperlinks.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154247" xml-lang="en-US" l10n="U" oldref="3">To open the <emph>Navigator</emph>, press F5.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155878" xml-lang="en-US" l10n="U" oldref="5">To quickly jump to a location in your document, double-click an item listed in the <emph>Navigator</emph> window or enter the respective page number in the spin box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/navigator.xhp#navigator"/>
-<paragraph role="paragraph" id="par_id3147108" xml-lang="en-US" l10n="U" oldref="4"><link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153402" role="paragraph" l10n="U" oldref="2">The Navigator<emph/>displays the different parts of your document, such as headings, tables, frames, objects, or hyperlinks.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154247" role="listitem" l10n="U" oldref="3">To open the <emph>Navigator</emph>, press F5.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155878" role="listitem" l10n="U" oldref="5">To quickly jump to a location in your document, double-click an item listed in the <emph>Navigator</emph> window or enter the respective page number in the spin box.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/navigator.xhp#navigator"/>
+      <paragraph xml-lang="en-US" id="par_id3147108" role="paragraph" l10n="U" oldref="4"><link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
index 443248f9d2..59c666edb9 100644
--- a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,37 +32,37 @@
  
 	
 <meta>
-<topic id="textswriterguidenonprintable_textxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Creating Non-printing Text</title>
-<filename>/text/swriter/guide/nonprintable_text.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidenonprintable_textxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Creating Non-printing Text</title>
+         <filename>/text/swriter/guide/nonprintable_text.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148856"><bookmark_value>non-printing text</bookmark_value>
-<bookmark_value>text; non-printable</bookmark_value>
+      <bookmark_value>text; non-printable</bookmark_value>
 </bookmark><comment>mw copied two entries from hidden_text.xhp</comment>
-<paragraph role="heading" id="hd_id3148856" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
+<paragraph xml-lang="en-US" id="hd_id3148856" role="heading" level="1" l10n="U" oldref="1"><variable id="nonprintable_text"><link href="text/swriter/guide/nonprintable_text.xhp" name="Creating Non-printing Text">Creating Non-printing Text</link>
 </variable></paragraph><comment>MW created this guide from hidden_text.xhp</comment>
-<paragraph role="paragraph" id="par_id4685201" xml-lang="en-US" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149789" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Insert - Frame</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150242" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Format - Frame/Object</emph>, and then click the<emph> Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145227" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150320" xml-lang="en-US" l10n="U" oldref="18">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3138828" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id4685201" role="paragraph" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149789" role="listitem" l10n="U" oldref="14">Choose <item type="menuitem">Insert - Frame</item> and click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150224" role="listitem" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150242" role="listitem" l10n="U" oldref="16">Choose <item type="menuitem">Format - Frame/Object</item>, and then click the <item type="menuitem">Options</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145227" role="listitem" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150320" role="listitem" l10n="U" oldref="18">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3138828" role="paragraph" l10n="NEW"><link href="text/swriter/guide/hidden_text.xhp" name="Hiding Text">Hiding Text</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
index 7a7fa4b4e1..00ba4be36d 100755
--- a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: number_date_conv.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,39 +29,35 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textswriterguidenumber_date_convxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning Number Recognition On or Off in Tables</title>
-<filename>/text/swriter/guide/number_date_conv.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T10:06:01">UFI: see sw.features "Number regognition in tables is off"
-YJ:checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidenumber_date_convxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Turning Number Recognition On or Off in Tables</title>
+         <filename>/text/swriter/guide/number_date_conv.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156383"><bookmark_value>numbers; automatic recognition in text tables</bookmark_value>
-<bookmark_value>tables; number recognition</bookmark_value>
-<bookmark_value>dates;formatting automatically in tables</bookmark_value>
-</bookmark><comment>MW changed "number recognition..." to "number;"</comment>
-<paragraph role="heading" id="hd_id3156383" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="number_date_conv"><link href="text/swriter/guide/number_date_conv.xhp" name="Turning Number Recognition On or Off in Tables">Turning Number Recognition On or Off in Tables</link>
+      <bookmark_value>tables; number recognition</bookmark_value>
+      <bookmark_value>dates;formatting automatically in tables</bookmark_value>
+      <bookmark_value>recognition;numbers</bookmark_value>
+</bookmark><comment>MW added "recognition;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156383" role="heading" level="1" l10n="U" oldref="1"><variable id="number_date_conv"><link href="text/swriter/guide/number_date_conv.xhp" name="Turning Number Recognition On or Off in Tables">Turning Number Recognition On or Off in Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] can automatically format dates that you have entered into a table, according to the regional settings specified in your operating system.</paragraph>
-<paragraph role="paragraph" id="par_id3149966" xml-lang="en-US" l10n="U" oldref="15">Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155919" xml-lang="en-US" l10n="U" oldref="7">Right-click in a table cell and choose <emph>Number recognition</emph>. When this feature is on, a check mark is displayed in front of the <emph>Number recognition </emph>command.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155527" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph>, and select or clear the <emph>Number recognition </emph>check box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph" l10n="CHG" oldref="2">$[officename] can automatically format dates that you have entered into a table, according to the regional settings specified in your operating system.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149966" role="paragraph" l10n="U" oldref="15">Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155919" role="listitem" l10n="U" oldref="7">Right-click in a table cell and choose <item type="menuitem">Number recognition</item>. When this feature is on, a check mark is displayed in front of the <item type="menuitem">Number recognition</item> command.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155527" role="listitem" l10n="U" oldref="11">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME Writer - Table</item>, and select or clear the <item type="menuitem">Number recognition</item> check box.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/number_sequence.xhp b/helpcontent2/source/text/swriter/guide/number_sequence.xhp
index 43b4714a03..308e9e6cbb 100644
--- a/helpcontent2/source/text/swriter/guide/number_sequence.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_sequence.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: number_sequence.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,62 +29,55 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidenumber_sequencexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Defining Number Ranges</title>
-<filename>/text/swriter/guide/number_sequence.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T10:21:13">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidenumber_sequencexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Defining Number Ranges</title>
+         <filename>/text/swriter/guide/number_sequence.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>numbering;quotations/similar items</bookmark_value>
 </bookmark><comment>MW deleted "number ranges;" and changed "numbering;"</comment>
-<paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="36"><variable id="number_sequence"><link href="text/swriter/guide/number_sequence.xhp" name="Defining Number Ranges">Defining Number Ranges</link>
+<paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U"
+                 oldref="36"><variable id="number_sequence"><link href="text/swriter/guide/number_sequence.xhp" name="Defining Number Ranges">Defining Number Ranges</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="37">You can automatically number similar items, such as quotations, in your document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="38">Type the text that you want to assign numbering to, for example, "Quotation Number ".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155048" xml-lang="en-US" l10n="U" oldref="39">Choose <emph>Insert - Fields - Other</emph>, and then click the <emph>Variables </emph>tab.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="3">
-<listitem>
-<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="40">Click "Number range" in the <emph>Type </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="61">Type "Quotation" in the <emph>Name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="62">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154250" xml-lang="en-US" l10n="U" oldref="42">Type a number in the <emph>Value </emph>box, or leave the box empty to use automatic numbering.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154851" xml-lang="en-US" l10n="U" oldref="58">Select the outline level where you want the numbering to restart in the <emph>Level </emph>box.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="6">
-<listitem>
-<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="U" oldref="41">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155918" role="paragraph" l10n="U" oldref="37">You can automatically number similar items, such as quotations, in your document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149829" role="listitem" l10n="U" oldref="38">Type the text that you want to assign numbering to, for example, "Quotation Number ".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155048" role="listitem" l10n="U" oldref="39">Choose <item type="menuitem">Insert - Fields - Other</item>, and then click the <item type="menuitem">Variables</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="3">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156240" role="listitem" l10n="U" oldref="40">Click "Number range" in the <item type="menuitem">Type</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153363" role="listitem" l10n="U" oldref="61">Type "Quotation" in the <item type="menuitem">Name</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153387" role="listitem" l10n="U" oldref="62">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="ordered" startwith="6">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="U" oldref="41">Click <emph>Insert</emph>, and then click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+      <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+      <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+      <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+      <embed href="text/swriter/guide/captions.xhp#captions"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/numbering_lines.xhp b/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
index 873f3733bf..a69dbd6c24 100644
--- a/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
+++ b/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numbering_lines.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,103 +29,113 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidenumbering_linesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Adding Line Numbers</title>
-<filename>/text/swriter/guide/numbering_lines.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidenumbering_linesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Line Numbers</title>
+         <filename>/text/swriter/guide/numbering_lines.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150101"><bookmark_value>line numbers</bookmark_value>
-<bookmark_value>text; line numbers</bookmark_value>
-<bookmark_value>lines of text; numbering</bookmark_value>
-<bookmark_value>numbering; lines</bookmark_value>
-<bookmark_value>numbers; line numbering</bookmark_value>
-<bookmark_value>marginal numbers on text pages</bookmark_value>
-</bookmark><comment>mw deleted "adding;"</comment><paragraph role="heading" id="hd_id3150101" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="numbering_lines"><link href="text/swriter/guide/numbering_lines.xhp" name="Adding Line Numbers">Adding Line Numbers</link>
+      <bookmark_value>text; line numbers</bookmark_value>
+      <bookmark_value>paragraphs;line numbers</bookmark_value>
+      <bookmark_value>lines of text; numbering</bookmark_value>
+      <bookmark_value>numbering; lines</bookmark_value>
+      <bookmark_value>numbers; line numbering</bookmark_value>
+      <bookmark_value>marginal numbers on text pages</bookmark_value>
+</bookmark><comment>MW added "paragraphs;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150101" role="heading" level="1" l10n="U" oldref="3"><variable id="numbering_lines"><link href="text/swriter/guide/numbering_lines.xhp" name="Adding Line Numbers">Adding Line Numbers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149842" xml-lang="en-US" l10n="CHG" oldref="1">$[officename] can insert line numbers in an entire document or to selected paragraphs in your document. Line numbers are included when you print your document. You can specify the line numbering interval, the starting line number, and whether to count blank lines or lines in frames. You can also add a separator between line numbers.</paragraph>
-<paragraph role="note" id="par_id7184972" xml-lang="en-US" l10n="NEW">Line numbers are not available in HTML format.</paragraph>
-<paragraph role="heading" id="hd_id3153410" xml-lang="en-US" level="2" l10n="U" oldref="6">To add line numbers to an entire document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Tools - Line Numbering</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149612" xml-lang="en-US" l10n="U" oldref="8">Select <emph>Show numbering</emph>, and then select the options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145101" xml-lang="en-US" l10n="U" oldref="20">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3156241" xml-lang="en-US" level="2" l10n="U" oldref="10">To add line numbers to specific paragraphs:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156264" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Tools - Line Numbering</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153385" xml-lang="en-US" l10n="U" oldref="11">Select <emph>Show numbering</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="U" oldref="12">Press F11 to open the <emph>Styles and Formatting</emph> window, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154853" xml-lang="en-US" l10n="U" oldref="13">Right-click the "Default" paragraph style and choose <emph>Modify</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3150222" xml-lang="en-US" l10n="U" oldref="17">All paragraph styles are based on the "Default" style.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="5">
-<listitem>
-<paragraph role="listitem" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="15">Click the <emph>Numbering</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150956" xml-lang="en-US" l10n="U" oldref="16">In the <emph>Line Numbering </emph>area, clear the <emph>Include this paragraph in line numbering </emph>check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150520" xml-lang="en-US" l10n="U" oldref="22">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151077" xml-lang="en-US" l10n="U" oldref="18">Select the paragraph(s) where you want to add the line numbers.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151096" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Paragraph</emph>, and then click the <emph>Numbering </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153733" xml-lang="en-US" l10n="U" oldref="23">Select <emph>Include this paragraph in line numbering</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153758" xml-lang="en-US" l10n="U" oldref="24">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146864" xml-lang="en-US" l10n="U" oldref="2">You can also create a paragraph style that includes line numbering, and apply it to the paragraphs that you want to add line numbers to.</paragraph>
-<paragraph role="heading" id="hd_id3146880" xml-lang="en-US" level="2" l10n="U" oldref="25">To specify the starting line number:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150703" xml-lang="en-US" l10n="U" oldref="26">Click in a paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150721" xml-lang="en-US" l10n="U" oldref="27">Choose <emph>Format - Paragraph</emph>, and then click the <emph>Numbering </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148389" xml-lang="en-US" l10n="U" oldref="28">Select the <emph>Include this paragraph in line numbering </emph>check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148414" xml-lang="en-US" l10n="U" oldref="29">Select <emph>Restart at the paragraph </emph>check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153779" xml-lang="en-US" l10n="U" oldref="30">Enter a line number in the <emph>Start with </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153804" xml-lang="en-US" l10n="U" oldref="31">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153934" xml-lang="en-US" l10n="U" oldref="5"><link href="text/swriter/01/06180000.xhp" name="Tools - Line Numbering">Tools - Line Numbering</link></paragraph>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="32"><link href="text/swriter/01/05030800.xhp" name="Format - Paragraph - Numbering">Format - Paragraph - Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id2212591" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149842" role="paragraph" l10n="CHG" oldref="1">$[officename] can insert line numbers in an entire document or to selected paragraphs in your document. Line numbers are included when you print your document. You can specify the line numbering interval, the starting line number, and whether to count blank lines or lines in frames. You can also add a separator between line numbers.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7184972" role="note" l10n="NEW">Line numbers are not available in HTML format.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153410" role="heading" level="2" l10n="U" oldref="6">To Add Line Numbers to an Entire Document</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149640" role="listitem" l10n="U" oldref="7">Choose <emph>Tools - Line Numbering</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="8">Select <emph>Show numbering</emph>, and then select the options that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145101" role="listitem" l10n="U" oldref="20">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3156241" role="heading" level="2" l10n="U"
+                 oldref="10">To Add Line Numbers to Specific Paragraphs</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156264" role="listitem" l10n="U" oldref="21">Choose <emph>Tools - Line Numbering</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153385" role="listitem" l10n="U" oldref="11">Select <emph>Show numbering</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="12">Press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles and Formatting</emph> window, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154853" role="listitem" l10n="U" oldref="13">Right-click the "Default" paragraph style and choose <emph>Modify</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150222" role="listitem" l10n="U" oldref="17">All paragraph styles are based on the "Default" style.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="5">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150931" role="listitem" l10n="U" oldref="15">Click the <emph>Numbering</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150956" role="listitem" l10n="U" oldref="16">In the <item type="menuitem">Line Numbering</item>
+               <emph/>area, clear the <item type="menuitem">Include this paragraph in line numbering</item>
+               <emph/>check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150520" role="listitem" l10n="U" oldref="22">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151077" role="listitem" l10n="U" oldref="18">Select the paragraph(s) where you want to add the line numbers.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151096" role="listitem" l10n="U" oldref="19">Choose <item type="menuitem">Format - Paragraph</item>, and then click the <item type="menuitem">Numbering</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153733" role="listitem" l10n="U" oldref="23">Select <emph>Include this paragraph in line numbering</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153758" role="listitem" l10n="U" oldref="24">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3146864" role="paragraph" l10n="U" oldref="2">You can also create a paragraph style that includes line numbering, and apply it to the paragraphs that you want to add line numbers to.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3146880" role="heading" level="2" l10n="U"
+                 oldref="25">To Specify the Starting Line Number</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150703" role="listitem" l10n="U" oldref="26">Click in a paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150721" role="listitem" l10n="U" oldref="27">Choose <item type="menuitem">Format - Paragraph</item>, and then click the <item type="menuitem">Numbering</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148389" role="listitem" l10n="U" oldref="28">Select the <item type="menuitem">Include this paragraph in line numbering</item>
+               <emph/>check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148414" role="listitem" l10n="U" oldref="29">Select <item type="menuitem">Restart at the paragraph</item>
+               <emph/>check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153779" role="listitem" l10n="U" oldref="30">Enter a line number in the <item type="menuitem">Start with</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153804" role="listitem" l10n="U" oldref="31">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3153934" role="paragraph" l10n="U" oldref="5"><link href="text/swriter/01/06180000.xhp" name="Tools - Line Numbering">Tools - Line Numbering</link></paragraph>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="32"><link href="text/swriter/01/05030800.xhp" name="Format - Paragraph - Numbering">Format - Paragraph - Numbering</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2212591" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
index 96070b1a74..a240828075 100755
--- a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
+++ b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numbering_paras.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,65 +29,60 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidenumbering_parasxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Modifying Numbering in a Numbered List</title>
-<filename>/text/swriter/guide/numbering_paras.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidenumbering_parasxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Modifying Numbering in a Numbered List</title>
+         <filename>/text/swriter/guide/numbering_paras.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149637"><bookmark_value>numbering; removing/interrupting</bookmark_value>
-<bookmark_value>bullet lists; interrupting</bookmark_value>
-<bookmark_value>lists;removing/interrupting numbering</bookmark_value>
-<bookmark_value>deleting;numbers in lists</bookmark_value>
-<bookmark_value>interrupting numbered lists</bookmark_value>
-<bookmark_value>changing;starting numbers in lists</bookmark_value>
-</bookmark><comment>MW changed "removing;..." to "deleting;...", and deleted "modifying;..."</comment><paragraph role="heading" id="hd_id3149637" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="numbering_paras"><link href="text/swriter/guide/numbering_paras.xhp" name="Modifying Numbering in a Numbered List">Modifying Numbering in a Numbered List</link>
+      <bookmark_value>bullet lists; interrupting</bookmark_value>
+      <bookmark_value>lists;removing/interrupting numbering</bookmark_value>
+      <bookmark_value>deleting;numbers in lists</bookmark_value>
+      <bookmark_value>interrupting numbered lists</bookmark_value>
+      <bookmark_value>changing;starting numbers in lists</bookmark_value>
+</bookmark><comment>MW changed "removing;..." to "deleting;...", and deleted "modifying;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3149637" role="heading" level="1" l10n="U" oldref="1"><variable id="numbering_paras"><link href="text/swriter/guide/numbering_paras.xhp" name="Modifying Numbering in a Numbered List">Modifying Numbering in a Numbered List</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145092" xml-lang="en-US" l10n="U" oldref="2">You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with.</paragraph>
-<paragraph role="tip" id="par_id2172612" xml-lang="en-US" l10n="NEW">If you want numbered headings, use the <emph>Tools - Outline Numbering</emph> menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar.</paragraph>
-<paragraph role="heading" id="hd_id3145107" xml-lang="en-US" level="2" l10n="U" oldref="8">To remove the number from a paragraph in a numbered list:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156248" xml-lang="en-US" l10n="U" oldref="10">Click in front of the first character of the paragraph that you want to remove the numbering from.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153366" xml-lang="en-US" l10n="U" oldref="23">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153390" xml-lang="en-US" l10n="U" oldref="11">To remove the number while preserving the indent of the paragraph, press the Backspace key.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="CHG" oldref="16">To remove the number and the indent of the paragraph, click the <emph>Numbering on/off</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154856" xml-lang="en-US" level="2" l10n="U" oldref="18">To change the number that a numbered list starts with:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155877" xml-lang="en-US" l10n="U" oldref="24">Click anywhere in the numbered list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155895" xml-lang="en-US" l10n="CHG" oldref="21">Choose <emph>Format - Bullets and Numbering</emph>, and then click the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148691" xml-lang="en-US" l10n="U" oldref="22">Enter the number you want the list to start with in the <emph>Start at</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147116" xml-lang="en-US" l10n="U" oldref="25">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-<paragraph role="paragraph" id="par_id6943571" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145092" role="paragraph" l10n="U" oldref="2">You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2172612" role="tip" l10n="NEW">If you want numbered headings, use the <emph>Tools - Outline Numbering</emph> menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3145107" role="heading" level="2" l10n="U" oldref="8">To Remove the Number From a Paragraph in a Numbered List</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156248" role="listitem" l10n="U" oldref="10">Click in front of the first character of the paragraph that you want to remove the numbering from.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153366" role="listitem" l10n="U" oldref="23">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <paragraph xml-lang="en-US" id="hd_id3154856" role="heading" level="2" l10n="U"
+                 oldref="18">To Change the Number That a Numbered List Starts With</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155877" role="listitem" l10n="U" oldref="24">Click anywhere in the numbered list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155895" role="listitem" l10n="CHG" oldref="21">Choose <emph>Format - Bullets and Numbering</emph>, and then click the <emph>Options</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148691" role="listitem" l10n="U" oldref="22">Enter the number you want the list to start with in the <item type="menuitem">Start </item>
+               <item type="menuitem">at</item> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147116" role="listitem" l10n="U" oldref="25">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+      <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+      <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+      <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+      <embed href="text/swriter/guide/captions.xhp#captions"/>
+      <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+      <paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/page_break.xhp b/helpcontent2/source/text/swriter/guide/page_break.xhp
index 0bbf114ca7..c39ea004a5 100755
--- a/helpcontent2/source/text/swriter/guide/page_break.xhp
+++ b/helpcontent2/source/text/swriter/guide/page_break.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: page_break.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,59 +29,57 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidepage_breakxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting and Deleting Page Breaks</title>
-<filename>/text/swriter/guide/page_break.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-17T16:37:02">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidepage_breakxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting and Deleting Page Breaks</title>
+         <filename>/text/swriter/guide/page_break.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155183"><bookmark_value>page breaks; inserting and deleting</bookmark_value>
-<bookmark_value>inserting; page breaks</bookmark_value>
-<bookmark_value>deleting;page breaks</bookmark_value>
-<bookmark_value>pages; inserting/deleting page breaks</bookmark_value>
-<bookmark_value>manual page breaks</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3155183" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="page_break"><link href="text/swriter/guide/page_break.xhp" name="Inserting and Deleting Page Breaks">Inserting and Deleting Page Breaks</link>
+      <bookmark_value>inserting; page breaks</bookmark_value>
+      <bookmark_value>deleting;page breaks</bookmark_value>
+      <bookmark_value>pages; inserting/deleting page breaks</bookmark_value>
+      <bookmark_value>manual page breaks</bookmark_value>
+      <bookmark_value>tables;deleting page breaks before</bookmark_value>
+</bookmark><comment>MW added "tables;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155183" role="heading" level="1" l10n="U" oldref="1"><variable id="page_break"><link href="text/swriter/guide/page_break.xhp" name="Inserting and Deleting Page Breaks">Inserting and Deleting Page Breaks</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3149833" xml-lang="en-US" level="2" l10n="U" oldref="2">To insert a manual page break:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153402" xml-lang="en-US" l10n="U" oldref="3">Click in your document where you want the new page to begin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153119" xml-lang="en-US" l10n="U" oldref="4">Press Ctrl+Enter.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153135" xml-lang="en-US" level="2" l10n="U" oldref="6">To delete a manual page break:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149641" xml-lang="en-US" l10n="U" oldref="7">Click in front of the first character on the page that follows the manual page break.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149608" xml-lang="en-US" l10n="U" oldref="8">Press Backspace.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149624" xml-lang="en-US" level="2" l10n="U" oldref="10">To delete a manual page break that occurs before a table:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145111" xml-lang="en-US" l10n="U" oldref="11">Right-click in the table, and choose <emph>Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156254" xml-lang="en-US" l10n="U" oldref="13">Click the <link href="text/swriter/01/05090300.xhp" name="Text Flow"><emph>Text Flow</emph></link> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153380" xml-lang="en-US" l10n="U" oldref="14">Clear the <emph>Break</emph> check box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
-<paragraph role="paragraph" id="par_id3154249" xml-lang="en-US" l10n="U" oldref="15"><link href="text/swriter/01/04010000.xhp" name="Insert Break dialog">Insert Break dialog</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3149833" role="heading" level="2" l10n="U" oldref="2">To Insert a Manual Page Break</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153402" role="listitem" l10n="U" oldref="3">Click in your document where you want the new page to begin.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153119" role="listitem" l10n="U" oldref="4">Press Ctrl+Enter.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153135" role="heading" level="2" l10n="U" oldref="6">To Delete a Manual Page Break</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" l10n="U" oldref="7">Click in front of the first character on the page that follows the manual page break.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149608" role="listitem" l10n="U" oldref="8">Press Backspace.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149624" role="heading" level="2" l10n="U"
+                 oldref="10">To Delete a Manual Page Break That Occurs Before a Table</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145111" role="listitem" l10n="U" oldref="11">Right-click in the table, and choose <emph>Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156254" role="listitem" l10n="U" oldref="13">Click the <link href="text/swriter/01/05090300.xhp" name="Text Flow"><emph>Text Flow</emph></link> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153380" role="listitem" l10n="U" oldref="14">Clear the <emph>Break</emph> check box.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
+      <paragraph xml-lang="en-US" id="par_id3154249" role="paragraph" l10n="U" oldref="15"><link href="text/swriter/01/04010000.xhp" name="Insert Break dialog">Insert Break dialog</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/pagebackground.xhp b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
index 15959f83c5..a04316fbe8 100755
--- a/helpcontent2/source/text/swriter/guide/pagebackground.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagebackground.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,113 +29,96 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidepagebackgroundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing Page Backgrounds</title>
-<filename>/text/swriter/guide/pagebackground.xhp</filename>
-</topic>
-<history>
-<created date="2004-06-29T13:55:14">UFI: part of a series of files to fix #i29922#</created>
-<lastedited date="2007-01-09T11:26:36">dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidepagebackgroundxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing Page Backgrounds</title>
+         <filename>/text/swriter/guide/pagebackground.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id8431653"><bookmark_value>page styles;backgrounds</bookmark_value>
-<bookmark_value>backgrounds; different pages</bookmark_value>
-<bookmark_value>changing;page backgrounds</bookmark_value>
-<bookmark_value>pages;backgrounds</bookmark_value>
+      <bookmark_value>backgrounds; different pages</bookmark_value>
+      <bookmark_value>changing;page backgrounds</bookmark_value>
+      <bookmark_value>pages;backgrounds</bookmark_value>
 </bookmark><comment>MW deleted "page backgrounds"</comment>
-<paragraph role="heading" id="par_idN107F4" xml-lang="en-US" level="1" l10n="NEW"><variable id="pagebackground"><link href="text/swriter/guide/pagebackground.xhp">Changing Page Background</link>
+<paragraph xml-lang="en-US" id="par_idN107F4" role="heading" level="1" l10n="NEW"><variable id="pagebackground"><link href="text/swriter/guide/pagebackground.xhp">Changing Page Background</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10812" xml-lang="en-US" l10n="NEW">$[officename] uses page styles to specify the background of the pages in a document. For example, to change the page background of one or more pages in a document to a watermark, you need to create a page style that uses the watermark background, and then apply the page style to the pages.</paragraph>
-<section id="define">
-<paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="2" l10n="NEW">To Change the Page Background</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10827" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1082F" xml-lang="en-US" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10837" xml-lang="en-US" l10n="NEW">In the list of page styles, right-click an item, and then choose <emph>New</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1083F" xml-lang="en-US" l10n="NEW">On the <emph>Organizer</emph> tab page, type a name for the page style in the <emph>Name</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1084B" xml-lang="en-US" l10n="NEW">In the <emph>Next Style</emph> box, select the page style that you want to apply to the next page.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10855" xml-lang="en-US" l10n="NEW">To only apply the new page style to a single page, select "Default".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10859" xml-lang="en-US" l10n="NEW">To apply the new page style to all subsequent pages, select the name of the new page style.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="6">
-<listitem>
-<paragraph role="listitem" id="par_idN1085F" xml-lang="en-US" l10n="NEW">Click the <emph>Background</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10867" xml-lang="en-US" l10n="NEW">In the list box at the top, select whether you want a solid color or a graphic. Then select your options from the tab page. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1086B" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-</section>
-<paragraph role="heading" id="par_idN1087A" xml-lang="en-US" level="2" l10n="NEW">To Change the Page Background of All Pages in a Document</paragraph>
-<paragraph role="paragraph" id="par_idN1087E" xml-lang="en-US" l10n="NEW">Before you begin, ensure that you have created a page style that uses a page background. See <link href="text/swriter/guide/pagebackground.xhp#define">To Change the Page Background</link> for details.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10892" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1089A" xml-lang="en-US" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108A2" xml-lang="en-US" l10n="NEW">Double-click the page style that uses the page background that you want to apply.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN108A5" xml-lang="en-US" level="2" l10n="NEW">To Use Different Page Backgrounds in the Same Document</paragraph>
-<paragraph role="paragraph" id="par_idN108A9" xml-lang="en-US" l10n="NEW">Before you begin, ensure that you have created a page style that uses a page background. See <link href="text/swriter/guide/pagebackground.xhp#define">To Change the Page Background</link> for details.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN108BD" xml-lang="en-US" l10n="NEW">Click in front of the first character of the paragraph where you want to change the page background.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108C1" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Manual Break</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108C9" xml-lang="en-US" l10n="NEW">Select <emph>Page break</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108D1" xml-lang="en-US" l10n="NEW">In the <emph>Style </emph>box, select a page style that uses the page background.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN108DB" xml-lang="en-US" l10n="NEW">To change the background of the current page only, select a page style where the Next Style option is set to "Default".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108DF" xml-lang="en-US" l10n="NEW">To change the background of the current and subsequent pages, select a page style where the Next Style option is set to the name of the page style.</paragraph>
-<paragraph role="paragraph" id="par_idN108E2" xml-lang="en-US" l10n="NEW">If you want to change the page background later on in the document, repeat steps 1 to 3.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="5">
-<listitem>
-<paragraph role="listitem" id="par_idN108E8" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10812" role="paragraph" l10n="NEW">$[officename] uses page styles to specify the background of the pages in a document. For example, to change the page background of one or more pages in a document to a watermark, you need to create a page style that uses the watermark background, and then apply the page style to the pages.</paragraph>
+      <section id="define">
+         <paragraph xml-lang="en-US" id="par_idN10820" role="heading" level="2" l10n="NEW">To Change the Page Background</paragraph>
+         <list type="ordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN10827" role="listitem" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">In the list of page styles, right-click an item, and then choose <emph>New</emph>.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN1083F" role="listitem" l10n="NEW">On the <emph>Organizer</emph> tab page, type a name for the page style in the <emph>Name</emph> box.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN1084B" role="listitem" l10n="NEW">In the <emph>Next Style</emph> box, select the page style that you want to apply to the next page.</paragraph>
+            </listitem>
+         </list>
+         <list type="unordered"/>
+         <list type="ordered" startwith="6">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN1085F" role="listitem" l10n="NEW">Click the <emph>Background</emph> tab.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN10867" role="listitem" l10n="NEW">In the list box at the top, select whether you want a solid color or a graphic. Then select your options from the tab page. </paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_idN1086B" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN1087A" role="heading" level="2" l10n="NEW">To Change the Page Background of All Pages in a Document</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1087E" role="paragraph" l10n="NEW">Before you begin, ensure that you have created a page style that uses a page background. See <link href="text/swriter/guide/pagebackground.xhp#define">To Change the Page Background</link> for details.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10892" role="listitem" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1089A" role="listitem" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108A2" role="listitem" l10n="NEW">Double-click the page style that uses the page background that you want to apply.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN108A5" role="heading" level="2" l10n="NEW">To Use Different Page Backgrounds in the Same Document</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108A9" role="paragraph" l10n="NEW">Before you begin, ensure that you have created a page style that uses a page background. See <link href="text/swriter/guide/pagebackground.xhp#define">To Change the Page Background</link> for details.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108BD" role="listitem" l10n="NEW">Click in front of the first character of the paragraph where you want to change the page background.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108C1" role="listitem" l10n="NEW">Choose <emph>Insert - Manual Break</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108C9" role="listitem" l10n="NEW">Select <emph>Page break</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108D1" role="listitem" l10n="NEW">In the <item type="menuitem">Style</item>
+               <emph/>box, select a page style that uses the page background.</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="ordered" startwith="5">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108E8" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN108E2" role="listitem" l10n="NEW">If you want to change the page background later on in the document, repeat steps 1 to 3.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
index 2e6fdf5ecd..22cf939232 100755
--- a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pagenumbers.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,112 +31,105 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidepagenumbersxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Page Numbers </title>
-<filename>/text/swriter/guide/pagenumbers.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidepagenumbersxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Page Numbers </title>
+         <filename>/text/swriter/guide/pagenumbers.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id5918759"><bookmark_value>page numbers;inserting/defining/formatting</bookmark_value>
-<bookmark_value>page styles;page numbering</bookmark_value>
-<bookmark_value>starting page numbers</bookmark_value>
-<bookmark_value>formatting;page numbers</bookmark_value>
-<bookmark_value>defining;starting page numbers</bookmark_value>
-<bookmark_value>inserting;page numbers</bookmark_value>
-</bookmark><comment>mw inserted six index entries</comment><paragraph role="heading" id="hd_id413830" xml-lang="en-US" level="1" l10n="NEW"><variable id="pagenumbers"><link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers">Page Numbers</link>
+      <bookmark_value>page styles;page numbering</bookmark_value>
+      <bookmark_value>starting page numbers</bookmark_value>
+      <bookmark_value>formatting;page numbers</bookmark_value>
+      <bookmark_value>defining;starting page numbers</bookmark_value>
+      <bookmark_value>inserting;page numbers</bookmark_value>
+      <bookmark_value>styles;page numbers</bookmark_value>
+</bookmark><comment>mw inserted six index entries</comment><comment>mw added "styles;"</comment>
+<paragraph xml-lang="en-US" id="hd_id413830" role="heading" level="1" l10n="NEW"><variable id="pagenumbers"><link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers">Page Numbers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1617175" xml-lang="en-US" l10n="NEW">In Writer, a page number is a field that you can insert into your text.</paragraph>
-<paragraph role="heading" id="hd_id6091494" xml-lang="en-US" level="2" l10n="NEW">Inserting page numbers</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8611102" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Fields - Page Number</emph> to insert a page number at the current cursor position.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id6604510" xml-lang="en-US" l10n="NEW">If you see the text "Page number" instead of the number, choose <emph>View - Field names</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id2678914" xml-lang="en-US" l10n="NEW">However, these fields will change position when you add or remove text. So it is best to insert the page number field into a header or footer that has the same position and that is repeated on every page.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id614642" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Header - (name of page style)</emph> or <emph>Insert - Footer - (name of page style)</emph> to add a header or footer to all pages with the current Page Style.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id2551652" xml-lang="en-US" level="2" l10n="NEW">Starting with a defined page number</paragraph>
-<paragraph role="paragraph" id="par_id6111941" xml-lang="en-US" l10n="NEW">Now you want some more control on page numbers. You are writing a text document that should start with page number 12.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5757621" xml-lang="en-US" l10n="NEW">Click into the first paragraph of your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2632831" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Paragraph - Text flow</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4395275" xml-lang="en-US" l10n="NEW">In the Breaks area, enable <emph>Insert</emph>. Enable <emph>With Page Style</emph> just to be able to set the new <emph>Page number</emph>. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id1654408" xml-lang="en-US" l10n="NEW">The new page number is an attribute of the first paragraph of the page.</paragraph>
-<paragraph role="heading" id="hd_id7519150" xml-lang="en-US" level="2" l10n="NEW">Formatting the page number style</paragraph>
-<paragraph role="paragraph" id="par_id9029206" xml-lang="en-US" l10n="NEW">You want roman page numbers running i, ii, iii, iv, and so on.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3032319" xml-lang="en-US" l10n="NEW">Double-click directly before the page number field. You see the <emph>Edit Fields</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9139378" xml-lang="en-US" l10n="NEW">Select a number format and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id5051728" xml-lang="en-US" level="2" l10n="NEW">Using different page number styles</paragraph>
-<paragraph role="paragraph" id="par_id1558885" xml-lang="en-US" l10n="NEW">You need some pages with the roman numbering style, followed by the remaining pages in another style.</paragraph>
-<paragraph role="paragraph" id="par_id1541184" xml-lang="en-US" l10n="NEW">In Writer, you will need different Page Styles. The first Page Style has a footer with a page number field formatted for roman numbers. The following Page Style has a footer with a page number field formatted in another look.</paragraph>
-<paragraph role="paragraph" id="par_id18616" xml-lang="en-US" l10n="NEW">Both Page Styles must be separated by a page break. In Writer, you can have automatic page breaks and manually inserted page breaks.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6138492" xml-lang="en-US" l10n="NEW">An <emph>automatic page break</emph> appears at the end of a page when the Page Style has a different "next style".</paragraph>
-<paragraph role="paragraph" id="par_id4569231" xml-lang="en-US" l10n="NEW">For example, the "First Page" Page Style has "Default" as the next style. To see this, you may press F11 to open the <emph>Styles and Formatting</emph> window, click the <emph>Page Styles</emph> icon, right-click the First Page entry. Choose <emph>Modify</emph> from the context menu. On the Organizer tab, you can see the "next style".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id291451" xml-lang="en-US" l10n="NEW">A <emph>manually inserted page break</emph> can be applied without or with a change of page styles.</paragraph>
-<paragraph role="paragraph" id="par_id3341776" xml-lang="en-US" l10n="NEW">If you just press <item type="keycode">Ctrl+Enter</item>, you apply a page break without a change of styles.</paragraph>
-<paragraph role="paragraph" id="par_id5947141" xml-lang="en-US" l10n="NEW">If you choose <emph>Insert - Manual break</emph>, you can insert a page break without or with a change of style or with a change of page number.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id1911679" xml-lang="en-US" l10n="NEW">It depends on your document what is best: to use a manually inserted page break between Page Styles, or to use an automatic change. If you just need one title page with a different style than the other pages, you can use the automatic method:</paragraph>
-<paragraph role="heading" id="hd_id9364909" xml-lang="en-US" level="3" l10n="NEW">To apply a different page style to the first page</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4473403" xml-lang="en-US" l10n="NEW">Click into the first page of your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4313791" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="NEW">In the <emph>Styles and Formatting</emph> window, click the <emph>Page Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4191717" xml-lang="en-US" l10n="NEW">Double-click the "First Page" style.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id2318796" xml-lang="en-US" l10n="NEW">Now your title page has the style "First Page", and the next pages automatically have the "Default" style.</paragraph>
-<paragraph role="paragraph" id="par_id399182" xml-lang="en-US" l10n="NEW">You can now for example insert a footer for the "Default" Page Style only, or insert footers in both Page Styles, but with differently formatted page number fields.</paragraph>
-<paragraph role="heading" id="hd_id5298318" xml-lang="en-US" level="3" l10n="NEW">To apply a manually inserted Page Style change</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7588732" xml-lang="en-US" l10n="NEW">Click at the start of the first paragraph on the page where a different Page Style will be applied.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Manual Break</emph>. You see the <emph>Insert Break</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3496200" xml-lang="en-US" l10n="NEW">In the Style list box, select a Page Style. You may set a new page number, too. Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="NEW">The selected page style will be used from the current paragraph to the next page break with style. You may need to create the new Page Style first.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/footer_pagenumber.xhp#footer_pagenumber"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/even_odd_sdw.xhp#even_odd_sdw"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id1617175" role="paragraph" l10n="NEW">In Writer, a page number is a field that you can insert into your text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6091494" role="heading" level="2" l10n="NEW">To Insert Page Numbers</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8611102" role="paragraph" l10n="NEW">Choose <emph>Insert - Fields - Page Number</emph> to insert a page number at the current cursor position.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6604510" role="tip" l10n="NEW">If you see the text "Page number" instead of the number, choose <emph>View - Field names</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2678914" role="paragraph" l10n="NEW">However, these fields will change position when you add or remove text. So it is best to insert the page number field into a header or footer that has the same position and that is repeated on every page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id614642" role="paragraph" l10n="NEW">Choose <item type="menuitem">Insert - Header - (name of page style)</item> or <item type="menuitem">Insert - Footer - (name of page style)</item> to add a header or footer to all pages with the current page style.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2551652" role="heading" level="2" l10n="NEW">To Start With a Defined Page Number</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6111941" role="paragraph" l10n="NEW">Now you want some more control on page numbers. You are writing a text document that should start with page number 12.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5757621" role="listitem" l10n="NEW">Click into the first paragraph of your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2632831" role="listitem" l10n="NEW">Choose <emph>Format - Paragraph - Text flow</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4395275" role="listitem" l10n="NEW">In the Breaks area, enable <emph>Insert</emph>. Enable <emph>With Page Style</emph> just to be able to set the new <emph>Page number</emph>. Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id1654408" role="note" l10n="NEW">The new page number is an attribute of the first paragraph of the page.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id7519150" role="heading" level="2" l10n="NEW">To Format the Page Number Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id9029206" role="paragraph" l10n="NEW">You want roman page numbers running i, ii, iii, iv, and so on.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3032319" role="listitem" l10n="NEW">Double-click directly before the page number field. You see the <emph>Edit Fields</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9139378" role="listitem" l10n="NEW">Select a number format and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id5051728" role="heading" level="2" l10n="NEW">Using Different Page Number Styles</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1558885" role="paragraph" l10n="NEW">You need some pages with the roman numbering style, followed by the remaining pages in another style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1541184" role="paragraph" l10n="NEW">In Writer, you will need different page styles. The first page style has a footer with a page number field formatted for roman numbers. The following page style has a footer with a page number field formatted in another look.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id18616" role="paragraph" l10n="NEW">Both page styles must be separated by a page break. In Writer, you can have automatic page breaks and manually inserted page breaks.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6138492" role="paragraph" l10n="NEW">An <emph>automatic page break</emph> appears at the end of a page when the page style has a different "next style".</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4569231" role="paragraph" l10n="NEW">For example, the "First Page" page style has "Default" as the next style. To see this, you may press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <item type="menuitem">Styles and Formatting</item> window, click the <item type="menuitem">Page Styles</item> icon, right-click the First Page entry. Choose <item type="menuitem">Modify</item> from the context menu. On the <item type="menuitem">Organizer</item> tab, you can see the "next style".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id291451" role="paragraph" l10n="NEW">A <emph>manually inserted page break</emph> can be applied without or with a change of page styles.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3341776" role="paragraph" l10n="NEW">If you just press <item type="keycode">Ctrl+Enter</item>, you apply a page break without a change of styles.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id5947141" role="paragraph" l10n="NEW">If you choose <emph>Insert - Manual break</emph>, you can insert a page break without or with a change of style or with a change of page number.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id1911679" role="paragraph" l10n="NEW">It depends on your document what is best: to use a manually inserted page break between page styles, or to use an automatic change. If you just need one title page with a different style than the other pages, you can use the automatic method:</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="3" l10n="NEW">To Apply a Different Page Style to the First Page</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4473403" role="listitem" l10n="NEW">Click into the first page of your document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4313791" role="listitem" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4331797" role="listitem" l10n="NEW">In the <emph>Styles and Formatting</emph> window, click the <emph>Page Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4191717" role="listitem" l10n="NEW">Double-click the "First Page" style.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id2318796" role="paragraph" l10n="NEW">Now your title page has the style "First Page", and the next pages automatically have the "Default" style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">You can now for example insert a footer for the "Default" page atyle only, or insert footers in both page styles, but with differently formatted page number fields.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5298318" role="heading" level="3" l10n="NEW">To Apply a Manually Inserted Page Style Change</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7588732" role="listitem" l10n="NEW">Click at the start of the first paragraph on the page where a different page style will be applied.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id95828" role="listitem" l10n="NEW">Choose <emph>Insert - Manual Break</emph>. You see the <emph>Insert Break</emph> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3496200" role="listitem" l10n="NEW">In the <item type="menuitem">Style</item> list box, select a page style. You may set a new page number, too. Click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW">The selected page style will be used from the current paragraph to the next page break with style. You may need to create the new page style first.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/footer_pagenumber.xhp#footer_pagenumber"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/even_odd_sdw.xhp#even_odd_sdw"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/pageorientation.xhp b/helpcontent2/source/text/swriter/guide/pageorientation.xhp
index f378059805..1459a29d02 100755
--- a/helpcontent2/source/text/swriter/guide/pageorientation.xhp
+++ b/helpcontent2/source/text/swriter/guide/pageorientation.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageorientation.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,113 +29,109 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidepageorientationxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing Page Orientation (Landscape or Portrait)</title>
-<filename>/text/swriter/guide/pageorientation.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidepageorientationxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing Page Orientation (Landscape or Portrait)</title>
+         <filename>/text/swriter/guide/pageorientation.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id9683828"><bookmark_value>page styles;orientation/scope</bookmark_value>
-<bookmark_value>page formats; changing individual pages</bookmark_value>
-<bookmark_value>formatting; changing individual pages</bookmark_value>
-<bookmark_value>portrait and landscape</bookmark_value>
-<bookmark_value>landscape and portrait</bookmark_value>
-<bookmark_value>printing;portrait/landscape format</bookmark_value>
-<bookmark_value>orientation of pages</bookmark_value>
-<bookmark_value>paper orientation</bookmark_value>
-<bookmark_value>pages;orientation</bookmark_value>
-<bookmark_value>sideways orientation of pages</bookmark_value>
-<bookmark_value>scope of page styles</bookmark_value>
-</bookmark><comment>MW changed "page styles;..." and added one entry</comment><paragraph role="heading" id="par_idN106FF" xml-lang="en-US" level="1" l10n="NEW"><variable id="pageorientation"><link href="text/swriter/guide/pageorientation.xhp">Changing Page Orientation</link>
+      <bookmark_value>page formats; changing individual pages</bookmark_value>
+      <bookmark_value>formatting; changing individual pages</bookmark_value>
+      <bookmark_value>portrait and landscape</bookmark_value>
+      <bookmark_value>landscape and portrait</bookmark_value>
+      <bookmark_value>printing;portrait/landscape format</bookmark_value>
+      <bookmark_value>orientation of pages</bookmark_value>
+      <bookmark_value>paper orientation</bookmark_value>
+      <bookmark_value>pages;orientation</bookmark_value>
+      <bookmark_value>sideways orientation of pages</bookmark_value>
+      <bookmark_value>scope of page styles</bookmark_value>
+</bookmark><comment>MW changed "page styles;..." and added one entry</comment>
+<paragraph xml-lang="en-US" id="par_idN106FF" role="heading" level="1" l10n="NEW"><variable id="pageorientation"><link href="text/swriter/guide/pageorientation.xhp">Changing Page Orientation</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id6418042" xml-lang="en-US" l10n="NEW">All page properties for Writer text documents, like for example the page orientation, are defined by page styles. By default, a new text document uses the <emph>Default</emph> page style for all pages. If you open an existing text document, different page styles may have been applied to the different pages. </paragraph>
-<paragraph role="paragraph" id="par_id8324533" xml-lang="en-US" l10n="NEW">It is important to know that changes that you apply to a page property will only affect the pages that use the current page style. The current page style is listed in the Status Bar at the lower window border.</paragraph>
-<paragraph role="heading" id="par_id7524033" xml-lang="en-US" level="2" l10n="CHG">To change the page orientation for all pages</paragraph>
-<paragraph role="paragraph" id="par_id6307260" xml-lang="en-US" l10n="NEW">If your text document consists only of pages with the same page style, you can change the page properties directly:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id5256508" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Page</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id9681997" xml-lang="en-US" l10n="NEW">Click the <emph>Page</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7994323" xml-lang="en-US" l10n="NEW">Under <emph>Paper format</emph>, select <emph>Portrait</emph> or <emph>Landscape</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7069002" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id4202398" xml-lang="en-US" level="2" l10n="NEW">To change the page orientation only for some pages</paragraph>
-<paragraph role="paragraph" id="par_idN1071D" xml-lang="en-US" l10n="NEW">$[officename] uses page styles to specify the orientation of the pages in a document. Page styles define more page properties, as for example header and footer or page margins. You can either change the <emph>Default</emph> page style for the current document, or you can define own page styles and apply those page styles to any parts of your text. </paragraph>
-<paragraph role="paragraph" id="par_id1449324" xml-lang="en-US" l10n="NEW">At the end of this help page, we'll discuss the scope of page styles in detail. If you are unsure about the page style concept, please read the section at the end of this page.</paragraph>
-<paragraph role="note" id="par_id1480758" xml-lang="en-US" l10n="NEW">Unlike character styles or paragraph styles, the page styles don't know a hierarchy. You can create a new page style based on the properties of an existing page style, but when you later change the source style, the new page style does not automatically inherit the changes.</paragraph>
-<paragraph role="paragraph" id="par_id2962126" xml-lang="en-US" l10n="CHG">To change the page orientation for all pages that share the same page style, you first need a page style, then apply that style:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10727" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10741" xml-lang="en-US" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10749" xml-lang="en-US" l10n="CHG">Right-click a page style and choose <emph>New</emph>. The new page style initially gets all properties of the selected page style.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10751" xml-lang="en-US" l10n="CHG">On the <emph>Organizer</emph> tab page, type a name for the page style in the <emph>Name</emph> box, for example "My Landscape".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1075D" xml-lang="en-US" l10n="CHG">In the <emph>Next Style</emph> box, select the page style that you want to apply to the next page that follows a page with the new style. See the section about the scope of page styles at the end of this help page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10775" xml-lang="en-US" l10n="NEW">Click the <emph>Page</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN1077D" xml-lang="en-US" l10n="NEW">Under <emph>Paper format</emph>, select <emph>Portrait</emph> or <emph>Landscape</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN108AE" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="listitem" id="par_id1658375" xml-lang="en-US" l10n="NEW">Now you have defined a proper page style with the name "My Landscape". To apply the new style, double-click the "My Landscape" page style in the <emph>Styles and Formatting</emph> window. All pages in the current scope of page styles will be changed. If you defined the "next style" to be a different style, only the first page of the current scope of page styles will be changed.</paragraph>
-<section id="scope">
-<paragraph role="heading" id="hd_id6082949" xml-lang="en-US" level="2" l10n="NEW">The scope of page styles</paragraph>
-<paragraph role="paragraph" id="par_id2858668" xml-lang="en-US" l10n="NEW">You should be aware of the scope of page styles in %PRODUCTNAME. Which pages of your text document get affected by editing a page style?</paragraph>
-<paragraph role="heading" id="hd_id3278603" xml-lang="en-US" level="3" l10n="NEW">One page long styles</paragraph>
-<paragraph role="paragraph" id="par_id5169225" xml-lang="en-US" l10n="NEW">A page style can be defined to span one page only. The <emph>First Page</emph> style is an example. You set this property by defining another page style to be the "next style", on the <item type="menuitem">Format - Page - Organizer</item> tab page.</paragraph>
-<paragraph role="paragraph" id="par_id6670125" xml-lang="en-US" l10n="NEW">A one page long style starts from the lower border of the current page style range up to the next page break. The next page break appears automatically when the text flows to the next page, which is sometimes called a "soft page break". Alternatively, you can insert a manual page break.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2118594" xml-lang="en-US" l10n="NEW">To insert a manual page break at the cursor position, press <item type="keycode">Ctrl+Enter</item> or choose <item type="menuitem">Insert - Manual Break</item> and just click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id166020" xml-lang="en-US" level="3" l10n="NEW">Manually defined range of a page style</paragraph>
-<paragraph role="paragraph" id="par_id6386913" xml-lang="en-US" l10n="NEW">The <emph>Default</emph> page style does not set a different "next style" on the <item type="menuitem">Format - Page - Organizer</item> tab page. Instead, the "next style" is set also to be <emph>Default</emph>. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by "page breaks with style". All the pages between any two "page breaks with style" use the same page style.</paragraph>
-<paragraph role="paragraph" id="par_id6062196" xml-lang="en-US" l10n="NEW">You can insert a "page break with style" directly at the cursor position. Alternatively, you can apply the "page break with style" property to a paragraph or to a paragraph style.</paragraph>
-<paragraph role="paragraph" id="par_id6054261" xml-lang="en-US" l10n="NEW">Perform any one of the following commands:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1811578" xml-lang="en-US" l10n="NEW">To insert a "page break with style" at the cursor position, choose <item type="menuitem">Insert - Manual Break</item>, select a <emph>Style</emph> name from the listbox, and click OK.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9935911" xml-lang="en-US" l10n="NEW">To apply the "page break with style" property to the current paragraph, choose <item type="menuitem">Format - Paragraph - Text Flow</item>. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4753868" xml-lang="en-US" l10n="NEW">To apply the "page break with style" property to the current paragraph style, right-click the current paragraph. Choose <item type="menuitem">Edit Paragraph Style</item> from the context menu. Click the <emph>Text Flow</emph> tab. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4744407" xml-lang="en-US" l10n="NEW">To apply the "page break with style" property to an arbitrary paragraph style, choose <item type="menuitem">Format - Styles and Formatting</item>. Click the <emph>Paragraph Styles</emph> icon. Right-click the name of the paragraph style you want to modify and choose <emph>Modify</emph>. Click the <emph>Text Flow</emph> tab. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
-</listitem>
-</list>
-</section>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-<embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id6418042" role="paragraph" l10n="NEW">All page properties for Writer text documents, like for example the page orientation, are defined by page styles. By default, a new text document uses the “Default” page style for all pages. If you open an existing text document, different page styles may have been applied to the different pages. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id8324533" role="paragraph" l10n="NEW">It is important to know that changes that you apply to a page property will only affect the pages that use the current page style. The current page style is listed in the Status Bar at the lower window border.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7524033" role="heading" level="2" l10n="CHG">To Change the Page Orientation for All Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_id6307260" role="paragraph" l10n="NEW">If your text document consists only of pages with the same page style, you can change the page properties directly:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5256508" role="listitem" l10n="NEW">Choose <emph>Format - Page</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9681997" role="listitem" l10n="NEW">Click the <emph>Page</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7994323" role="listitem" l10n="NEW">Under <item type="menuitem">Paper format</item>, select “Portrait” or “Landscape”.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7069002" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id4202398" role="heading" level="2" l10n="NEW">To Change the Page Orientation Only for Some Pages</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">$[officename] uses page styles to specify the orientation of the pages in a document. Page styles define more page properties, as for example header and footer or page margins. You can either change the “Default” page style for the current document, or you can define own page styles and apply those page styles to any parts of your text. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id1449324" role="paragraph" l10n="NEW">At the end of this help page, we'll discuss the scope of page styles in detail. If you are unsure about the page style concept, please read the section at the end of this page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1480758" role="note" l10n="NEW">Unlike character styles or paragraph styles, the page styles don't know a hierarchy. You can create a new page style based on the properties of an existing page style, but when you later change the source style, the new page style does not automatically inherit the changes.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2962126" role="paragraph" l10n="CHG">To change the page orientation for all pages that share the same page style, you first need a page style, then apply that style:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10727" role="listitem" l10n="NEW">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10741" role="listitem" l10n="NEW">Click the <emph>Page Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10749" role="listitem" l10n="CHG">Right-click a page style and choose <emph>New</emph>. The new page style initially gets all properties of the selected page style.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10751" role="listitem" l10n="CHG">On the <emph>Organizer</emph> tab page, type a name for the page style in the <emph>Name</emph> box, for example "My Landscape".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1075D" role="listitem" l10n="CHG">In the <emph>Next Style</emph> box, select the page style that you want to apply to the next page that follows a page with the new style. See the section about the scope of page styles at the end of this help page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10775" role="listitem" l10n="NEW">Click the <emph>Page</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1077D" role="listitem" l10n="NEW">Under <item type="menuitem">Paper format</item>, select “Portrait” or “Landscape”.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN108AE" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id1658375" role="listitem" l10n="NEW">Now you have defined a proper page style with the name "My Landscape". To apply the new style, double-click the "My Landscape" page style in the <emph>Styles and Formatting</emph> window. All pages in the current scope of page styles will be changed. If you defined the "next style" to be a different style, only the first page of the current scope of page styles will be changed.</paragraph>
+      <section id="scope">
+         <paragraph xml-lang="en-US" id="hd_id6082949" role="heading" level="2" l10n="NEW">The Scope of Page Styles</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2858668" role="paragraph" l10n="NEW">You should be aware of the scope of page styles in %PRODUCTNAME. Which pages of your text document get affected by editing a page style?</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3278603" role="heading" level="3" l10n="NEW">One Page Long Styles</paragraph>
+         <paragraph xml-lang="en-US" id="par_id5169225" role="paragraph" l10n="NEW">A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the "next style", on the <item type="menuitem">Format - Page - Organizer</item> tab page.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6670125" role="paragraph" l10n="NEW">A one page long style starts from the lower border of the current page style range up to the next page break. The next page break appears automatically when the text flows to the next page, which is sometimes called a "soft page break". Alternatively, you can insert a manual page break.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2118594" role="paragraph" l10n="NEW">To insert a manual page break at the cursor position, press <item type="keycode">Ctrl+Enter</item> or choose <item type="menuitem">Insert - Manual Break</item> and just click OK.</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id166020" role="heading" level="3" l10n="NEW">Manually Defined Range of a Page style</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6386913" role="paragraph" l10n="NEW">The “Default” page style does not set a different "next style" on the <item type="menuitem">Format - Page - Organizer</item> tab page. Instead, the "next style" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by "page breaks with style". All the pages between any two "page breaks with style" use the same page style.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6062196" role="paragraph" l10n="NEW">You can insert a "page break with style" directly at the cursor position. Alternatively, you can apply the "page break with style" property to a paragraph or to a paragraph style.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id6054261" role="paragraph" l10n="NEW">Perform any one of the following commands:</paragraph>
+         <list type="unordered">
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id1811578" role="listitem" l10n="NEW">To insert a "page break with style" at the cursor position, choose <item type="menuitem">Insert - Manual Break</item>, select a <emph>Style</emph> name from the listbox, and click OK.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id9935911" role="listitem" l10n="NEW">To apply the "page break with style" property to the current paragraph, choose <item type="menuitem">Format - Paragraph - Text Flow</item>. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id4753868" role="listitem" l10n="NEW">To apply the "page break with style" property to the current paragraph style, right-click the current paragraph. Choose <item type="menuitem">Edit Paragraph Style</item> from the context menu. Click the <emph>Text Flow</emph> tab. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
+            </listitem>
+            <listitem>
+               <paragraph xml-lang="en-US" id="par_id4744407" role="listitem" l10n="NEW">To apply the "page break with style" property to an arbitrary paragraph style, choose <item type="menuitem">Format - Styles and Formatting</item>. Click the <emph>Paragraph Styles</emph> icon. Right-click the name of the paragraph style you want to modify and choose <emph>Modify</emph>. Click the <emph>Text Flow</emph> tab. In the Breaks area, activate <emph>Enable</emph> and <emph>With Page Style</emph>. Select a page style name from the listbox.</paragraph>
+            </listitem>
+         </list>
+      </section>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/pagestyles.xhp b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
index 2f9f2e05e5..4c42411263 100755
--- a/helpcontent2/source/text/swriter/guide/pagestyles.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagestyles.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,96 +29,95 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidepagestylesxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Creating and Applying Page Styles</title>
-<filename>/text/swriter/guide/pagestyles.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidepagestylesxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating and Applying Page Styles</title>
+         <filename>/text/swriter/guide/pagestyles.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id7071138"><bookmark_value>page styles;creating and applying</bookmark_value>
-<bookmark_value>defining;page styles</bookmark_value>
-<bookmark_value>styles;for pages</bookmark_value>
-</bookmark>
-  <comment>MW deleted "applying;" and added "styles;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155182" role="heading" level="1" l10n="U" oldref="1"><variable id="pagestyles"><link href="text/swriter/guide/pagestyles.xhp" name="Creating and Applying Page Styles">Creating and Applying Page Styles</link> 
+      <bookmark_value>defining;page styles</bookmark_value>
+      <bookmark_value>styles;for pages</bookmark_value>
+</bookmark><comment>MW deleted "applying;" and added "styles;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155182" role="heading" level="1" l10n="U" oldref="1"><variable id="pagestyles"><link href="text/swriter/guide/pagestyles.xhp" name="Creating and Applying Page Styles">Creating and Applying Page Styles</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149846" role="paragraph" l10n="U" oldref="10">$[officename] uses page styles to specify the layout of a page, including the page orientation, background, margins, headers, footers, and text columns. To change the layout of an individual page in a document, you must create and apply a custom page style to the page.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN1071A" role="paragraph" l10n="NEW"> <embedvar href="text/swriter/guide/pageorientation.xhp#pageorientation"/> </paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10722" role="paragraph" l10n="NEW"> <embedvar href="text/swriter/guide/pagebackground.xhp#pagebackground"/> </paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3156109" role="heading" level="2" l10n="U" oldref="11">To define a new page style:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153411" role="listitem" l10n="CHG" oldref="3">Choose <emph>Format - Styles and Formatting.</emph> </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153133" role="listitem" l10n="CHG" oldref="12">Click the <emph>Page Styles</emph> icon.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" l10n="CHG" oldref="13">In the list of page styles, right-click an item, and then choose <emph>New</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149614" role="listitem" l10n="U" oldref="14">On the <emph>Organizer</emph> tab, type a name in the <emph>Name</emph> box.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145110" role="listitem" l10n="U" oldref="15">Do one of the following:</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3156252" role="listitem" l10n="U" oldref="16">To apply the custom page style to a single page, select the default page style that is used in your document in the <emph>Next Style</emph> box.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153376" role="listitem" l10n="U" oldref="17">To apply the custom page style to more than one page, select its name in the <emph>Next Style</emph> box. To stop using the style, insert a manual page break and assign it a different page style.</paragraph>
-   </listitem>
-  </list>
-  <list type="ordered" startwith="6">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154252" role="listitem" l10n="U" oldref="20">Use the tabs in the dialog to set the layout options for the page style, and then click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3154851" role="heading" level="2" l10n="U" oldref="21">To apply a page style:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154873" role="listitem" l10n="U" oldref="22">Click in the page that you want to apply the page style to.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph>, and then click the<emph> Page Style</emph> icon.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="24">Double-click a name in the list.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="hd_id3148701" role="heading" level="2" l10n="U" oldref="18">To apply a page style to a new page:</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147122" role="listitem" l10n="U" oldref="4">Click in the document where you want a new page to start.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150210" role="listitem" l10n="U" oldref="5">Choose <emph>Insert - Manual Break</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150235" role="listitem" l10n="U" oldref="6">Select <emph>Page break</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150939" role="listitem" l10n="U" oldref="19">In the <emph>Style </emph>box, select the page style that you want to apply to the page that follows the manual break.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3150965" role="listitem" l10n="U" oldref="25">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
-  <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
-  <embed href="text/swriter/guide/change_header.xhp#change_header"/>
-  <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
-  <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
-  <embed href="text/swriter/guide/template_default.xhp#template_default"/>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149846" role="paragraph" l10n="U" oldref="10">$[officename] uses page styles to specify the layout of a page, including the page orientation, background, margins, headers, footers, and text columns. To change the layout of an individual page in a document, you must create and apply a custom page style to the page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1071A" role="paragraph" l10n="NEW">
+         <embedvar href="text/swriter/guide/pageorientation.xhp#pageorientation"/>
+      </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10722" role="paragraph" l10n="NEW">
+         <embedvar href="text/swriter/guide/pagebackground.xhp#pagebackground"/>
+      </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156109" role="heading" level="2" l10n="U"
+                 oldref="11">To Define a New Page Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153411" role="listitem" l10n="CHG" oldref="3">Choose <item type="menuitem">Format - Styles and Formatting</item>
+               <emph>.</emph>
+            </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153133" role="listitem" l10n="CHG" oldref="12">Click the <emph>Page Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" l10n="CHG" oldref="13">In the list of page styles, right-click an item, and then choose <emph>New</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149614" role="listitem" l10n="U" oldref="14">On the <emph>Organizer</emph> tab, type a name in the <emph>Name</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145110" role="listitem" l10n="U" oldref="15">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="ordered" startwith="6">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154252" role="listitem" l10n="U" oldref="20">Use the tabs in the dialog to set the layout options for the page style, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154851" role="heading" level="2" l10n="U"
+                 oldref="21">To Apply a Page Style</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154873" role="listitem" l10n="U" oldref="22">Click in the page that you want to apply the page style to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="CHG" oldref="23">Choose <item type="menuitem">Format - Styles and Formatting</item>, and then click the<emph/>
+               <item type="menuitem">Page Style</item> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="24">Double-click a name in the list.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3148701" role="heading" level="2" l10n="U"
+                 oldref="18">To Apply a Page Style to a New Page</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147122" role="listitem" l10n="U" oldref="4">Click in the document where you want a new page to start.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150210" role="listitem" l10n="U" oldref="5">Choose <emph>Insert - Manual Break</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150235" role="listitem" l10n="U" oldref="6">Select <emph>Page break</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150939" role="listitem" l10n="U" oldref="19">In the <item type="menuitem">Style</item>
+               <emph/>box, select the page style that you want to apply to the page that follows the manual break.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150965" role="listitem" l10n="U" oldref="25">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/>
+      <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/>
+      <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/>
+      <embed href="text/swriter/guide/template_default.xhp#template_default"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/print_brochure.xhp b/helpcontent2/source/text/swriter/guide/print_brochure.xhp
index b62c42d70b..b0f01dc8fd 100644
--- a/helpcontent2/source/text/swriter/guide/print_brochure.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_brochure.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_brochure.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,57 +29,53 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideprint_brochurexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing a Brochure</title>
-<filename>/text/swriter/guide/print_brochure.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-23T11:12:41">UFI: Guide printing brochures</created>
-<lastedited date="2006-11-03T13:20:10">DEDR: reviewed</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideprint_brochurexhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing a Brochure</title>
+         <filename>/text/swriter/guide/print_brochure.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id6743064"><bookmark_value>printing; individual brochures</bookmark_value>
-<bookmark_value>booklet printing</bookmark_value>
-<bookmark_value>brochures; printing individual</bookmark_value>
+      <bookmark_value>booklet printing</bookmark_value>
+      <bookmark_value>brochures; printing individual</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="par_idN105F6" xml-lang="en-US" level="1" l10n="NEW"><variable id="print_brochure"><link href="text/swriter/guide/print_brochure.xhp">Printing a Brochure</link>
+<paragraph xml-lang="en-US" id="par_idN105F6" role="heading" level="1" l10n="NEW"><variable id="print_brochure"><link href="text/swriter/guide/print_brochure.xhp">Printing a Brochure</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="NEW">You can print a Writer document as a brochure or a booklet. That is, Writer prints two pages on each side of the paper, so that when you fold the paper, you can read the document as a book.</paragraph>
-<paragraph role="paragraph" id="par_idN106DE" xml-lang="en-US" l10n="NEW">When you create a document that you want to print as a brochure, use portrait orientation for the pages. Writer applies the brochure layout when you print the document.</paragraph>
-<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">To Print a Brochure</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW">Choose <emph>File - Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106B6" xml-lang="en-US" l10n="NEW">In the <emph>Print</emph> dialog, click <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1070E" xml-lang="en-US" l10n="NEW">In the properties dialog for your printer, set the paper orientation to landscape.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id8947416" xml-lang="en-US" l10n="NEW">If your printer prints duplex, and because brochures always print in landscape mode, you should use the "duplex - short edge" setting in your printer setup dialog.</paragraph>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="paragraph" id="par_idN10628" xml-lang="en-US" l10n="NEW">Return to <emph>Print</emph> dialog, and click <emph>Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US" l10n="NEW">In the <emph>Pages</emph> area of the <emph>Printer Options</emph> dialog, select <emph>Brochure</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10740" xml-lang="en-US" l10n="NEW">For a printer that automatically prints on both sides of a page, specify to print right pages and left pages.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="7">
-<listitem>
-<paragraph role="paragraph" id="par_idN10630" xml-lang="en-US" l10n="NEW">In the <emph>Print</emph> dialog, click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/optionen/01040400.xhp#brochure"/>
-<paragraph role="note" id="par_idN106EA" xml-lang="en-US" l10n="NEW">If %PRODUCTNAME prints the pages in the wrong order, open the <emph>Printer Options</emph> dialog, select <emph>Reversed</emph>, and then print the document again.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN10614" role="paragraph" l10n="NEW">You can print a Writer document as a brochure or a booklet. That is, Writer prints two pages on each side of the paper, so that when you fold the paper, you can read the document as a book.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN106DE" role="paragraph" l10n="NEW">When you create a document that you want to print as a brochure, use portrait orientation for the pages. Writer applies the brochure layout when you print the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1061A" role="paragraph" l10n="NEW">To Print a Brochure</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10621" role="listitem" l10n="NEW">Choose <emph>File - Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106B6" role="listitem" l10n="NEW">In the <emph>Print</emph> dialog, click <emph>Properties</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1070E" role="listitem" l10n="NEW">In the properties dialog for your printer, set the paper orientation to landscape.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id8947416" role="tip" l10n="NEW">If your printer prints duplex, and because brochures always print in landscape mode, you should use the "duplex - short edge" setting in your printer setup dialog.</paragraph>
+      <list type="ordered" startwith="4">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10628" role="listitem" l10n="NEW">Return to <emph>Print</emph> dialog, and click the <emph>Page Layout</emph> tab page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1062C" role="listitem" l10n="NEW">Select <emph>Brochure</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10740" role="listitem" l10n="NEW">For a printer that automatically prints on both sides of a page, specify to include "All pages".</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="7">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10630" role="listitem" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/optionen/01040400.xhp#brochure"/>
+      <paragraph xml-lang="en-US" id="par_idN106EA" role="note" l10n="NEW">If %PRODUCTNAME prints the pages in the wrong order, open the <emph>Options</emph> tab page, select <emph>Print in reverse page order</emph>, and then print the document again.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/print_preview.xhp b/helpcontent2/source/text/swriter/guide/print_preview.xhp
index c679bcbeca..ae73b93392 100644
--- a/helpcontent2/source/text/swriter/guide/print_preview.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_preview.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_preview.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,38 +29,38 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideprint_previewxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Previewing a Page Before Printing</title>
-<filename>/text/swriter/guide/print_preview.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideprint_previewxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Previewing a Page Before Printing</title>
+         <filename>/text/swriter/guide/print_preview.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155179"><bookmark_value>printing; previews</bookmark_value>
-<bookmark_value>previews; print layouts</bookmark_value>
-<bookmark_value>print layout checks</bookmark_value>
-<bookmark_value>book view</bookmark_value>
-<bookmark_value>pages;previews</bookmark_value>
-</bookmark><comment>MW changed "page views" to "pages;previews"</comment><paragraph role="heading" id="hd_id3155179" xml-lang="en-US" level="1" l10n="U" oldref="9"><variable id="print_preview"><link href="text/swriter/guide/print_preview.xhp" name="Previewing a Page Before Printing">Previewing a Page Before Printing</link>
+      <bookmark_value>previews; print layouts</bookmark_value>
+      <bookmark_value>print layout checks</bookmark_value>
+      <bookmark_value>book view</bookmark_value>
+      <bookmark_value>pages;previews</bookmark_value>
+</bookmark><comment>MW changed "page views" to "pages;previews"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155179" role="heading" level="1" l10n="U" oldref="9"><variable id="print_preview"><link href="text/swriter/guide/print_preview.xhp" name="Previewing a Page Before Printing">Previewing a Page Before Printing</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149847" xml-lang="en-US" l10n="U" oldref="34">Choose <emph>File</emph> - <emph>Page Preview</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155055" xml-lang="en-US" l10n="U" oldref="35">Use the zoom icons on the <emph>Page Preview</emph> bar to reduce or enlarge the view of the page.</paragraph>
-<paragraph role="tip" id="par_idN1067F" xml-lang="en-US" l10n="NEW">To print your document scaled down, print the zoomed preview. Click <emph>Print options page view</emph> icon to set the print options.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145093" xml-lang="en-US" l10n="U" oldref="36">Use the arrow keys or the arrow icons on the <emph>Page Preview</emph> bar to scroll through the document.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/print_small.xhp#print_small"/>
-<paragraph role="paragraph" id="par_id3154265" xml-lang="en-US" l10n="U" oldref="37"><link href="text/swriter/01/01120000.xhp" name="File - Page Preview">File - Page Preview</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149847" role="listitem" l10n="U" oldref="34">Choose <emph>File</emph> - <emph>Page Preview</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155055" role="listitem" l10n="U" oldref="35">Use the zoom icons on the <emph>Page Preview</emph> bar to reduce or enlarge the view of the page.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1067F" role="tip" l10n="NEW">To print your document scaled down, set the print options on the <emph>Page Layout</emph> tab page of the <item type="menuitem">File - Print</item> dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145093" role="listitem" l10n="U" oldref="36">Use the arrow keys or the arrow icons on the <emph>Page Preview</emph> bar to scroll through the document.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/print_small.xhp#print_small"/>
+         <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph" l10n="U" oldref="37"><link href="text/swriter/01/01120000.xhp" name="File - Page Preview">File - Page Preview</link>.</paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/print_small.xhp b/helpcontent2/source/text/swriter/guide/print_small.xhp
index ca743315dd..5cbeb92acc 100644
--- a/helpcontent2/source/text/swriter/guide/print_small.xhp
+++ b/helpcontent2/source/text/swriter/guide/print_small.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: print_small.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,61 +29,49 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideprint_smallxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Printing Multiple Pages on One Sheet</title>
-<filename>/text/swriter/guide/print_small.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideprint_smallxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing Multiple Pages on One Sheet</title>
+         <filename>/text/swriter/guide/print_small.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149694"><bookmark_value>multi-page view of documents</bookmark_value>
-<bookmark_value>pages;printing multiple on one sheet</bookmark_value>
-<bookmark_value>overviews;printing multi-page view</bookmark_value>
-<bookmark_value>printing;multiple pages per sheet</bookmark_value>
-<bookmark_value>reduced printing of multiple pages</bookmark_value>
-</bookmark>
-  <comment> MW changed "overviews;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3149694" role="heading" level="1" l10n="U" oldref="17"><variable id="print_small"><link href="text/swriter/guide/print_small.xhp" name="Printing Multiple Pages on One Sheet">Printing Multiple Pages on One Sheet</link> 
+      <bookmark_value>pages;printing multiple on one sheet</bookmark_value>
+      <bookmark_value>overviews;printing multi-page view</bookmark_value>
+      <bookmark_value>printing;multiple pages per sheet</bookmark_value>
+      <bookmark_value>reduced printing of multiple pages</bookmark_value>
+</bookmark><comment> MW changed "overviews;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149694" role="heading" level="1" l10n="U"
+                 oldref="17"><variable id="print_small"><link href="text/swriter/guide/print_small.xhp" name="Printing Multiple Pages on One Sheet">Printing Multiple Pages on One Sheet</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149829" role="paragraph" l10n="U" oldref="16">In Page Preview mode, you have the option to print multiple pages on one sheet.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3156098" role="listitem" l10n="U" oldref="19">Choose <emph>File - Page Preview</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155055" role="listitem" l10n="U" oldref="31">Do one of the following:</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149603" role="listitem" l10n="U" oldref="20">To print two pages side by side on the same sheet, click the <emph>Page Preview: Two Pages</emph> icon 
-<image id="img_id3153128" src="res/commandimagelist/sc_showtwopages.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153128">Icon</alt>
-	</image> on the <emph>Page Preview</emph> bar.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="U" oldref="22">To print multiple pages on the same sheet, click the <emph>Print options page view</emph> icon 
-<image id="img_id3155903" src="res/commandimagelist/sc_printersetup.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3155903">Icon</alt>
-	</image> on the <emph>Page Preview</emph> bar and set the options that you want.</paragraph>
-   </listitem>
-  </list>
-  <list type="ordered" startwith="3">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154841" role="listitem" l10n="U" oldref="21">Click the <emph>Print page view</emph> icon 
-<image id="img_id3156248" src="res/commandimagelist/sc_printpagepreview.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3156248">Icon</alt>
-	</image>.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
-   <paragraph xml-lang="en-US" id="par_id3150004" role="paragraph" l10n="U" oldref="23"><link href="text/swriter/main0210.xhp" name="File - Page Preview">File - Page Preview</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149829" role="paragraph" l10n="U" oldref="16">On the <emph>Page Layout</emph> tab page of the <item type="menuitem">File - Print</item> dialog, you have the option to print multiple pages on one sheet.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156098" role="listitem" l10n="U" oldref="19">Choose <emph>File - Print</emph> and click the <emph>Page Layout</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155055" role="listitem" l10n="U" oldref="31">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149603" role="listitem" l10n="U" oldref="20">To print two pages side by side on the same sheet, select "2" in the <emph>Pages per sheet</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="U" oldref="22">To print multiple pages on the same sheet, select the number of pages per sheet and optionally set the order of pages. The small preview shows the arrangement of pages. </paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="3">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154841" role="listitem" l10n="U" oldref="21">Click <emph>Print</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
+         <paragraph xml-lang="en-US" id="par_id3150004" role="paragraph" l10n="U" oldref="23"><link href="text/swriter/main0210.xhp" name="File - Page Preview">File - Page Preview</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/printer_tray.xhp b/helpcontent2/source/text/swriter/guide/printer_tray.xhp
index 2dd5f6dce0..4bc403384e 100644
--- a/helpcontent2/source/text/swriter/guide/printer_tray.xhp
+++ b/helpcontent2/source/text/swriter/guide/printer_tray.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer_tray.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,50 +29,48 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideprinter_trayxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting printer paper trays</title>
-<filename>/text/swriter/guide/printer_tray.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T15:02:06">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideprinter_trayxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Selecting printer paper trays</title>
+         <filename>/text/swriter/guide/printer_tray.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id6609088"><bookmark_value>selecting;paper trays</bookmark_value>
-<bookmark_value>paper tray selection</bookmark_value>
+      <bookmark_value>paper tray selection</bookmark_value>
 </bookmark><comment>mw made "paper trays;..." a one level entry</comment>
-<paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="printer_tray"><link href="text/swriter/guide/printer_tray.xhp" name="Selecting printer paper trays">Selecting Printer Paper Trays</link>
+<paragraph xml-lang="en-US" id="hd_id3155909" role="heading" level="1" l10n="U" oldref="1"><variable id="printer_tray"><link href="text/swriter/guide/printer_tray.xhp" name="Selecting printer paper trays">Selecting Printer Paper Trays</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use page styles to specify different paper sources for different pages in your document.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156108" xml-lang="en-US" l10n="U" oldref="8">Click the <emph>Page Styles </emph>icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="9">Right-click the page style in the list that you want to specify the paper source for, and then choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153416" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Paper tray </emph>box, select the paper tray that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149649" xml-lang="en-US" l10n="U" oldref="12">Repeat steps 1-5 for each page style that you want to specify the paper for.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149616" xml-lang="en-US" l10n="U" oldref="5">Apply the page style to the pages that you want.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
-<paragraph role="paragraph" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="13"><link href="text/swriter/guide/pagestyles.xhp" name="Creating and applying page styles">Creating and applying page styles</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="2">Use page styles to specify different paper sources for different pages in your document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149841" role="listitem" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156108" role="listitem" l10n="U" oldref="8">Click the <item type="menuitem">Page Styles</item>
+               <emph/>icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155066" role="listitem" l10n="U" oldref="9">Right-click the page style in the list that you want to specify the paper source for, and then choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153416" role="listitem" l10n="U" oldref="10">In the <item type="menuitem">Paper tray</item>
+               <emph/>box, select the paper tray that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149649" role="listitem" l10n="U" oldref="12">Repeat steps 1-5 for each page style that you want to specify the paper for.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149616" role="listitem" l10n="U" oldref="5">Apply the page style to the pages that you want.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
+      <paragraph xml-lang="en-US" id="par_id3154260" role="paragraph" l10n="U" oldref="13"><link href="text/swriter/guide/pagestyles.xhp" name="Creating and applying page styles">Creating and applying page styles</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/printing_order.xhp b/helpcontent2/source/text/swriter/guide/printing_order.xhp
index 78c603d92d..73f1b2e0a8 100755
--- a/helpcontent2/source/text/swriter/guide/printing_order.xhp
+++ b/helpcontent2/source/text/swriter/guide/printing_order.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printing_order.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,38 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideprinting_orderxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing in Reverse Order</title>
-<filename>/text/swriter/guide/printing_order.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>
+      <topic id="textswriterguideprinting_orderxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing in Reverse Order</title>
+         <filename>/text/swriter/guide/printing_order.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149688"><bookmark_value>ordering;printing in reverse order</bookmark_value>
-<bookmark_value>printing; reverse order</bookmark_value>
+      <bookmark_value>printing; reverse order</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="printing_order"><link href="text/swriter/guide/printing_order.xhp" name="Printing in Reverse Order">Printing in Reverse Order</link>
+<paragraph xml-lang="en-US" id="hd_id3149688" role="heading" level="1" l10n="U" oldref="1"><variable id="printing_order"><link href="text/swriter/guide/printing_order.xhp" name="Printing in Reverse Order">Printing in Reverse Order</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="5">Click <emph>Options</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156106" xml-lang="en-US" l10n="U" oldref="6">In the <emph>Pages </emph>area, select <emph>Reversed</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="7">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="8">In the <emph>Print </emph>dialog, click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/print_small.xhp#print_small"/>
-<paragraph role="paragraph" id="par_id3149616" xml-lang="en-US" l10n="U" oldref="4"><link href="text/shared/01/01130000.xhp" name="Printing">Printing</link></paragraph>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="U" oldref="3">Choose <emph>File - Print</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149836" role="listitem" l10n="U" oldref="5">Click the <emph>Options</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156106" role="listitem" l10n="U" oldref="6">Choose <emph>Print in reverse page order</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153418" role="listitem" l10n="U" oldref="7">Click <emph>Print</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/print_small.xhp#print_small"/>
+      <paragraph xml-lang="en-US" id="par_id3149616" role="paragraph" l10n="U" oldref="4"><link href="text/shared/01/01130000.xhp" name="Printing">Printing</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/protection.xhp b/helpcontent2/source/text/swriter/guide/protection.xhp
index d9ebaa0018..97419c9291 100644
--- a/helpcontent2/source/text/swriter/guide/protection.xhp
+++ b/helpcontent2/source/text/swriter/guide/protection.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protection.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,108 +29,104 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideprotectionxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME Writer</title>
-<filename>/text/swriter/guide/protection.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideprotectionxhp" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME Writer</title>
+         <filename>/text/swriter/guide/protection.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>indexes;unprotecting</bookmark_value>
-<bookmark_value>tables of contents;unprotecting</bookmark_value>
-<bookmark_value>tables;protecting/unprotecting cells</bookmark_value>
-<bookmark_value>sections;protecting/unprotecting</bookmark_value>
-<bookmark_value>unprotecting tables of contents and indexes</bookmark_value>
-<bookmark_value>protecting;tables and sections</bookmark_value>
-<bookmark_value>cells;protecting/unprotecting</bookmark_value>
-</bookmark>
-  <comment>mw transferred 4 index entries from shared/guide/protection.xhp, then changed "sections;" and "tables;", then added 3 new entries</comment>
-  <paragraph xml-lang="en-US" id="hd_id6007263" role="heading" level="1" l10n="NEW"><variable id="protection"><link href="text/swriter/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME Writer">Protecting Content in <item type="productname">%PRODUCTNAME Writer</item></link> 
+      <bookmark_value>tables of contents;unprotecting</bookmark_value>
+      <bookmark_value>tables;protecting/unprotecting cells</bookmark_value>
+      <bookmark_value>sections;protecting/unprotecting</bookmark_value>
+      <bookmark_value>unprotecting tables of contents and indexes</bookmark_value>
+      <bookmark_value>protecting;tables and sections</bookmark_value>
+      <bookmark_value>cells;protecting/unprotecting</bookmark_value>
+</bookmark><comment>mw transferred 4 index entries from shared/guide/protection.xhp, then changed "sections;" and "tables;", then added 3 new entries</comment>
+<paragraph xml-lang="en-US" id="hd_id6007263" role="heading" level="1" l10n="NEW"><variable id="protection"><link href="text/swriter/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME Writer">Protecting Content in <item type="productname">%PRODUCTNAME Writer</item></link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id1924802" role="paragraph" l10n="NEW">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> Writer from being modified, deleted or viewed.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3150114" role="heading" level="2" l10n="U" oldref="29">Protecting Sections in <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="U" oldref="30">Any section of a <item type="productname">%PRODUCTNAME</item> Writer text document can be protected against changes with a password.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id4545426" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the section against accidental changes.</paragraph>
-  <table id="tbl_id3154942">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="31">Turning on protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3144764" role="paragraph" l10n="U" oldref="32">Select the text. Choose <emph>Insert - Section - Section</emph>, then under <emph>Write protection</emph> mark the <emph>Protect</emph> and <emph>With password</emph> check boxes. (If the section already exists: <emph>Format - Sections</emph>.) Enter and confirm a password of at least 5 characters.</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147497" role="paragraph" l10n="U" oldref="33">Turning off protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3147173" role="paragraph" l10n="U" oldref="34">Choose <emph>Format - Sections - Section</emph> and under <emph>Write protection</emph> clear the <emph>Protect</emph> check box. Enter the correct password.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <paragraph xml-lang="en-US" id="hd_id3146081" role="heading" level="2" l10n="U" oldref="35">Protecting Cells in a <item type="productname">%PRODUCTNAME</item> Writer Table</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154480" role="paragraph" l10n="U" oldref="36">You can protect the contents of individual cells of a <item type="productname">%PRODUCTNAME</item> Writer text table from changes.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id363170" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the cells against accidental changes.</paragraph>
-  <table id="tbl_id3150321">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="37">Turning on protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3145643" role="paragraph" l10n="CHG" oldref="38">Place the cursor in a cell or select cells. Right-click to open the context menu, then choose <emph>Cell - Protect</emph>.</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3150042" role="paragraph" l10n="U" oldref="39">Turning off protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="CHG" oldref="40">Place the cursor in the cell or select the cells. First, if necessary, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and mark <emph>Cursor in protected areas - Enable</emph>. Then right-click the cell to open the context menu, choose <emph>Cell - Unprotect</emph>.</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3151189" role="paragraph" l10n="U" oldref="41">Select the table in the Navigator, open the context menu and select <emph>Table - Unprotect</emph>.</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3147322" role="paragraph" l10n="U" oldref="42">Use Shift+Ctrl+T to remove protection for the entire current table or all selected tables.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <paragraph xml-lang="en-US" id="hd_id3149259" role="heading" level="2" l10n="U" oldref="43">Automatic Protection of Indexes and Tables</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153966" role="paragraph" l10n="U" oldref="44">Tables of contents and indexes created automatically in a <item type="productname">%PRODUCTNAME</item> Writer text are automatically protected against accidental changes.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id814539" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the contents against accidental changes.</paragraph>
-  <table id="tbl_id3150644">
-   
-   
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3145767" role="paragraph" l10n="U" oldref="45">Turning on protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3153786" role="paragraph" l10n="U" oldref="46">Place the cursor in the index/table of contents.</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3159088" role="paragraph" l10n="U" oldref="47">From the context menu choose <emph>Edit Index/Table</emph>. On the Index/Table tab page, mark <emph>Protected against manual changes</emph>.</paragraph>
-    </tablecell>
-   </tablerow>
-   <tablerow>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3154118" role="paragraph" l10n="U" oldref="48">Turning off protection</paragraph>
-    </tablecell>
-    <tablecell>
-     <paragraph xml-lang="en-US" id="par_id3148463" role="paragraph" l10n="U" oldref="49">Place the cursor in the index. First of all, if necessary, under <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids </emph>, mark <emph>Cursor in protected areas - Enable</emph>.</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3152968" role="paragraph" l10n="U" oldref="50">From the context menu choose <emph>Edit Index/Table</emph>. On the Index/Table tab page, unmark <emph>Protected against manual changes</emph>.</paragraph>
-     <paragraph xml-lang="en-US" id="par_id3152774" role="paragraph" l10n="U" oldref="51">In the Navigator, select the index, then open the context menu in the Navigator and select <emph>Index - Read-only</emph>.</paragraph>
-    </tablecell>
-   </tablerow>
-  </table>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-  <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW"> <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/> </paragraph>
-  <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW"><link href="text/shared/guide/protection.xhp">Protecting Other Contents</link></paragraph>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id1924802" role="paragraph" l10n="NEW">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> Writer from being modified, deleted or viewed.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3150114" role="heading" level="2" l10n="U"
+                 oldref="29">Protecting Sections in <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="U" oldref="30">Any section of a <item type="productname">%PRODUCTNAME</item> Writer text document can be protected against changes with a password.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id4545426" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the section against accidental changes.</paragraph>
+      <table id="tbl_id3154942">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3166413" role="tablecontent" l10n="U" oldref="31">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3144764" role="tablecontent" l10n="U" oldref="32">Select the text. Choose <emph>Insert - Section - Section</emph>, then under <emph>Write protection</emph> mark the <emph>Protect</emph> and <emph>With password</emph> check boxes. (If the section already exists: <emph>Format - Sections</emph>.) Enter and confirm a password of at least 5 characters.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147497" role="tablecontent" l10n="U" oldref="33">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147173" role="tablecontent" l10n="U" oldref="34">Choose <emph>Format - Sections - Section</emph> and under <emph>Write protection</emph> clear the <emph>Protect</emph> check box. Enter the correct password.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id3146081" role="heading" level="2" l10n="U"
+                 oldref="35">Protecting Cells in a <item type="productname">%PRODUCTNAME</item> Writer Table</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154480" role="paragraph" l10n="U" oldref="36">You can protect the contents of individual cells of a <item type="productname">%PRODUCTNAME</item> Writer text table from changes.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id363170" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the cells against accidental changes.</paragraph>
+      <table id="tbl_id3150321">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154360" role="tablecontent" l10n="U" oldref="37">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145643" role="tablecontent" l10n="CHG" oldref="38">Place the cursor in a cell or select cells. Right-click to open the context menu, then choose <emph>Cell - Protect</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150042" role="tablecontent" l10n="U" oldref="39">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155178" role="tablecontent" l10n="CHG" oldref="40">Place the cursor in the cell or select the cells. First, if necessary, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph> and mark <emph>Cursor in protected areas - Enable</emph>. Then right-click the cell to open the context menu, choose <emph>Cell - Unprotect</emph>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3151189" role="tablecontent" l10n="U" oldref="41">Select the table in the Navigator, open the context menu and select <emph>Table - Unprotect</emph>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147322" role="tablecontent" l10n="U" oldref="42">Use Shift+Ctrl+T to remove protection for the entire current table or all selected tables.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+
+      <paragraph xml-lang="en-US" id="hd_id3149259" role="heading" level="2" l10n="U"
+                 oldref="43">Automatic Protection of Indexes and Tables</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153966" role="paragraph" l10n="U" oldref="44">Tables of contents and indexes created automatically in a <item type="productname">%PRODUCTNAME</item> Writer text are automatically protected against accidental changes.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id814539" role="warning" l10n="NEW">This protection is not intended to be a secure protection. It is just a switch to protect the contents against accidental changes.</paragraph>
+      <table id="tbl_id3150644">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145767" role="tablecontent" l10n="U" oldref="45">Turning on protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153786" role="tablecontent" l10n="U" oldref="46">Place the cursor in the index/table of contents.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3159088" role="tablecontent" l10n="U" oldref="47">From the context menu choose <emph>Edit Index/Table</emph>. On the Index/Table tab page, mark <emph>Protected against manual changes</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154118" role="tablecontent" l10n="U" oldref="48">Turning off protection</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148463" role="tablecontent" l10n="U" oldref="49">Place the cursor in the index. First of all, if necessary, under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids </emph>, mark <emph>Cursor in protected areas - Enable</emph>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3152968" role="tablecontent" l10n="U" oldref="50">From the context menu choose <emph>Edit Index/Table</emph>. On the Index/Table tab page, unmark <emph>Protected against manual changes</emph>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3152774" role="tablecontent" l10n="U" oldref="51">In the Navigator, select the index, then open the context menu in the Navigator and select <emph>Index - Read-only</emph>.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+      <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW">
+         <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+      </paragraph>
+      <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW"><link href="text/shared/guide/protection.xhp">Protecting Other Contents</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/references.xhp b/helpcontent2/source/text/swriter/guide/references.xhp
index ae2eb6e90f..d3c6bb077f 100755
--- a/helpcontent2/source/text/swriter/guide/references.xhp
+++ b/helpcontent2/source/text/swriter/guide/references.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: references.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,102 +32,109 @@
  
 	
 <meta>
-<topic id="textswriterguidereferencesxml" indexer="include">
-<title id="tit" xml-lang="en-US">Inserting Cross-References</title>
-<filename>/text/swriter/guide/references.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidereferencesxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Inserting Cross-References</title>
+         <filename>/text/swriter/guide/references.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145087"><bookmark_value>references; inserting cross-references</bookmark_value>
-<bookmark_value>cross-references; inserting and updating</bookmark_value>
-<bookmark_value>tables; cross-referencing</bookmark_value>
-<bookmark_value>pictures; cross-referencing</bookmark_value>
-<bookmark_value>objects; cross-referencing</bookmark_value>
-<bookmark_value>OLE objects;cross-referencing</bookmark_value>
-<bookmark_value>draw objects;cross-referencing</bookmark_value>
-<bookmark_value>updating;cross-references</bookmark_value>
-<bookmark_value>inserting;cross-references</bookmark_value>
+      <bookmark_value>cross-references; inserting and updating</bookmark_value>
+      <bookmark_value>tables; cross-referencing</bookmark_value>
+      <bookmark_value>pictures; cross-referencing</bookmark_value>
+      <bookmark_value>objects; cross-referencing</bookmark_value>
+      <bookmark_value>OLE objects;cross-referencing</bookmark_value>
+      <bookmark_value>draw objects;cross-referencing</bookmark_value>
+      <bookmark_value>updating;cross-references</bookmark_value>
+      <bookmark_value>inserting;cross-references</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="1" l10n="U" oldref="28"><variable id="references"><link href="text/swriter/guide/references.xhp" name="Inserting Cross-References">Inserting Cross-References</link>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="1" l10n="U"
+                 oldref="28"><variable id="references"><link href="text/swriter/guide/references.xhp" name="Inserting Cross-References">Inserting Cross-References</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159263" xml-lang="en-US" l10n="CHG" oldref="8">Cross-references allow you to jump to specific text passages and objects in a single document. A cross-reference consists of a target and a reference that are inserted as <link href="text/swriter/guide/fields.xhp" name="fields">fields</link> in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="21">Objects with captions and bookmarks can be used as targets.</paragraph>
-<paragraph role="heading" id="hd_id3149833" xml-lang="en-US" level="2" l10n="U" oldref="38">Cross-Referencing Text</paragraph>
-<paragraph role="paragraph" id="par_id3149846" xml-lang="en-US" l10n="U" oldref="39">Before you can insert a cross-reference, you must first specify the targets in your text.</paragraph>
-<paragraph role="heading" id="hd_id3156105" xml-lang="en-US" level="3" l10n="U" oldref="52">To insert a target:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153408" xml-lang="en-US" l10n="U" oldref="40">Select the text that you want to use as a target for the cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153125" xml-lang="en-US" l10n="U" oldref="41">Choose <emph>Insert - Cross-reference</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149634" xml-lang="en-US" l10n="U" oldref="42">In the <emph>Type</emph> list, select <emph>Set Reference</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149614" xml-lang="en-US" l10n="U" oldref="43">Type a name for the target in the <emph>Name</emph> box. The selected text is displayed in the <emph>Value</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145110" xml-lang="en-US" l10n="U" oldref="44">Click <emph>Insert</emph>. The name of the target is added to the <emph>Selection </emph>list.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3156257" xml-lang="en-US" l10n="U" oldref="45">Leave the dialog open and proceed to the next section.</paragraph>
-<paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="53">To create a cross-reference to a target:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id7032074" xml-lang="en-US" l10n="NEW">Position the cursor in the text where you want to insert a cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7796868" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Cross-reference</emph> to open the dialog, if it is not open already.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153392" xml-lang="en-US" l10n="U" oldref="46">In the <emph>Type</emph> list, select "Insert Reference".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154256" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Selection</emph> list, select the target that you want to cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154856" xml-lang="en-US" l10n="CHG" oldref="48">In the <emph>Insert reference to</emph> list, select the format for the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the target text, and "Page" inserts the page number where the target is located. For footnotes the footnote number is inserted.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="49">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="54">Click <emph>Close</emph> when finished.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149980" xml-lang="en-US" level="2" l10n="U" oldref="29">Cross-Referencing an Object</paragraph>
-<paragraph role="paragraph" id="par_id3149992" xml-lang="en-US" l10n="U" oldref="30">You can cross-reference most objects in your document, such as graphics, drawing objects, OLE objects, and tables, so long as they have a caption. To add a caption to an object, select the object, and then choose <link href="text/swriter/guide/captions.xhp" name="Insert - Caption"><emph>Insert - Caption</emph></link>.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147123" xml-lang="en-US" l10n="U" oldref="14">Click in the document where you want to insert the cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150212" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Insert - Cross-reference</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150236" xml-lang="en-US" l10n="U" oldref="32">In the <emph>Type</emph> list, select the caption category of the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150942" xml-lang="en-US" l10n="U" oldref="33">In the <emph>Selection</emph> list, select the caption number of the object that you want to cross-reference.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150968" xml-lang="en-US" l10n="CHG" oldref="34">In the <emph>Insert reference to</emph> list, select the format of the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the caption category and caption text of the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150535" xml-lang="en-US" l10n="U" oldref="35">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151092" xml-lang="en-US" l10n="U" oldref="55">Click <emph>Close</emph> when finished.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="2" l10n="U" oldref="56">Updating Cross-References</paragraph>
-<paragraph role="paragraph" id="par_id3153594" xml-lang="en-US" l10n="U" oldref="51">To manually update the cross-references in a document, press F9.</paragraph>
-<paragraph role="tip" id="par_id7321390" xml-lang="en-US" l10n="NEW">Choose <emph>View - Fields</emph> to switch between viewing the reference names and the reference contents.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/references_modify.xhp#references_modify"/>
-<embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
-<embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3159263" role="paragraph" l10n="CHG" oldref="8">Cross-references allow you to jump to specific text passages and objects in a single document. A cross-reference consists of a target and a reference that are inserted as <link href="text/swriter/guide/fields.xhp" name="fields">fields</link> in the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155860" role="paragraph" l10n="U" oldref="21">Objects with captions and bookmarks can be used as targets.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149833" role="heading" level="2" l10n="U"
+                 oldref="38">Cross-Referencing Text</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149846" role="paragraph" l10n="U" oldref="39">Before you can insert a cross-reference, you must first specify the targets in your text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156105" role="heading" level="3" l10n="U"
+                 oldref="52">To Insert a Target</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153408" role="listitem" l10n="U" oldref="40">Select the text that you want to use as a target for the cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153125" role="listitem" l10n="U" oldref="41">Choose <emph>Insert - Cross-reference</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149634" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Type</item> list, select “Set Reference”.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149614" role="listitem" l10n="U" oldref="43">Type a name for the target in the <emph>Name</emph> box. The selected text is displayed in the <emph>Value</emph> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145110" role="listitem" l10n="U" oldref="44">Click <item type="menuitem">Insert</item>. The name of the target is added to the <item type="menuitem">Selection</item>
+               <emph/>list.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3156257" role="paragraph" l10n="U" oldref="45">Leave the dialog open and proceed to the next section.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153370" role="heading" level="3" l10n="U"
+                 oldref="53">To Create a Cross-Reference to a Target</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7032074" role="listitem" l10n="NEW">Position the cursor in the text where you want to insert a cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7796868" role="listitem" l10n="NEW">Choose <emph>Insert - Cross-reference</emph> to open the dialog, if it is not open already.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153392" role="listitem" l10n="U" oldref="46">In the <emph>Type</emph> list, select "Insert Reference".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154256" role="listitem" l10n="U" oldref="47">In the <emph>Selection</emph> list, select the target that you want to cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154856" role="listitem" l10n="CHG" oldref="48">In the <emph>Insert reference to</emph> list, select the format for the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the target text, and "Page" inserts the page number where the target is located. For footnotes the footnote number is inserted.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155895" role="listitem" l10n="U" oldref="49">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="54">Click <emph>Close</emph> when finished.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149980" role="heading" level="2" l10n="U"
+                 oldref="29">Cross-Referencing an Object</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149992" role="paragraph" l10n="U" oldref="30">You can cross-reference most objects in your document, such as graphics, drawing objects, OLE objects, and tables, so long as they have a caption. To add a caption to an object, select the object, and then choose <link href="text/swriter/guide/captions.xhp" name="Insert - Caption"><emph>Insert - Caption</emph></link>.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147123" role="listitem" l10n="U" oldref="14">Click in the document where you want to insert the cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150212" role="listitem" l10n="U" oldref="11">Choose <emph>Insert - Cross-reference</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150236" role="listitem" l10n="U" oldref="32">In the <emph>Type</emph> list, select the caption category of the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150942" role="listitem" l10n="U" oldref="33">In the <emph>Selection</emph> list, select the caption number of the object that you want to cross-reference.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150968" role="listitem" l10n="CHG" oldref="34">In the <emph>Insert reference to</emph> list, select the format of the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the caption category and caption text of the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150535" role="listitem" l10n="U" oldref="35">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151092" role="listitem" l10n="U" oldref="55">Click <emph>Close</emph> when finished.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U"
+                 oldref="56">Updating Cross-References</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153594" role="paragraph" l10n="U" oldref="51">To manually update the cross-references in a document, press F9.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7321390" role="tip" l10n="NEW">Choose <emph>View - Fields</emph> to switch between viewing the reference names and the reference contents.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/references_modify.xhp#references_modify"/>
+      <embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
+      <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/references_modify.xhp b/helpcontent2/source/text/swriter/guide/references_modify.xhp
index 58a85dbb98..3292216657 100644
--- a/helpcontent2/source/text/swriter/guide/references_modify.xhp
+++ b/helpcontent2/source/text/swriter/guide/references_modify.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: references_modify.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,40 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidereferences_modifyxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Modifying Cross-References</title>
-<filename>/text/swriter/guide/references_modify.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-24T07:41:15">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidereferences_modifyxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Modifying Cross-References</title>
+         <filename>/text/swriter/guide/references_modify.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149291"><bookmark_value>references; modifying cross-references</bookmark_value>
-<bookmark_value>cross-references; modifying</bookmark_value>
-<bookmark_value>editing;cross-references</bookmark_value>
-<bookmark_value>searching;cross-references</bookmark_value>
+      <bookmark_value>cross-references; modifying</bookmark_value>
+      <bookmark_value>editing;cross-references</bookmark_value>
+      <bookmark_value>searching;cross-references</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149291" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="references_modify"><link href="text/swriter/guide/references_modify.xhp" name="Modifying Cross-References">Modifying Cross-References</link>
+<paragraph xml-lang="en-US" id="hd_id3149291" role="heading" level="1" l10n="U" oldref="6"><variable id="references_modify"><link href="text/swriter/guide/references_modify.xhp" name="Modifying Cross-References">Modifying Cross-References</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153132" xml-lang="en-US" l10n="U" oldref="2">Click in front of the cross-reference that you want to modify.</paragraph>
-<paragraph role="listitem" id="par_id3149632" xml-lang="en-US" l10n="U" oldref="3">If you cannot see the field shading of the cross-reference, choose <emph>View - Field Shadings</emph> or press <emph>Ctrl+F8</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149611" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Edit - Fields</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145101" xml-lang="en-US" l10n="U" oldref="7">Set the options that you want, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="5">Use the arrow buttons in the <emph>Edit Fields </emph>dialog to browse through the cross-references in the current document.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/references.xhp#references"/>
-<embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153132" role="listitem" l10n="U" oldref="2">Click in front of the cross-reference that you want to modify.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149632" role="listitem" l10n="U" oldref="3">If you cannot see the field shading of the cross-reference, choose <emph>View - Field Shadings</emph> or press <emph>Ctrl+F8</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149611" role="listitem" l10n="U" oldref="4">Choose <emph>Edit - Fields</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145101" role="listitem" l10n="U" oldref="7">Set the options that you want, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154255" role="tip" l10n="U" oldref="5">Use the arrow buttons in the <item type="menuitem">Edit Fields</item>
+         <emph/>dialog to browse through the cross-references in the current document.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/references.xhp#references"/>
+      <embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/registertrue.xhp b/helpcontent2/source/text/swriter/guide/registertrue.xhp
index 4e33505d31..842496e964 100755
--- a/helpcontent2/source/text/swriter/guide/registertrue.xhp
+++ b/helpcontent2/source/text/swriter/guide/registertrue.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registertrue.xhp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,59 +27,54 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideregistertruexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Register-true</title>
-<filename>/text/swriter/guide/registertrue.xhp</filename>
-</topic>
-<history>
-<created date="2004-04-23T13:05:16">UFI: fixes #i22750#</created>
-<lastedited date="2006-01-09T14:34:05">FPE: Replaced Writing by Printing</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideregistertruexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Printing Register-true</title>
+         <filename>/text/swriter/guide/registertrue.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id4825891"><bookmark_value>rows; register-true text</bookmark_value>
-<bookmark_value>lines of text; register-true</bookmark_value>
-<bookmark_value>pages;register-true</bookmark_value>
-<bookmark_value>paragraphs;register-true</bookmark_value>
-<bookmark_value>register-true;pages and paragraphs</bookmark_value>
-<bookmark_value>spacing;register-true text</bookmark_value>
-<bookmark_value>formatting;register-true text</bookmark_value>
+      <bookmark_value>lines of text; register-true</bookmark_value>
+      <bookmark_value>pages;register-true</bookmark_value>
+      <bookmark_value>paragraphs;register-true</bookmark_value>
+      <bookmark_value>register-true;pages and paragraphs</bookmark_value>
+      <bookmark_value>spacing;register-true text</bookmark_value>
+      <bookmark_value>formatting;register-true text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="par_idN10652" xml-lang="en-US" level="1" l10n="NEW"><variable id="registertrue"><link href="text/swriter/guide/registertrue.xhp">Printing Register-true</link>
+<paragraph xml-lang="en-US" id="par_idN10652" role="heading" level="1" l10n="NEW"><variable id="registertrue"><link href="text/swriter/guide/registertrue.xhp">Printing Register-true</link>
 </variable></paragraph>
-<embed href="text/shared/00/00000005.xhp#registerhaltigkeit"/>
-<paragraph role="heading" id="par_idN1065E" xml-lang="en-US" level="2" l10n="NEW">Setting a document to register-true printing</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="NEW">Select the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10669" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Page - Page</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">Select the <emph>Register-true</emph> checkbox.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">All the paragraphs in the document will be printed register-true, unless otherwise specified.</paragraph>
-<paragraph role="heading" id="par_idN1067B" xml-lang="en-US" level="2" l10n="NEW">Exempting paragraphs from register-true printing</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10682" xml-lang="en-US" l10n="NEW">Do one of the following:</paragraph>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="NEW">Select all the paragraphs you want to exempt, then choose <emph>Format - Paragraph - Indents &amp; Spacing</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN1068C" xml-lang="en-US" l10n="NEW">Open the Styles and Formatting window, click the Paragraph Style you want to exempt, right-click that style, choose <emph>Modify</emph>. In the dialog, click the <emph>Indents &amp; Spacing</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10698" xml-lang="en-US" l10n="NEW">Clear the <emph>Register-true</emph> checkbox.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN106AA" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/05030100.xhp">Register-true</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <embed href="text/shared/00/00000005.xhp#registerhaltigkeit"/>
+      <paragraph xml-lang="en-US" id="par_idN1065E" role="heading" level="2" l10n="NEW">To Set a Document to Register-True Printing</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10665" role="listitem" l10n="NEW">Select the whole document.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10669" role="listitem" l10n="NEW">Choose <emph>Format - Page - Page</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10671" role="listitem" l10n="NEW">Select the <item type="menuitem">Register-true</item> checkbox and click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">All the paragraphs in the document will be printed register-true, unless otherwise specified.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1067B" role="heading" level="2" l10n="NEW">To Exempt Paragraphs From Register-True Printing</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10682" role="paragraph" l10n="NEW">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10685" role="paragraph" l10n="NEW">Select all the paragraphs you want to exempt, then choose <emph>Format - Paragraph - Indents &amp; Spacing</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN1068C" role="paragraph" l10n="NEW">Open the Styles and Formatting window, click the Paragraph Style you want to exempt, right-click that style, choose <emph>Modify</emph>. In the dialog, click the <emph>Indents &amp; Spacing</emph> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">Clear the <emph>Register-true</emph> checkbox.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN106AA" role="paragraph" l10n="NEW"><link href="text/shared/01/05030100.xhp">Register-true</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
index 38e1354f96..1b59e68fcf 100644
--- a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
+++ b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,50 +29,50 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textswriterguideremoving_line_breaksxml" indexer="include">
-<title id="tit" xml-lang="en-US">Removing Line Breaks</title>
-<filename>/text/swriter/guide/removing_line_breaks.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideremoving_line_breaksxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Removing Line Breaks</title>
+         <filename>/text/swriter/guide/removing_line_breaks.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149687"><bookmark_value>hard returns in pasted text</bookmark_value>
-<bookmark_value>paragraph marks;finding &amp; replacing</bookmark_value>
-<bookmark_value>line breaks;removing</bookmark_value>
-<bookmark_value>deleting; line breaks</bookmark_value>
-<bookmark_value>copies;removing line breaks</bookmark_value>
-</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment>
-<paragraph role="heading" id="hd_id3155916" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="removing_line_breaks"><link href="text/swriter/guide/removing_line_breaks.xhp">Removing Line Breaks</link>
+      <bookmark_value>line breaks;removing</bookmark_value>
+      <bookmark_value>deleting; line breaks</bookmark_value>
+      <bookmark_value>copies;removing line breaks</bookmark_value>
+      <bookmark_value>paragraph marks;removing</bookmark_value>
+</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment><comment>MW changed "paragraph marks;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="CHG"
+                 oldref="1"><variable id="removing_line_breaks"><link href="text/swriter/guide/removing_line_breaks.xhp">Removing Line Breaks</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U" oldref="2">Use the AutoCorrect feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
-<paragraph role="note" id="par_id3153413" xml-lang="en-US" l10n="U" oldref="3">This AutoCorrect feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>.</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149645" xml-lang="en-US" l10n="U" oldref="6">On the <emph>Options</emph> tab, ensure that <emph>Combine single line paragraphs if length greater than 50%</emph> is selected. To change the minimum percentage for the line length, double-click the option in the list, and then enter a new percentage.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145093" xml-lang="en-US" l10n="U" oldref="12">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145118" xml-lang="en-US" l10n="U" oldref="7">Select the text containing the line breaks that you want to remove.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156253" xml-lang="en-US" l10n="CHG" oldref="8">In the <emph>Apply Style </emph>box on the <emph>Formatting</emph> bar, choose <emph>Default</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153388" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="2">Use the AutoCorrect feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153413" role="note" l10n="U" oldref="3">This AutoCorrect feature only works on text that is formatted with the "Default" paragraph style. </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153138" role="listitem" l10n="U" oldref="5">Choose <item type="menuitem">Tools - AutoCorrect Options</item>
+               <emph>.</emph>
+            </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149645" role="listitem" l10n="U" oldref="6">On the <emph>Options</emph> tab, ensure that <emph>Combine single line paragraphs if length greater than 50%</emph> is selected. To change the minimum percentage for the line length, double-click the option in the list, and then enter a new percentage.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145093" role="listitem" l10n="U" oldref="12">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145118" role="listitem" l10n="U" oldref="7">Select the text containing the line breaks that you want to remove.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156253" role="listitem" l10n="CHG" oldref="8">In the <item type="menuitem">Apply Style</item> box on the <item type="menuitem">Formatting</item> bar, choose “Default”.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="U" oldref="9">Choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/reset_format.xhp b/helpcontent2/source/text/swriter/guide/reset_format.xhp
index f39aed4218..45166aa5e3 100755
--- a/helpcontent2/source/text/swriter/guide/reset_format.xhp
+++ b/helpcontent2/source/text/swriter/guide/reset_format.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reset_format.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,35 +29,36 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidereset_formatxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Resetting Font Attributes</title>
-<filename>/text/swriter/guide/reset_format.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidereset_formatxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Resetting Font Attributes</title>
+         <filename>/text/swriter/guide/reset_format.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149963"><bookmark_value>formats; resetting</bookmark_value>
-<bookmark_value>font attributes; resetting</bookmark_value>
-<bookmark_value>fonts; resetting</bookmark_value>
-<bookmark_value>resetting; fonts</bookmark_value>
-<bookmark_value>direct formatting;exiting</bookmark_value>
-<bookmark_value>formatting;exiting direct formatting</bookmark_value>
-<bookmark_value>exiting;direct formatting</bookmark_value>
-</bookmark><comment>mw made "exiting..." a two level entry</comment><paragraph role="heading" id="hd_id3149963" xml-lang="en-US" level="1" l10n="U" oldref="26"><variable id="reset_format"><link href="text/swriter/guide/reset_format.xhp" name="Resetting Font Attributes">Resetting Font Attributes</link>
+      <bookmark_value>font attributes; resetting</bookmark_value>
+      <bookmark_value>fonts; resetting</bookmark_value>
+      <bookmark_value>resetting; fonts</bookmark_value>
+      <bookmark_value>direct formatting;exiting</bookmark_value>
+      <bookmark_value>formatting;exiting direct formatting</bookmark_value>
+      <bookmark_value>exiting;direct formatting</bookmark_value>
+</bookmark><comment>mw made "exiting..." a two level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3149963" role="heading" level="1" l10n="U"
+                 oldref="26"><variable id="reset_format"><link href="text/swriter/guide/reset_format.xhp" name="Resetting Font Attributes">Resetting Font Attributes</link>
 </variable></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154091" xml-lang="en-US" l10n="U" oldref="27">You can quickly exit manual formatting by pressing the right-arrow key. For example, if you have pressed Ctrl+B to apply the bold typeface to the text that you type, press the right arrow to return to the default character format of the paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155854" xml-lang="en-US" l10n="CHG" oldref="28">To reset all direct formatting of existing text, select that text, then choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
-<embed href="text/swriter/guide/shortcut_writing.xhp#shortcut_writing"/>
-</body>
-</helpdocument>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154091" role="listitem" l10n="U" oldref="27">You can quickly exit manual formatting by pressing the right-arrow key. For example, if you have pressed Ctrl+B to apply the bold typeface to the text that you type, press the right arrow to return to the default character format of the paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="CHG" oldref="28">To reset all direct formatting of existing text, select that text, then choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
+      <embed href="text/swriter/guide/shortcut_writing.xhp#shortcut_writing"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/resize_navigator.xhp b/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
index 90b4387a4b..a64a90323b 100755
--- a/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
+++ b/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resize_navigator.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/ruler.xhp b/helpcontent2/source/text/swriter/guide/ruler.xhp
index 67c50de502..2caa1582a2 100644
--- a/helpcontent2/source/text/swriter/guide/ruler.xhp
+++ b/helpcontent2/source/text/swriter/guide/ruler.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ruler.xhp,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,12 +32,12 @@
  
 	
 <meta>
-<topic id="textswriterguiderulerxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Using Rulers</title>
-<filename>/text/swriter/guide/ruler.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguiderulerxhp" indexer="include">
+         <title xml-lang="en-US" id="tit">Using Rulers</title>
+         <filename>/text/swriter/guide/ruler.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id8186284"><bookmark_value>rulers;using rulers</bookmark_value>
 <bookmark_value>horizontal rulers</bookmark_value>
 <bookmark_value>vertical rulers</bookmark_value>
@@ -51,26 +48,26 @@
 <bookmark_value>hiding;rulers</bookmark_value>
 <bookmark_value>adjusting page margins and cell widths</bookmark_value>
 </bookmark><comment>mw made "indent settings..." a two level entry and cut "changing;indents"</comment>
-<paragraph role="heading" id="par_idN1065F" xml-lang="en-US" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
+<paragraph xml-lang="en-US" id="par_idN1065F" role="heading" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1067D" xml-lang="en-US" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
-<paragraph role="heading" id="hd_id3149686" xml-lang="en-US" level="2" l10n="U" oldref="20">Adjusting Page Margins</paragraph>
-<paragraph role="paragraph" id="par_id3155175" xml-lang="en-US" l10n="U" oldref="3">The margins of a page are indicated by the filled areas at the ends of the rulers.</paragraph>
-<paragraph role="heading" id="hd_id3149038" xml-lang="en-US" level="2" l10n="U" oldref="22">Changing Indents</paragraph>
-<paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="U" oldref="23">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="26">To change the left or the right paragraph indent, select the paragraph(s) that you want change the indent for, drag the bottom left or the bottom right triangle on the horizontal ruler to a new location. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="27">To change the first line indent of a selected paragraph, drag the top left triangle on the horizontal ruler to a new location.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="12">You can also double-click anywhere on the horizontal ruler, and adjust the indents in the <link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link> dialog.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-<embed href="text/shared/guide/tabs.xhp#tabs"/>
-<embed href="text/shared/guide/measurement_units.xhp#measurement_units"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN1067D" role="paragraph" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View"><emph>%PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="2" l10n="U" oldref="20">Adjusting Page Margins</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155175" role="paragraph" l10n="U" oldref="3">The margins of a page are indicated by the filled areas at the ends of the rulers.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149038" role="heading" level="2" l10n="U" oldref="22">Changing Indents</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153631" role="paragraph" l10n="U" oldref="23">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152776" role="listitem" l10n="U" oldref="26">To change the left or the right paragraph indent, select the paragraph(s) that you want change the indent for, drag the bottom left or the bottom right triangle on the horizontal ruler to a new location. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145769" role="listitem" l10n="U" oldref="27">To change the first line indent of a selected paragraph, drag the top left triangle on the horizontal ruler to a new location.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="12">You can also double-click anywhere on the horizontal ruler, and adjust the indents in the <link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link> dialog.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+         <embed href="text/shared/guide/tabs.xhp#tabs"/>
+         <embed href="text/shared/guide/measurement_units.xhp#measurement_units"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/search_regexp.xhp b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
index 21d6de71c9..cdeeae9b62 100755
--- a/helpcontent2/source/text/swriter/guide/search_regexp.xhp
+++ b/helpcontent2/source/text/swriter/guide/search_regexp.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.
  * 
@@ -11,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: search_regexp.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,58 +32,67 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Using Wildcards in Text Searches</title>
-<filename>/text/swriter/guide/search_regexp.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using Wildcards in Text Searches</title>
+         <filename>/text/swriter/guide/search_regexp.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150099"><bookmark_value>wildcards, see regular expressions</bookmark_value>
-<bookmark_value>searching; with wildcards</bookmark_value>
-<bookmark_value>regular expressions;searching</bookmark_value>
-<bookmark_value>examples for regular expressions</bookmark_value>
-</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment><paragraph role="heading" id="hd_id3150099" xml-lang="en-US" level="1" l10n="U" oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
+      <bookmark_value>searching; with wildcards</bookmark_value>
+      <bookmark_value>regular expressions;searching</bookmark_value>
+      <bookmark_value>examples for regular expressions</bookmark_value>
+      <bookmark_value>characters;finding all</bookmark_value>
+      <bookmark_value>invisible characters;finding</bookmark_value>
+      <bookmark_value>paragraph marks;searching</bookmark_value>
+</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment><comment>mw added "paragraph marks;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150099" role="heading" level="1" l10n="U"
+                 oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155182" xml-lang="en-US" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155907" xml-lang="en-US" l10n="U" oldref="40">Choose <emph>Edit - Find &amp; Replace</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id2142399" xml-lang="en-US" l10n="NEW">Click <emph>More Options</emph> to expand the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155861" xml-lang="en-US" l10n="U" oldref="41">Select the <emph>Regular expressions</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149843" xml-lang="en-US" l10n="U" oldref="42">In the <emph>Search for </emph>box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="51">Click <emph>Find </emph>or<emph> Find All</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153401" xml-lang="en-US" level="2" l10n="U" oldref="52">Regular Expression Examples</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149641" xml-lang="en-US" oldref="44">The wildcard for a single character is a period (.).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153136" xml-lang="en-US" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149609" xml-lang="en-US" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149854" xml-lang="en-US" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3153414" xml-lang="en-US" l10n="CHG" oldref="49">You can only search for regular expressions within the same paragraph. That is, you cannot search for one term in a paragraph and a different term in the next paragraph.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149875" xml-lang="en-US" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id0509200916345516" role="paragraph" l10n="NEW">Wildcards or placeholders can be used to search for some unspecified or even invisible characters.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Edit - Find &amp; Replace</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2142399" role="listitem" l10n="NEW">Click <item type="menuitem">More Options</item> to expand the dialog.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="41">Select the <item type="menuitem">Regular expressions</item> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Search for</item> box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="51">Click <item type="menuitem">Find</item> or <item type="menuitem">Find All</item>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153401" role="heading" level="2" l10n="U"
+                 oldref="52">Regular Expression Examples</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" oldref="44">The wildcard for a single character is a period (.).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149609" role="listitem" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149854" role="listitem" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0509200916345545" role="listitem" l10n="NEW">The wildcard for a tab character is \t.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153414" role="note" l10n="CHG" oldref="49">A search using a regular expression will work only within one paragraph. To search using a regular expression in more than one paragraph, do a separate search in each paragraph.</paragraph>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id3149875" role="paragraph" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/section_edit.xhp b/helpcontent2/source/text/swriter/guide/section_edit.xhp
index afb8739c8b..1454115711 100755
--- a/helpcontent2/source/text/swriter/guide/section_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/section_edit.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: section_edit.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,60 +29,48 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidesection_editxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Editing Sections</title>
-<filename>/text/swriter/guide/section_edit.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidesection_editxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Editing Sections</title>
+         <filename>/text/swriter/guide/section_edit.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149816"><bookmark_value>sections; editing</bookmark_value>
-<bookmark_value>editing;sections</bookmark_value>
-<bookmark_value>read-only sections</bookmark_value>
-<bookmark_value>protecting;sections</bookmark_value>
-<bookmark_value>converting;sections, into normal text</bookmark_value>
-<bookmark_value>hiding;sections</bookmark_value>
+      <bookmark_value>editing;sections</bookmark_value>
+      <bookmark_value>read-only sections</bookmark_value>
+      <bookmark_value>protecting;sections</bookmark_value>
+      <bookmark_value>converting;sections, into normal text</bookmark_value>
+      <bookmark_value>hiding;sections</bookmark_value>
 </bookmark>
-  <paragraph xml-lang="en-US" id="hd_id3149816" role="heading" level="1" l10n="U" oldref="13"><variable id="section_edit"><link href="text/swriter/guide/section_edit.xhp" name="Editing Sections">Editing Sections</link> 
+<paragraph xml-lang="en-US" id="hd_id3149816" role="heading" level="1" l10n="U"
+                 oldref="13"><variable id="section_edit"><link href="text/swriter/guide/section_edit.xhp" name="Editing Sections">Editing Sections</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="14">You can protect, hide, and convert sections to normal text in your document.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154224" role="listitem" l10n="U" oldref="15">Choose <link href="text/swriter/01/02170000.xhp" name="Format - Sections"><emph>Format - Sections</emph></link>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="CHG" oldref="16">In the <emph>Section </emph>list, click the section you want to modify. You can press Ctrl+A to select all sections in the list, and you can Shift+click or Ctrl+click to select some sections.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153397" role="listitem" l10n="U" oldref="17">Do one of the following:</paragraph>
-   </listitem>
-  </list>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153120" role="listitem" l10n="U" oldref="18">To convert a section into normal text, click <emph>Remove</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149631" role="listitem" l10n="U" oldref="19">To make a section read-only, select the <emph>Protected </emph>check box in the <emph>Write Protection </emph>area.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149609" role="listitem" l10n="U" oldref="20">To hide a section, select the <emph>Hide </emph>check box in the <emph>Hide </emph>area.</paragraph>
-   </listitem>
-  </list>
-  <list type="ordered" startwith="4">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="21">Set the other options that you want, and then click <emph>OK</emph>.</paragraph>
-   </listitem>
-  </list>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/sections.xhp#sections"/>
-  <embed href="text/swriter/guide/section_insert.xhp#section_insert"/>
-  <paragraph xml-lang="en-US" id="par_id3156255" role="paragraph" l10n="U" oldref="22"><link href="text/swriter/01/02170000.xhp" name="Format - Sections">Format - Sections</link></paragraph>
-  <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="14">You can protect, hide, and convert sections to normal text in your document.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154224" role="listitem" l10n="U" oldref="15">Choose <link href="text/swriter/01/02170000.xhp" name="Format - Sections"><emph>Format - Sections</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="CHG" oldref="16">In the <item type="menuitem">Section</item>
+               <emph/>list, click the section you want to modify. You can press Ctrl+A to select all sections in the list, and you can Shift+click or Ctrl+click to select some sections.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153397" role="listitem" l10n="U" oldref="17">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <list type="ordered" startwith="4">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="21">Set the other options that you want, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/sections.xhp#sections"/>
+      <embed href="text/swriter/guide/section_insert.xhp#section_insert"/>
+      <paragraph xml-lang="en-US" id="par_id3156255" role="paragraph" l10n="U" oldref="22"><link href="text/swriter/01/02170000.xhp" name="Format - Sections">Format - Sections</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/section_insert.xhp b/helpcontent2/source/text/swriter/guide/section_insert.xhp
index 44f92835c5..7566d0563d 100755
--- a/helpcontent2/source/text/swriter/guide/section_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/section_insert.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: section_insert.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,80 +27,84 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidesection_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Sections</title>
-<filename>/text/swriter/guide/section_insert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-23T14:33:10">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidesection_insertxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Sections</title>
+         <filename>/text/swriter/guide/section_insert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>sections; inserting</bookmark_value>
-<bookmark_value>inserting; sections</bookmark_value>
-<bookmark_value>HTML documents;inserting linked sections</bookmark_value>
-<bookmark_value>updating;linked sections, manually</bookmark_value>
-<bookmark_value>links;inserting sections</bookmark_value>
+      <bookmark_value>inserting; sections</bookmark_value>
+      <bookmark_value>HTML documents;inserting linked sections</bookmark_value>
+      <bookmark_value>updating;linked sections, manually</bookmark_value>
+      <bookmark_value>links;inserting sections</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="section_insert"><link href="text/swriter/guide/section_insert.xhp" name="Inserting Sections">Inserting Sections</link>
+<paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U"
+                 oldref="16"><variable id="section_insert"><link href="text/swriter/guide/section_insert.xhp" name="Inserting Sections">Inserting Sections</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155917" xml-lang="en-US" l10n="U" oldref="26">You can insert new sections, or links to sections in other documents into the current document. If you insert a section as a link, the content of the link changes when you modify the source document.</paragraph>
-<paragraph role="heading" id="hd_id3155863" xml-lang="en-US" level="2" l10n="U" oldref="27">To insert a new section:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149843" xml-lang="en-US" l10n="U" oldref="23">Click in your document where you want to insert a new section, or select the text that you want to convert to a section.</paragraph>
-<paragraph role="listitem" id="par_id3156103" xml-lang="en-US" l10n="U" oldref="28">If you select a text that occurs within a paragraph, the text is automatically converted into a new paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149281" xml-lang="en-US" l10n="U" oldref="24">Choose <emph>Insert - Section</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153404" xml-lang="en-US" l10n="U" oldref="29">In the <emph>New Section </emph>box, type a name for the section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="25">Set the options for the section, and then click <emph>Insert</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149635" xml-lang="en-US" level="2" l10n="U" oldref="30">To insert a section as a link:</paragraph>
-<paragraph role="paragraph" id="par_id3149648" xml-lang="en-US" l10n="U" oldref="31">Before you can insert a section as link, you must first create sections in the source document.</paragraph>
-<paragraph role="paragraph" id="par_id3149611" xml-lang="en-US" l10n="U" oldref="18">When you open a document that contains linked sections, $[officename] prompts you to update the contents of the sections. To manually update a link, choose <emph>Tools - Update - Links</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149860" xml-lang="en-US" l10n="U" oldref="22">You can also insert linked sections in HTML documents. When you view the page in a web browsers, the content of the sections corresponds to the content of the sections at the time the HTML document was last saved.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145104" xml-lang="en-US" l10n="U" oldref="32">Click in your document where you want to insert the linked section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156241" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Insert - Section</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="34">In the <emph>New Section </emph>box, type a name for the section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="35">In the <emph>Link </emph>area, select the <emph>Link </emph>check box. <switchinline select="sys"><caseinline select="WIN">Under Windows, you can also select the <emph>DDE</emph> check box to automatically update the contents of the section when the section in the source document is changed. 
+      <paragraph xml-lang="en-US" id="par_id3155917" role="paragraph" l10n="U" oldref="26">You can insert new sections, or links to sections in other documents into the current document. If you insert a section as a link, the content of the link changes when you modify the source document.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155863" role="heading" level="2" l10n="U"
+                 oldref="27">To Insert a New Section</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="23">Click in your document where you want to insert a new section, or select the text that you want to convert to a section.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156103" role="listitem" l10n="U" oldref="28">If you select a text that occurs within a paragraph, the text is automatically converted into a new paragraph.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149281" role="listitem" l10n="U" oldref="24">Choose <emph>Insert - Section</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153404" role="listitem" l10n="U" oldref="29">In the <item type="menuitem">New Section</item>
+               <emph/>box, type a name for the section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153127" role="listitem" l10n="U" oldref="25">Set the options for the section, and then click <emph>Insert</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149635" role="heading" level="2" l10n="U"
+                 oldref="30">To Insert a Section as a Link</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149648" role="paragraph" l10n="U" oldref="31">Before you can insert a section as link, you must first create sections in the source document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149611" role="paragraph" l10n="U" oldref="18">When you open a document that contains linked sections, $[officename] prompts you to update the contents of the sections. To manually update a link, choose <emph>Tools - Update - Links</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149860" role="paragraph" l10n="U" oldref="22">You can also insert linked sections in HTML documents. When you view the page in a web browser, the content of the sections corresponds to the content of the sections at the time the HTML document was last saved.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145104" role="listitem" l10n="U" oldref="32">Click in your document where you want to insert the linked section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156241" role="listitem" l10n="U" oldref="33">Choose <emph>Insert - Section</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153363" role="listitem" l10n="U" oldref="34">In the <item type="menuitem">New Section</item>
+               <emph/>box, type a name for the section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153387" role="listitem" l10n="U" oldref="35">In the <item type="menuitem">Link</item>
+               <emph/>area, select the <item type="menuitem">Link</item>
+               <emph/>check box. <switchinline select="sys"><caseinline select="WIN">Under Windows, you can also select the <item type="menuitem">DDE</item> check box to automatically update the contents of the section when the section in the source document is changed. 
 </caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154852" xml-lang="en-US" l10n="U" oldref="36">Click the browse button (<emph>...</emph>) next to the <emph>File name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155882" xml-lang="en-US" l10n="U" oldref="37">Locate the document containing the section that you want to link to, and then click <emph>Insert</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149978" xml-lang="en-US" l10n="U" oldref="38">In the <emph>Section </emph>box, select the section that you want to insert.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150003" xml-lang="en-US" l10n="U" oldref="39">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/sections.xhp#sections"/>
-<embed href="text/swriter/guide/section_edit.xhp#section_edit"/>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154852" role="listitem" l10n="U" oldref="36">Click the browse button (<item type="menuitem">...</item>) next to the <item type="menuitem">File name</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155882" role="listitem" l10n="U" oldref="37">Locate the document containing the section that you want to link to, and then click <emph>Insert</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149978" role="listitem" l10n="U" oldref="38">In the <item type="menuitem">Section</item>
+               <emph/>box, select the section that you want to insert.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150003" role="listitem" l10n="U" oldref="39">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/sections.xhp#sections"/>
+      <embed href="text/swriter/guide/section_edit.xhp#section_edit"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/sections.xhp b/helpcontent2/source/text/swriter/guide/sections.xhp
index 2f012ca263..5356250973 100644
--- a/helpcontent2/source/text/swriter/guide/sections.xhp
+++ b/helpcontent2/source/text/swriter/guide/sections.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sections.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,57 +29,51 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidesectionsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Using Sections</title>
-<filename>/text/swriter/guide/sections.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidesectionsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using Sections</title>
+         <filename>/text/swriter/guide/sections.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149832"><bookmark_value>multi-column text</bookmark_value>
-<bookmark_value>text; multi-column</bookmark_value>
-<bookmark_value>columns; on text pages</bookmark_value>
-<bookmark_value>text columns</bookmark_value>
-<bookmark_value>sections; remarks</bookmark_value>
-<bookmark_value>text sections;using</bookmark_value>
-<bookmark_value>sections; columns in</bookmark_value>
-</bookmark>
-  <comment>mw changed a typo in "multicolumn"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3149832" role="heading" level="1" l10n="U" oldref="40"><variable id="sections"><link href="text/swriter/guide/sections.xhp" name="Using Sections">Using Sections</link> 
+      <bookmark_value>text; multi-column</bookmark_value>
+      <bookmark_value>columns; on text pages</bookmark_value>
+      <bookmark_value>text columns</bookmark_value>
+      <bookmark_value>sections; columns in/use of</bookmark_value>
+</bookmark><comment>mw changed a typo in "multicolumn"</comment><comment>mw deleted "sections;using" and changed "section;columns in"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149832" role="heading" level="1" l10n="U"
+                 oldref="40"><variable id="sections"><link href="text/swriter/guide/sections.xhp" name="Using Sections">Using Sections</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153128" role="paragraph" l10n="U" oldref="2">Sections are named blocks of text, including graphics or objects, that you can use in a number of ways:</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149284" role="listitem" l10n="U" oldref="5">To prevent text from being edited.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149630" role="listitem" l10n="U" oldref="4">To show or hide text.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149647" role="listitem" l10n="U" oldref="20">To reuse text and graphics from other $[officename] documents.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="38">To insert sections of text that uses a different column layout than the current page style.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3149855" role="paragraph" l10n="U" oldref="7">A section contains at least one paragraph. When you select a text and create a section, a paragraph break is automatically inserted at the end of the text.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149872" role="paragraph" l10n="U" oldref="8">You can insert sections from a text document, or an entire text document as a section into another text document. You can also insert sections from a text document as links in another text document, or in the same document.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153367" role="note" l10n="U" oldref="39">To insert a new paragraph immediately before or after a section, click in front or behind the section, and then press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3154242" role="heading" level="2" l10n="U" oldref="44">Sections and Columns</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="41">You can insert sections into an existing section. For example, you can insert a section containing two columns into a section that contains one column.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154845" role="paragraph" l10n="U" oldref="42">A section layout, for example on the number of columns, has priority over the page layout defined in a page style.</paragraph>
-  <section id="relatedtopics">
-   
-   <embed href="text/swriter/guide/section_insert.xhp#section_insert"/>
-   <embed href="text/swriter/guide/section_edit.xhp#section_edit"/>
-   <paragraph xml-lang="en-US" id="par_id3155883" role="paragraph" l10n="C"><link href="text/shared/00/00000005.xhp#dde" name="DDE">DDE</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3153128" role="paragraph" l10n="U" oldref="2">Sections are named blocks of text, including graphics or objects, that you can use in a number of ways:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149284" role="listitem" l10n="U" oldref="5">To prevent text from being edited.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149630" role="listitem" l10n="U" oldref="4">To show or hide text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149647" role="listitem" l10n="U" oldref="20">To reuse text and graphics from other $[officename] documents.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="38">To insert sections of text that uses a different column layout than the current page style.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149855" role="paragraph" l10n="U" oldref="7">A section contains at least one paragraph. When you select a text and create a section, a paragraph break is automatically inserted at the end of the text.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149872" role="paragraph" l10n="U" oldref="8">You can insert sections from a text document, or an entire text document as a section into another text document. You can also insert sections from a text document as links in another text document, or in the same document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153367" role="note" l10n="U" oldref="39">To insert a new paragraph immediately before or after a section, click in front or behind the section, and then press <switchinline select="sys"><caseinline select="MAC">Option 
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154242" role="heading" level="2" l10n="U"
+                 oldref="44">Sections and Columns</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="41">You can insert sections into an existing section. For example, you can insert a section containing two columns into a section that contains one column.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154845" role="paragraph" l10n="U" oldref="42">A section layout, for example on the number of columns, has priority over the page layout defined in a page style.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/section_insert.xhp#section_insert"/>
+         <embed href="text/swriter/guide/section_edit.xhp#section_edit"/>
+         <paragraph xml-lang="en-US" id="par_id3155883" role="paragraph" l10n="C"><link href="text/shared/00/00000005.xhp#dde" name="DDE">DDE</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/select_language.xhp b/helpcontent2/source/text/swriter/guide/select_language.xhp
index 71d0df713a..8dae7863b3 100644
--- a/helpcontent2/source/text/swriter/guide/select_language.xhp
+++ b/helpcontent2/source/text/swriter/guide/select_language.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: select_language.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,41 +27,35 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideselect_languagexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Checking Spelling in Other Languages</title>
-<filename>/text/swriter/guide/select_language.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-28T14:18:51">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideselect_languagexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Checking Spelling in Other Languages</title>
+         <filename>/text/swriter/guide/select_language.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152443"><bookmark_value>languages; recognition of</bookmark_value>
-<bookmark_value>recognition of languages</bookmark_value>
+<bookmark_value>recognition;languages</bookmark_value>
 <bookmark_value>spellcheck;activating for all languages</bookmark_value>
 <bookmark_value>checking spelling;all languages</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3152443" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155914" xml-lang="en-US" l10n="U" oldref="34">$[officename] can check the spelling of words in more than one language, provided that you have installed dictionaries for the other languages.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153122" xml-lang="en-US" l10n="U" oldref="35">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>, and ensure that the <emph>Check in all languages</emph> check box in the <emph>Options </emph>list is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149643" xml-lang="en-US" l10n="CHG" oldref="39">Activate the AutoSpellcheck icon in the Standard bar.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3156257" xml-lang="en-US" l10n="CHG" oldref="37">If you do not enable the <emph>Check in all languages </emph>feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose<emph> Word is </emph>or <emph>Paragraph is</emph>, where the suggested language and country is shown in the command.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-</body>
-</helpdocument>
+</bookmark><comment>MW made a two level entry of "regognition of languages"</comment>
+<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U" oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link></variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155914" role="paragraph" l10n="U" oldref="34">$[officename] can check the spelling of words in more than one language, provided that you have installed dictionaries for the other languages.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item> list is selected.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149643" role="listitem" l10n="CHG" oldref="39">Activate the AutoSpellcheck icon in the Standard bar.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item> feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose <item type="menuitem">Word is</item> or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/send2html.xhp b/helpcontent2/source/text/swriter/guide/send2html.xhp
index d8717e9f21..141fa5a5fd 100755
--- a/helpcontent2/source/text/swriter/guide/send2html.xhp
+++ b/helpcontent2/source/text/swriter/guide/send2html.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: send2html.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,40 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidesend2htmlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Saving Text Documents in HTML Format</title>
-<filename>/text/swriter/guide/send2html.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-23T11:30:24">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidesend2htmlxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Saving Text Documents in HTML Format</title>
+         <filename>/text/swriter/guide/send2html.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145087"><bookmark_value>text documents; publishing in HTML</bookmark_value>
-<bookmark_value>HTML documents; creating from text documents</bookmark_value>
-<bookmark_value>homepage creation</bookmark_value>
-<bookmark_value>saving;in HTML format</bookmark_value>
+      <bookmark_value>HTML documents; creating from text documents</bookmark_value>
+      <bookmark_value>homepage creation</bookmark_value>
+      <bookmark_value>saving;in HTML format</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="send2html"><link href="text/swriter/guide/send2html.xhp" name="Saving Text Documents in HTML Format">Saving Text Documents in HTML Format</link>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="1" l10n="U" oldref="1"><variable id="send2html"><link href="text/swriter/guide/send2html.xhp" name="Saving Text Documents in HTML Format">Saving Text Documents in HTML Format</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149825" xml-lang="en-US" l10n="U" oldref="2">You can save a $[officename] Writer document in HTML format, so that you can view it in a web browser. If you want, you can associate a page break with a specific heading paragraph style to generate a separate HTML page each time the style appears in the document. $[officename] Writer automatically creates a page containing hyperlinks to each of these pages.</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="3">When you save a text document in HTML format, any graphics in the document are saved in JPEG format. The name of the HTML document is added as a prefix to the name of the graphic file. The JPEG images are saved in the same folder as the HTML document and are referenced with &lt;IMG&gt; tags in the HTML code.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155868" xml-lang="en-US" l10n="U" oldref="5">Apply one of the default $[officename] heading paragraph styles, for example, "Heading 1", to the paragraphs where you want to generate a new HTML page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156100" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>File - Send - Create HTML Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149281" xml-lang="en-US" l10n="U" oldref="7">In the <emph>Styles </emph>box, select the paragraph style that you want to use to generate a new HTML page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153407" xml-lang="en-US" l10n="U" oldref="9">Enter a path and a name for the HTML document, and then click <emph>Save</emph>.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="U" oldref="2">You can save a $[officename] Writer document in HTML format, so that you can view it in a web browser. If you want, you can associate a page break with a specific heading paragraph style to generate a separate HTML page each time the style appears in the document. $[officename] Writer automatically creates a page containing hyperlinks to each of these pages.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="3">When you save a text document in HTML format, any graphics in the document are saved in JPEG format. The name of the HTML document is added as a prefix to the name of the graphic file. The JPEG images are saved in the same folder as the HTML document and are referenced with &lt;IMG&gt; tags in the HTML code.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155868" role="listitem" l10n="U" oldref="5">Apply one of the default $[officename] heading paragraph styles, for example, "Heading 1", to the paragraphs where you want to generate a new HTML page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156100" role="listitem" l10n="U" oldref="6">Choose <emph>File - Send - Create HTML Document</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149281" role="listitem" l10n="U" oldref="7">In the <item type="menuitem">Styles</item>
+               <emph/>box, select the paragraph style that you want to use to generate a new HTML page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153407" role="listitem" l10n="U" oldref="9">Enter a path and a name for the HTML document, and then click <emph>Save</emph>.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp b/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
index 3c2663852d..7a4618085d 100755
--- a/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
+++ b/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shortcut_writing.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,41 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideshortcut_writingxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying Text Formatting While You Type</title>
-<filename>/text/swriter/guide/shortcut_writing.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-24T11:35:39">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguideshortcut_writingxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Text Formatting While You Type</title>
+         <filename>/text/swriter/guide/shortcut_writing.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149689"><bookmark_value>text; formatting bold while typing</bookmark_value>
-<bookmark_value>formatting; bold, while typing</bookmark_value>
-<bookmark_value>keyboard;bold formatting</bookmark_value>
-<bookmark_value>bold;formatting while typing</bookmark_value>
-<bookmark_value>shortcut keys;bold formatting</bookmark_value>
+      <bookmark_value>formatting; bold, while typing</bookmark_value>
+      <bookmark_value>keyboard;bold formatting</bookmark_value>
+      <bookmark_value>bold;formatting while typing</bookmark_value>
+      <bookmark_value>shortcut keys;bold formatting</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149689" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="shortcut_writing"><link href="text/swriter/guide/shortcut_writing.xhp" name="Applying Text Formatting While You Type">Applying Text Formatting While You Type</link>
+<paragraph xml-lang="en-US" id="hd_id3149689" role="heading" level="1" l10n="U" oldref="1"><variable id="shortcut_writing"><link href="text/swriter/guide/shortcut_writing.xhp" name="Applying Text Formatting While You Type">Applying Text Formatting While You Type</link>
 </variable></paragraph>
-<paragraph role="heading" id="hd_id3155909" xml-lang="en-US" level="2" l10n="U" oldref="2">To apply bold formatting</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155861" xml-lang="en-US" l10n="U" oldref="14">Select the text that you want to format.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="5">Press <switchinline select="sys"><caseinline select="MAC">Command 
+      <paragraph xml-lang="en-US" id="hd_id3155909" role="paragraph" l10n="U" oldref="2">To apply bold formatting</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="14">Select the text that you want to format.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149836" role="listitem" l10n="U" oldref="5">Press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B.</paragraph>
-<paragraph role="listitem" id="par_id3156112" xml-lang="en-US" l10n="U" oldref="6">You can also press <switchinline select="sys"><caseinline select="MAC">Command 
+            <paragraph xml-lang="en-US" id="par_id3156112" role="listitem" l10n="U" oldref="6">You can also press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B, type the text that you want to format in bold, and then press <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B when you are finished.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/subscript.xhp#subscript"/>
-<paragraph role="paragraph" id="par_id3149648" xml-lang="en-US" l10n="U" oldref="12"><link href="text/swriter/04/01020000.xhp" name="Keyboard shortcut for text documents">Keyboard shortcut for text documents</link></paragraph>
-<paragraph role="paragraph" id="par_id3149611" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/main0400.xhp" name="Keyboard shortcut in $[officename]">Keyboard shortcut in $[officename]</link></paragraph>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/subscript.xhp#subscript"/>
+      <paragraph xml-lang="en-US" id="par_id3149648" role="paragraph" l10n="U" oldref="12"><link href="text/swriter/04/01020000.xhp" name="Keyboard shortcut for text documents">Keyboard shortcut for text documents</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149611" role="paragraph" l10n="U" oldref="13"><link href="text/shared/main0400.xhp" name="Keyboard shortcut in $[officename]">Keyboard shortcut in $[officename]</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp
index 5c1cfd4106..6425703577 100644
--- a/helpcontent2/source/text/swriter/guide/smarttags.xhp
+++ b/helpcontent2/source/text/swriter/guide/smarttags.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,38 +32,38 @@
  
 	
 <meta>
-<topic id="textswriterguidesmarttagsxml" indexer="include">
-<title id="tit" xml-lang="en-US">Using Smart Tags</title>
-<filename>/text/swriter/guide/smarttags.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidesmarttagsxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Using Smart Tags</title>
+         <filename>/text/swriter/guide/smarttags.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155622"><bookmark_value>smart tags</bookmark_value>
 <bookmark_value>AutoCorrect function; smart tags</bookmark_value>
 <bookmark_value>options;smart tags</bookmark_value>
 <bookmark_value>disabling;smart tags</bookmark_value>
 <bookmark_value>installing;smart tags</bookmark_value>
 </bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment>
-<paragraph role="heading" id="hd_id3563951" xml-lang="en-US" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
+<paragraph xml-lang="en-US" id="hd_id3563951" role="heading" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id368358" xml-lang="en-US" l10n="NEW">Smart Tags provide additional information and functionality to specified words in a Writer document. The available features can be different for different Smart Tags extensions.</paragraph>
-<paragraph role="heading" id="hd_id9298379" xml-lang="en-US" level="2" l10n="NEW">Installing Smart Tags</paragraph>
-<paragraph role="paragraph" id="par_id1827448" xml-lang="en-US" l10n="NEW">Smart Tags can be supplied as <link href="text/shared/01/packagemanager.xhp">extensions</link> to %PRODUCTNAME Writer. </paragraph>
-<paragraph role="paragraph" id="par_id2508621" xml-lang="en-US" l10n="NEW">To install a Smart Tag, do one of the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3856013" xml-lang="en-US" l10n="NEW">Save the *.oxt extension file to your harddrive, then double-click the *.oxt file in your file manager. Alternatively, in %PRODUCTNAME choose <item type="menuitem">Tools - Extension Manager</item> to open the Extension Manager, click Add and browse to the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7814264" xml-lang="en-US" l10n="CHG">Click a Smart Tag *.oxt file link on a web page and open the link with the default application. This requires a properly configured Web browser.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id8142338" xml-lang="en-US" level="2" l10n="NEW">Smart Tags menu</paragraph>
-<paragraph role="paragraph" id="par_id1917477" xml-lang="en-US" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem">Tools - Options - %PRODUCTNAME - Appearance</item>.</paragraph>
-<paragraph role="paragraph" id="par_id192266" xml-lang="en-US" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
-<paragraph role="paragraph" id="par_id1998962" xml-lang="en-US" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
-<paragraph role="heading" id="hd_id2376476" xml-lang="en-US" level="2" l10n="NEW">To enable and disable Smart Tags</paragraph>
-<paragraph role="paragraph" id="par_id349131" xml-lang="en-US" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect Options</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
-<paragraph role="note" id="par_id1216467" xml-lang="en-US" l10n="NEW">Text that is recognized as a Smart Tag is not checked by the automatic spellcheck.</paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id368358" role="paragraph" l10n="NEW">Smart Tags provide additional information and functionality to specified words in a Writer document. The available features can be different for different Smart Tags extensions.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id9298379" role="heading" level="2" l10n="NEW">Installing Smart Tags</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1827448" role="paragraph" l10n="NEW">Smart Tags can be supplied as <link href="text/shared/01/packagemanager.xhp">extensions</link> to %PRODUCTNAME Writer. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2508621" role="paragraph" l10n="NEW">To install a Smart Tag, do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3856013" role="paragraph" l10n="NEW">Save the *.oxt extension file to your harddrive, then double-click the *.oxt file in your file manager. Alternatively, in %PRODUCTNAME choose <item type="menuitem">Tools - Extension Manager</item> to open the Extension Manager, click Add and browse to the file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7814264" role="paragraph" l10n="CHG">Click a Smart Tag *.oxt file link on a web page and open the link with the default application. This requires a properly configured Web browser.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id8142338" role="heading" level="2" l10n="NEW">Smart Tags Menu</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1917477" role="paragraph" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id192266" role="paragraph" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1998962" role="paragraph" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id2376476" role="heading" level="2" l10n="NEW">To Enable and Disable Smart Tags</paragraph>
+      <paragraph xml-lang="en-US" id="par_id349131" role="paragraph" l10n="NEW">When you have installed at least one Smart Tags extension, you see the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page in <item type="menuitem">Tools - Autocorrect Options</item>. Use this dialog to enable or disable Smart Tags and to manage the installed tags.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1216467" role="note" l10n="NEW">Text that is recognized as a Smart Tag is not checked by the automatic spellcheck.</paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
index 4ab2c5e90e..a4a57fbedd 100644
--- a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spellcheck_dialog.xhp,v $
- * $Revision: 1.13.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,56 +32,48 @@
  
 	
 <meta>
-<topic id="textswriterguidespellcheck_dialogxml" indexer="include">
-<title id="tit" xml-lang="en-US">Checking Spelling Manually</title>
-<filename>/text/swriter/guide/spellcheck_dialog.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidespellcheck_dialogxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Checking Spelling and Grammar</title>
+         <filename>/text/swriter/guide/spellcheck_dialog.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149684"><bookmark_value>spellcheck; checking text documents manually</bookmark_value>
-<bookmark_value>checking spelling;manually</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3149684" xml-lang="en-US" level="1" l10n="U" oldref="37"><variable id="spellcheck_dialog"><link href="text/swriter/guide/spellcheck_dialog.xhp" name="Checking Spelling Manually">Checking Spelling Manually</link>
+      <bookmark_value>checking spelling;manually</bookmark_value>
+      <bookmark_value>grammar checker</bookmark_value>
+</bookmark><comment>mw added "grammar checker"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149684" role="heading" level="1" l10n="U"
+                 oldref="37"><variable id="spellcheck_dialog"><link href="text/swriter/guide/spellcheck_dialog.xhp" name="Checking Spelling and Grammar">Checking Spelling and Grammar</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="9">You can manually check the spelling of a text selection or the entire document.</paragraph>
-<paragraph role="paragraph" id="par_id3149828" xml-lang="en-US" l10n="U" oldref="10">The spellcheck starts at the current cursor position, or at the beginning of the text selection.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155859" xml-lang="en-US" l10n="U" oldref="43">Click in the document, or select the text that you want to check.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149836" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Tools - Spelling and Grammar</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156104" xml-lang="en-US" l10n="CHG" oldref="45">When a possible spelling error is encountered, the <emph>Spellcheck </emph>dialog opens and $[officename] offers some suggested corrections.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3149861" xml-lang="en-US" l10n="U" oldref="46">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145099" xml-lang="en-US" l10n="CHG" oldref="47">To accept a correction, click the suggestion, and then click <emph>Change</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156241" xml-lang="en-US" l10n="CHG" oldref="48">Edit the sentence in the upper text box, and then click <emph>Change</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="CHG" oldref="40">To add the unknown word to a user-defined dictionary, click <emph>Add</emph>.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
-<embed href="text/swriter/guide/select_language.xhp#select_language"/>
-<paragraph role="paragraph" id="par_id3147107" xml-lang="en-US" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
-<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
-<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
-<paragraph role="paragraph" id="par_id9625843" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
-<paragraph role="paragraph" id="par_id1683706" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="CHG" oldref="9">You can manually check the spelling and grammar of a text selection or the entire document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0525200902184476" role="note" l10n="NEW">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="http://extensions.services.openoffice.org/dictionary">extensions web page</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149828" role="paragraph" l10n="U" oldref="10">The spellcheck starts at the current cursor position, or at the beginning of the text selection.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155859" role="listitem" l10n="U" oldref="43">Click in the document, or select the text that you want to check.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149836" role="listitem" l10n="CHG" oldref="44">Choose <emph>Tools - Spelling and Grammar</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156104" role="listitem" l10n="CHG" oldref="45">When a possible spelling error is encountered, the <item type="menuitem">Spellcheck</item>
+               <emph/>dialog opens and $[officename] offers some suggested corrections.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149861" role="listitem" l10n="U" oldref="46">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3145099" role="listitem" l10n="CHG" oldref="47">To accept a correction, click the suggestion, and then click <emph>Change</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156241" role="listitem" l10n="CHG" oldref="48">Edit the sentence in the upper text box, and then click <emph>Change</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="CHG" oldref="40">To add the unknown word to a user-defined dictionary, click <emph>Add</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
+         <embed href="text/swriter/guide/select_language.xhp#select_language"/>
+         <paragraph xml-lang="en-US" id="par_id3147107" role="paragraph" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
+         <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
+         <embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
+         <paragraph xml-lang="en-US" id="par_id9625843" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id1683706" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp b/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
index c34c860646..a535d10951 100644
--- a/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
+++ b/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stylist_fillformat.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,56 +29,53 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidestylist_fillformatxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying Styles in Fill Format Mode</title>
-<filename>/text/swriter/guide/stylist_fillformat.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T14:46:43">FPE: Transformed table to numbered list</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidestylist_fillformatxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Applying Styles in Fill Format Mode</title>
+         <filename>/text/swriter/guide/stylist_fillformat.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145084"><bookmark_value>fill format mode</bookmark_value>
-<bookmark_value>copying; styles, by fill format mode</bookmark_value>
-<bookmark_value>brush for copying styles</bookmark_value>
-<bookmark_value>styles; transferring</bookmark_value>
-<bookmark_value>formats; copying and pasting</bookmark_value>
-<bookmark_value>text formats; copying and pasting</bookmark_value>
+      <bookmark_value>copying; styles, by fill format mode</bookmark_value>
+      <bookmark_value>brush for copying styles</bookmark_value>
+      <bookmark_value>styles; transferring</bookmark_value>
+      <bookmark_value>formats; copying and pasting</bookmark_value>
+      <bookmark_value>text formats; copying and pasting</bookmark_value>
 </bookmark><comment>mw changed "copying;"</comment>
-<paragraph role="heading" id="hd_id3145084" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="stylist_fillformat"><link href="text/swriter/guide/stylist_fillformat.xhp" name="Applying Styles in Fill Format Mode">Applying Styles in Fill Format Mode</link>
+<paragraph xml-lang="en-US" id="hd_id3145084" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="stylist_fillformat"><link href="text/swriter/guide/stylist_fillformat.xhp" name="Applying Styles in Fill Format Mode">Applying Styles in Fill Format Mode</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155855" xml-lang="en-US" l10n="CHG" oldref="42">You can quickly apply styles, such as paragraph and character styles, in your document by using the Fill Format Mode in the Styles and Formatting window.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="32">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153128" xml-lang="en-US" l10n="CHG" oldref="33">Click the icon of the style category that you want to apply.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="17">Click the style, and then click the <emph>Fill Format Mode</emph> icon 
-<image id="img_id3149644" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149644" xml-lang="en-US">Icon</alt>
-	</image> in the <emph>Styles and Formatting</emph> window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153371" xml-lang="en-US" l10n="U" oldref="29">Move the mouse pointer to where you want to apply the style in the document, and click. To apply the style to more than one item, drag to select the items, and then release.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="34">Press <item type="keycode">Esc</item> when finished.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id2227852" xml-lang="en-US" localize="false">
+      <paragraph xml-lang="en-US" id="par_id3155855" role="paragraph" l10n="CHG" oldref="42">You can quickly apply styles, such as paragraph and character styles, in your document by using the Fill Format Mode in the Styles and Formatting window.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156114" role="listitem" l10n="CHG" oldref="32">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153128" role="listitem" l10n="CHG" oldref="33">Click the icon of the style category that you want to apply.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145090" role="listitem" l10n="U" oldref="17">Click the style, and then click the <item type="menuitem">Fill Format Mode</item> icon 
+<image id="img_id3149644" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149644">Icon</alt>
+	</image> in the <item type="menuitem">Styles and Formatting</item> window.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153371" role="listitem" l10n="U" oldref="29">Move the mouse pointer to where you want to apply the style in the document, and click. To apply the style to more than one item, drag to select the items, and then release.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154263" role="listitem" l10n="U" oldref="34">Press <item type="keycode">Esc</item> when finished.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id2227852" role="paragraph" localize="false">
 <embedvar href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
 </paragraph>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
-<embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
-<paragraph role="paragraph" id="par_id3159259" xml-lang="en-US" l10n="U" oldref="35"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+         <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
+         <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
+         <paragraph xml-lang="en-US" id="par_id3159259" role="paragraph" l10n="U" oldref="35"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/stylist_fromselect.xhp b/helpcontent2/source/text/swriter/guide/stylist_fromselect.xhp
index 63fa1178f1..273c9622d9 100644
--- a/helpcontent2/source/text/swriter/guide/stylist_fromselect.xhp
+++ b/helpcontent2/source/text/swriter/guide/stylist_fromselect.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stylist_fromselect.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,69 +29,69 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidestylist_fromselectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating New Styles From Selections</title>
-<filename>/text/swriter/guide/stylist_fromselect.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-03-02T14:49:05">UFI: spec "Changed behaviour of drag and drop of selections to the Styl_ist"
-YJ:checked</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidestylist_fromselectxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating New Styles From Selections</title>
+         <filename>/text/swriter/guide/stylist_fromselect.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155911"><bookmark_value>styles; creating from selections</bookmark_value>
-<bookmark_value>drag and drop;creating new styles</bookmark_value>
-<bookmark_value>copying;styles, from selections</bookmark_value>
+      <bookmark_value>drag and drop;creating new styles</bookmark_value>
+      <bookmark_value>copying;styles, from selections</bookmark_value>
 </bookmark><comment>mw deleted "creating;" and added "copying;"</comment>
-<paragraph role="heading" id="hd_id3155911" xml-lang="en-US" level="1" l10n="U" oldref="34"><variable id="stylist_fromselect"><link href="text/swriter/guide/stylist_fromselect.xhp" name="Creating New Styles From Selections">Creating New Styles From Selections</link>
+<paragraph xml-lang="en-US" id="hd_id3155911" role="heading" level="1" l10n="U"
+                 oldref="34"><variable id="stylist_fromselect"><link href="text/swriter/guide/stylist_fromselect.xhp" name="Creating New Styles From Selections">Creating New Styles From Selections</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="35">You can quickly create a new style from an existing style that you have applied manual formatting to.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156097" xml-lang="en-US" l10n="CHG" oldref="36">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153402" xml-lang="en-US" l10n="CHG" oldref="42">Click the icon of the style category that you want to create.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153119" xml-lang="en-US" l10n="U" oldref="37">Click in the document where you want to copy the style from, for example, in a paragraph that you applied manual formatting to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153138" xml-lang="en-US" l10n="CHG" oldref="38">Click the arrow next to the <emph>New Style from Selection</emph> icon and choose <emph>New Style from Selection </emph>from the submenu</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156260" xml-lang="en-US" l10n="U" oldref="43">Type a name in the <emph>Style Name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154411" xml-lang="en-US" l10n="U" oldref="44">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153373" xml-lang="en-US" level="2" l10n="U" oldref="20">To create a new style by drag-and-drop:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154233" xml-lang="en-US" l10n="CHG" oldref="31">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154258" xml-lang="en-US" l10n="U" oldref="45">Click the icon of the style category that you want to create.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154851" xml-lang="en-US" l10n="U" oldref="32">Select at least one character, or object, in the style that you want to copy. For page and frame styles, select at least one character or object in the page or frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154871" xml-lang="en-US" l10n="CHG" oldref="33">Drag the character or object to the Styles and Formatting window and release.</paragraph>
-<paragraph role="listitem" id="par_idN107B2" xml-lang="en-US" l10n="NEW">For Paragraph and Character Styles, you can drag-and-drop onto the respective icon in the Styles and Formatting window. You do not need to open that style category in advance.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN107B5" xml-lang="en-US" l10n="NEW">You can also drag-and-drop a frame into the Styles and Formatting window to create a new frame style: Click the frame, wait a moment with the mouse button pressed down, but without moving the mouse, then drag to the Styles and Formatting window and drop the frame onto the Frame Styles icon.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
-<embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
-<paragraph role="paragraph" id="par_id3149988" xml-lang="en-US" l10n="U" oldref="40"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149829" role="heading" level="2" l10n="U"
+                 oldref="35">To Create a New Style From a Manually Formatted Selection</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156097" role="listitem" l10n="CHG" oldref="36">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153402" role="listitem" l10n="CHG" oldref="42">Click the icon of the style category that you want to create.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153119" role="listitem" l10n="U" oldref="37">Click in the document where you want to copy the style from, for example, in a paragraph that you applied manual formatting to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153138" role="listitem" l10n="CHG" oldref="38">Click the arrow next to the <item type="menuitem">New Style from Selection</item> icon and choose <item type="menuitem">New Style from Selection</item>
+               <emph/>from the submenu</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156260" role="listitem" l10n="U" oldref="43">Type a name in the <item type="menuitem">Style Name</item>
+               <emph/>box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154411" role="listitem" l10n="U" oldref="44">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153373" role="heading" level="2" l10n="U"
+                 oldref="20">To Create a New Style by Drag-And-Drop</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154233" role="listitem" l10n="CHG" oldref="31">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154258" role="listitem" l10n="U" oldref="45">Click the icon of the style category that you want to create.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154851" role="listitem" l10n="U" oldref="32">Select at least one character, or object, in the style that you want to copy. For page and frame styles, select at least one character or object in the page or frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154871" role="listitem" l10n="CHG" oldref="33">Drag the character or object to the Styles and Formatting window and release.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">For paragraph and character styles, you can drag-and-drop onto the respective icon in the Styles and Formatting window. You do not need to open that style category in advance.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN107B5" role="note" l10n="NEW">You can also drag-and-drop a frame into the Styles and Formatting window to create a new frame style: Click the frame, wait a moment with the mouse button pressed down, but without moving the mouse, then drag to the Styles and Formatting window and drop the frame onto the Frame Styles icon.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+         <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
+         <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
+         <paragraph xml-lang="en-US" id="par_id3149988" role="paragraph" l10n="U" oldref="40"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/stylist_update.xhp b/helpcontent2/source/text/swriter/guide/stylist_update.xhp
index 946e175a72..e3c47986ef 100644
--- a/helpcontent2/source/text/swriter/guide/stylist_update.xhp
+++ b/helpcontent2/source/text/swriter/guide/stylist_update.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stylist_update.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,49 +29,47 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidestylist_updatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Updating Styles From Selections</title>
-<filename>/text/swriter/guide/stylist_update.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-31T12:44:46">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidestylist_updatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Updating Styles From Selections</title>
+         <filename>/text/swriter/guide/stylist_update.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155915"><bookmark_value>Stylist, see Styles and Formatting window</bookmark_value>
-<bookmark_value>styles; updating from selections</bookmark_value>
-<bookmark_value>templates; updating from selections</bookmark_value>
-<bookmark_value>Styles and Formatting window; updating from selections</bookmark_value>
-<bookmark_value>updating; styles, from selections</bookmark_value>
+      <bookmark_value>styles; updating from selections</bookmark_value>
+      <bookmark_value>templates; updating from selections</bookmark_value>
+      <bookmark_value>Styles and Formatting window; updating from selections</bookmark_value>
+      <bookmark_value>updating; styles, from selections</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155915" xml-lang="en-US" level="1" l10n="U" oldref="38"><variable id="stylist_update"><link href="text/swriter/guide/stylist_update.xhp" name="Updating Styles From Selections">Updating Styles From Selections</link>
+<paragraph xml-lang="en-US" id="hd_id3155915" role="heading" level="1" l10n="U"
+                 oldref="38"><variable id="stylist_update"><link href="text/swriter/guide/stylist_update.xhp" name="Updating Styles From Selections">Updating Styles From Selections</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149838" xml-lang="en-US" l10n="CHG" oldref="40">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156107" xml-lang="en-US" l10n="CHG" oldref="47">Click the icon of the style category that you want to update.<comment>UFI: use "category" for consistent wording, see #i21144#</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="41">In the document, click where you want to copy the updated style from. For example, click a paragraph that you applied manual formatting to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153402" xml-lang="en-US" l10n="CHG" oldref="42">In the Styles and Formatting window, click the style that you want to update.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153119" xml-lang="en-US" l10n="CHG" oldref="43">Click the arrow next to the <emph>New Style from Selection</emph> icon and choose <emph>Update Style</emph> from the submenu.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
-<embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
-<paragraph role="paragraph" id="par_id3155498" xml-lang="en-US" l10n="U" oldref="45"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
-</section>
-</body>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149838" role="listitem" l10n="CHG" oldref="40">Choose <emph>Format - Styles and Formatting</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156107" role="listitem" l10n="CHG" oldref="47">Click the icon of the style category that you want to update.<comment>UFI: use "category" for consistent wording, see #i21144#</comment></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149283" role="listitem" l10n="CHG" oldref="41">In the document, click from where you want to copy the updated style. For example, click a paragraph to which you applied some manual formatting that you want to copy now.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153402" role="listitem" l10n="CHG" oldref="42">In the Styles and Formatting window, click the style that you want to update.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153119" role="listitem" l10n="CHG" oldref="43">Click the arrow next to the <emph>New Style from Selection</emph> icon and choose <emph>Update Style</emph> from the submenu.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id0310200910360780" role="note" l10n="NEW">Only the manually formatted attributes of the text at the cursor position in the document will be added to the style that is selected in the Styles and Formatting window. Any attributes that were applied as part of a style will not be added to the updated style.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+         <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
+         <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
+         <paragraph xml-lang="en-US" id="par_id3155498" role="paragraph" l10n="U" oldref="45"><link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link></paragraph>
+      </section>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/subscript.xhp b/helpcontent2/source/text/swriter/guide/subscript.xhp
index 0876d40586..6825b72ced 100755
--- a/helpcontent2/source/text/swriter/guide/subscript.xhp
+++ b/helpcontent2/source/text/swriter/guide/subscript.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subscript.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,45 +27,35 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidesubscriptxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Making Text Superscript or Subscript</title>
-<filename>/text/swriter/guide/subscript.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T11:44:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidesubscriptxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Making Text Superscript or Subscript</title>
+         <filename>/text/swriter/guide/subscript.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155174"><bookmark_value>text; subscript and superscript</bookmark_value>
-<bookmark_value>superscript text</bookmark_value>
-<bookmark_value>subscript text</bookmark_value>
-<bookmark_value>characters;subscript and superscript</bookmark_value>
+      <bookmark_value>superscript text</bookmark_value>
+      <bookmark_value>subscript text</bookmark_value>
+      <bookmark_value>characters;subscript and superscript</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155174" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="subscript"><link href="text/swriter/guide/subscript.xhp" name="Making Text Superscript or Subscript">Making Text Superscript or Subscript</link>
+<paragraph xml-lang="en-US" id="hd_id3155174" role="heading" level="1" l10n="U" oldref="1"><variable id="subscript"><link href="text/swriter/guide/subscript.xhp" name="Making Text Superscript or Subscript">Making Text Superscript or Subscript</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155917" xml-lang="en-US" l10n="U" oldref="2">Select the text that you want to make superscript or subscript.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155865" xml-lang="en-US" l10n="U" oldref="28">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Character - Position</emph>, and then select <emph>Superscript</emph> or <emph>Subscript</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156111" xml-lang="en-US" l10n="U" oldref="3">Press Ctrl+Shift+P to make the text superscript, and Ctrl+Shift+B to make the text subscript.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153416" xml-lang="en-US" l10n="U" oldref="26"><link href="text/shared/01/05020500.xhp" name="Format - Character - Position">Format - Character - Position</link></paragraph>
-<paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="U" oldref="27"><link href="text/shared/01/06040200.xhp" name="Tools - AutoCorrect - Replace">Tools - AutoCorrect - Replace</link></paragraph>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155917" role="listitem" l10n="U" oldref="2">Select the text that you want to make superscript or subscript.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155865" role="listitem" l10n="U" oldref="28">Do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3153416" role="paragraph" l10n="U" oldref="26"><link href="text/shared/01/05020500.xhp" name="Format - Character - Position">Format - Character - Position</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154705" role="paragraph" l10n="U" oldref="27"><link href="text/shared/01/06040200.xhp" name="Tools - AutoCorrect - Replace">Tools - AutoCorrect - Replace</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp b/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp
index 80cfdcb74c..3327589a41 100644
--- a/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_cellmerge.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_cellmerge.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,44 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidetable_cellmergexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Merging and Splitting Cells</title>
-<filename>/text/swriter/guide/table_cellmerge.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetable_cellmergexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Merging and Splitting Cells</title>
+         <filename>/text/swriter/guide/table_cellmerge.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147240"><bookmark_value>cells; merging/splitting</bookmark_value>
-<bookmark_value>tables; merging cells</bookmark_value>
-<bookmark_value>cell merges</bookmark_value>
-<bookmark_value>splitting cells;by menu command</bookmark_value>
-<bookmark_value>merging;cells</bookmark_value>
-</bookmark>
-<comment>mw made "cell merges;" a one level entry</comment>
-<paragraph role="heading" id="hd_id6618243" xml-lang="en-US" level="1" l10n="NEW">
-<variable id="table_cellmerge"><link href="text/swriter/guide/table_cellmerge.xhp" name="Merging and Splitting Cells">Merging and Splitting Cells</link>
+      <bookmark_value>tables; merging cells</bookmark_value>
+      <bookmark_value>cell merges</bookmark_value>
+      <bookmark_value>splitting cells;by menu command</bookmark_value>
+      <bookmark_value>merging;cells</bookmark_value>
+</bookmark><comment>mw made "cell merges;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id6618243" role="heading" level="1" l10n="NEW"><variable id="table_cellmerge"><link href="text/swriter/guide/table_cellmerge.xhp" name="Merging and Splitting Cells">Merging and Splitting Cells</link>
 </variable><comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></paragraph>
-<paragraph role="paragraph" id="par_id1211890" xml-lang="en-US" l10n="NEW">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell and divide it into individual cells.</paragraph>
-<paragraph role="heading" id="hd_id3463850" xml-lang="en-US" level="2" l10n="NEW">Merging Cells</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id5708792" xml-lang="en-US" l10n="NEW">Select the adjacent cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id6301461" xml-lang="en-US" l10n="NEW">Choose <emph>Table - Merge Cells</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9156468" xml-lang="en-US" level="2" l10n="NEW">Splitting Cells</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3415936" xml-lang="en-US" l10n="NEW">Place the cursor in the cell to be split.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id4044312" xml-lang="en-US" l10n="NEW">Choose <emph>Table - Split Cells</emph>.</paragraph>
-<paragraph role="listitem" id="par_id634174" xml-lang="en-US" l10n="NEW">A dialog allows you to split the cell into two or more cells, horizontally or vertically.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id1211890" role="paragraph" l10n="NEW">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell and divide it into individual cells.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3463850" role="heading" level="2" l10n="NEW">To Merge Cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5708792" role="listitem" l10n="NEW">Select the adjacent cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6301461" role="listitem" l10n="NEW">Choose <emph>Table - Merge Cells</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id9156468" role="heading" level="2" l10n="NEW">To Split Cells</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3415936" role="listitem" l10n="NEW">Place the cursor in the cell to be split.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4044312" role="listitem" l10n="NEW">Choose <emph>Table - Split Cells</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id634174" role="listitem" l10n="NEW">A dialog allows you to split the cell into two or more cells, horizontally or vertically.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_cells.xhp b/helpcontent2/source/text/swriter/guide/table_cells.xhp
index 44b28ea6b7..84b8d9ef40 100755
--- a/helpcontent2/source/text/swriter/guide/table_cells.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_cells.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_cells.xhp,v $
- * $Revision: 1.13.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,55 +29,59 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidetable_cellsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding or Deleting a Row or Column to a Table Using the Keyboard</title>
-<filename>/text/swriter/guide/table_cells.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguidetable_cellsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding or Deleting a Row or Column to a Table Using the Keyboard</title>
+         <filename>/text/swriter/guide/table_cells.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156377"><bookmark_value>rows; inserting/deleting in tables by keyboard</bookmark_value>
-<bookmark_value>columns; inserting/deleting in tables by keyboard</bookmark_value>
-<bookmark_value>tables; editing by keyboard</bookmark_value>
-<bookmark_value>keyboard;adding or deleting rows/columns</bookmark_value>
-<bookmark_value>splitting cells;by keyboard</bookmark_value>
-<bookmark_value>merging;cells, by keyboard</bookmark_value>
-<bookmark_value>deleting;rows/columns, by keyboard</bookmark_value>
-<bookmark_value>inserting;rows/columns, by keyboard</bookmark_value>
-</bookmark>
-  <comment>MW changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3156377" role="heading" level="1" l10n="U" oldref="22"><variable id="table_cells"><link href="text/swriter/guide/table_cells.xhp" name="Adding or Deleting a Row or Column to a Table Using the Keyboard">Adding or Deleting a Row or Column to a Table Using the Keyboard</link> 
+      <bookmark_value>columns; inserting/deleting in tables by keyboard</bookmark_value>
+      <bookmark_value>tables; editing by keyboard</bookmark_value>
+      <bookmark_value>keyboard;adding or deleting rows/columns</bookmark_value>
+      <bookmark_value>splitting cells;by keyboard</bookmark_value>
+      <bookmark_value>merging;cells, by keyboard</bookmark_value>
+      <bookmark_value>deleting;rows/columns, by keyboard</bookmark_value>
+      <bookmark_value>inserting;rows/columns, by keyboard</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156377" role="heading" level="1" l10n="U"
+                 oldref="22"><variable id="table_cells"><link href="text/swriter/guide/table_cells.xhp" name="Adding or Deleting a Row or Column to a Table Using the Keyboard">Adding or Deleting a Row or Column to a Table Using the Keyboard</link>
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149487" role="paragraph" l10n="U" oldref="27">You can add or delete rows or columns in table as well as split or merge table cells using the keyboard.</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155906" role="listitem" l10n="U" oldref="28">To insert a new row in a table, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the up or down arrow key. You can also move the cursor to the last cell in the table, and then press Tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="25">To insert a new column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the left or right arrow key.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3156096" role="listitem" l10n="U" oldref="29">To split a table cell instead of adding a column, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you press the left or right arrow key.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153408" role="listitem" l10n="U" oldref="26">To delete a row, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the up or down arrow key.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149626" role="listitem" l10n="U" oldref="30">To delete a column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the left or the right arrow key.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="31">To merge a table into an adjacent cell, place the cursor in the cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key.</paragraph>
-   </listitem>
-  </list>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
-  <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-  <embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149487" role="paragraph" l10n="U" oldref="27">You can add or delete rows or columns in tables as well as split or merge table cells using the keyboard.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155906" role="listitem" l10n="U" oldref="28">To insert a new row in a table, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the up or down arrow key. You can also move the cursor to the last cell in the table, and then press Tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="25">To insert a new column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the left or right arrow key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156096" role="listitem" l10n="U" oldref="29">To split a table cell instead of adding a column, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you press the left or right arrow key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153408" role="listitem" l10n="U" oldref="26">To delete a row, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the up or down arrow key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149626" role="listitem" l10n="U" oldref="30">To delete a column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the left or the right arrow key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="31">To merge a table into an adjacent cell, place the cursor in the cell, press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
+      <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+      <embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_delete.xhp b/helpcontent2/source/text/swriter/guide/table_delete.xhp
index 8ea49b888f..529bf9dc87 100755
--- a/helpcontent2/source/text/swriter/guide/table_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_delete.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_delete.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,36 +27,34 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetable_deletexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Deleting Tables or the Contents of a Table</title>
-<filename>/text/swriter/guide/table_delete.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T11:57:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetable_deletexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Deleting Tables or the Contents of a Table</title>
+         <filename>/text/swriter/guide/table_delete.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149489"><bookmark_value>deleting; tables or table contents</bookmark_value>
-<bookmark_value>tables; deleting</bookmark_value>
+      <bookmark_value>tables; deleting</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149489" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="table_delete"><link href="text/swriter/guide/table_delete.xhp" name="Deleting Tables or the Contents of a Table">Deleting Tables or the Contents of a Table</link>
+<paragraph xml-lang="en-US" id="hd_id3149489" role="heading" level="1" l10n="U" oldref="1"><variable id="table_delete"><link href="text/swriter/guide/table_delete.xhp" name="Deleting Tables or the Contents of a Table">Deleting Tables or the Contents of a Table</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="2">You can delete a table from your document, or delete the contents of the table.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="CHG" oldref="5">To delete a whole table, click in the table, and then choose <emph>Table - Delete - Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="CHG" oldref="6">To delete the contents of a table, click in the table, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A <comment>UFI: Ctrl+A once is not enough</comment>until all cells are selected, and then press Delete or Backspace.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/table_insert.xhp#table_insert"/>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155918" role="paragraph" l10n="U" oldref="2">You can delete a table from your document, or delete the contents of the table.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155863" role="paragraph" l10n="CHG" oldref="5">To delete a whole table, click in the table, and then choose <emph>Table - Delete - Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="CHG" oldref="6">To delete the contents of a table, click in the table, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A <comment>UFI: Ctrl+A once is not enough</comment>until all cells are selected, and then press Delete or Backspace.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/table_insert.xhp#table_insert"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_insert.xhp b/helpcontent2/source/text/swriter/guide/table_insert.xhp
index 7339607a94..8b519ca824 100755
--- a/helpcontent2/source/text/swriter/guide/table_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_insert.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_insert.xhp,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,169 +29,163 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetable_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Tables</title>
-<filename>/text/swriter/guide/table_insert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-18T11:04:02">converted from old format - fpe
-checked - yj</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetable_insertxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting Tables</title>
+         <filename>/text/swriter/guide/table_insert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156377"><bookmark_value>tables; inserting text tables</bookmark_value>
-<bookmark_value>inserting; tables in text</bookmark_value>
-<bookmark_value>DDE; inserting tables</bookmark_value>
-<bookmark_value>OLE objects; inserting tables in</bookmark_value>
-<bookmark_value>cells;inserting from spreadsheets</bookmark_value>
-<bookmark_value>tables in spreadsheets;inserting in text</bookmark_value>
-<bookmark_value>spreadsheets;inserting tables from</bookmark_value>
+      <bookmark_value>inserting; tables in text</bookmark_value>
+      <bookmark_value>DDE; inserting tables</bookmark_value>
+      <bookmark_value>OLE objects; inserting tables in</bookmark_value>
+      <bookmark_value>cells;inserting from spreadsheets</bookmark_value>
+      <bookmark_value>tables in spreadsheets;inserting in text</bookmark_value>
+      <bookmark_value>spreadsheets;inserting tables from</bookmark_value>
 </bookmark><comment>mw changed "cell ranges;" to "cells;"</comment>
-<paragraph role="heading" id="hd_id3156377" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="table_insert"><link href="text/swriter/guide/table_insert.xhp" name="Inserting Tables">Inserting Tables</link>
+<paragraph xml-lang="en-US" id="hd_id3156377" role="heading" level="1" l10n="U"
+                 oldref="31"><variable id="table_insert"><link href="text/swriter/guide/table_insert.xhp" name="Inserting Tables">Inserting Tables</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149489" xml-lang="en-US" l10n="CHG" oldref="32">There are several ways to create a table in a text document. You can insert a table from a toolbar, through a menu command, or from a spreadsheet. <comment>UFI: from a database?</comment></paragraph>
-<paragraph role="heading" id="hd_id3155908" xml-lang="en-US" level="2" l10n="U" oldref="33">To insert a table from the Insert toolbar</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155861" xml-lang="en-US" l10n="U" oldref="34">Place the cursor in your document where you want to insert the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147416" xml-lang="en-US" l10n="CHG" oldref="28">On the <emph>Standard</emph> bar, click the arrow next to the <emph>Table</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153398" xml-lang="en-US" l10n="U" oldref="29">In the table grid, drag to select the numbers of rows and columns that you want, and then release.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153416" xml-lang="en-US" l10n="CHG" oldref="30">To cancel, drag to the other side until <emph>Cancel</emph> appears in the preview area of the grid.<comment>make it RTL compliant</comment></paragraph>
-<paragraph role="heading" id="hd_id3153135" xml-lang="en-US" level="2" l10n="U" oldref="35">To insert a table with a menu command</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149642" xml-lang="en-US" l10n="U" oldref="36">Place the cursor in your document where you want to insert the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149609" xml-lang="en-US" l10n="CHG" oldref="37">Choose <emph>Table - Insert - Table</emph>. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149858" xml-lang="en-US" l10n="U" oldref="66">In the <emph>Size</emph> area, enter the number of rows and columns.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145097" xml-lang="en-US" l10n="U" oldref="67">Select the options that you want, click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149572" xml-lang="en-US" level="2" l10n="CHG" oldref="43">Inserting a Table From a Calc Spreadsheet</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149594" xml-lang="en-US" l10n="U" oldref="44">Open the $[officename] Calc spreadsheet containing the cell range that you want to insert.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156250" xml-lang="en-US" l10n="U" oldref="45">In the spreadsheet, drag to select the cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154395" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Edit - Copy</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154420" xml-lang="en-US" l10n="U" oldref="46">In your text document, do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153383" xml-lang="en-US" l10n="U" oldref="47">Choose <emph>Edit - Paste</emph>. The cell range is pasted as an OLE object. To edit the contents of the cells, double-click the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154248" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Edit - Paste Special</emph>, and choose from the following options:</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3152755">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="49">Options</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154867" xml-lang="en-US" l10n="U" oldref="50">Is inserted as...</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155893" xml-lang="en-US" l10n="U" oldref="51">$[officename] $[officeversion] Spreadsheet</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149986" xml-lang="en-US" l10n="U" oldref="52">OLE object - as with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V or drag-and-drop</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="53">GDIMetaFile</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148697" xml-lang="en-US" l10n="U" oldref="54">Graphic</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153027" xml-lang="en-US" l10n="U" oldref="55">Bitmap</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148957" xml-lang="en-US" l10n="U" oldref="56">Graphic</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147104" xml-lang="en-US" l10n="U" oldref="57">HTML</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147126" xml-lang="en-US" l10n="U" oldref="58">HTML table</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150223" xml-lang="en-US" l10n="U" oldref="59">Unformatted text</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150246" xml-lang="en-US" l10n="U" oldref="60">Text only, tab stops as separators</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145227" xml-lang="en-US" l10n="U" oldref="61">Formatted text [RTF]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150938" xml-lang="en-US" l10n="U" oldref="62">Text table</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150965" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="WIN">DDE link (only under Windows) 
+      <paragraph xml-lang="en-US" id="par_id3149489" role="paragraph" l10n="CHG" oldref="32">There are several ways to create a table in a text document. You can insert a table from a toolbar, through a menu command, or from a spreadsheet. <comment>UFI: from a database?</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155908" role="heading" level="2" l10n="U"
+                 oldref="33">To Insert a Table From the Insert Toolbar</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="34">Place the cursor in your document where you want to insert the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147416" role="listitem" l10n="CHG" oldref="28">On the <emph>Standard</emph> bar, click the arrow next to the <emph>Table</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153398" role="listitem" l10n="U" oldref="29">In the table grid, drag to select the numbers of rows and columns that you want, and then release.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153416" role="paragraph" l10n="CHG" oldref="30">To cancel, drag to the other side until <emph>Cancel</emph> appears in the preview area of the grid.<comment>make it RTL compliant</comment></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153135" role="heading" level="2" l10n="U"
+                 oldref="35">To Insert a Table With a Menu Command</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149642" role="listitem" l10n="U" oldref="36">Place the cursor in your document where you want to insert the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149609" role="listitem" l10n="CHG" oldref="37">Choose <emph>Table - Insert - Table</emph>. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149858" role="listitem" l10n="U" oldref="66">In the <emph>Size</emph> area, enter the number of rows and columns.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145097" role="listitem" l10n="U" oldref="67">Select the options that you want, click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149572" role="heading" level="2" l10n="CHG"
+                 oldref="43">To Insert a Table From a Calc Spreadsheet</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149594" role="listitem" l10n="U" oldref="44">Open the $[officename] Calc spreadsheet containing the cell range that you want to insert.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156250" role="listitem" l10n="U" oldref="45">In the spreadsheet, drag to select the cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154395" role="listitem" l10n="U" oldref="68">Choose <emph>Edit - Copy</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154420" role="listitem" l10n="U" oldref="46">In your text document, do one of the following:</paragraph>
+         </listitem>
+      </list>
+      <list type="unordered"/>
+      <table id="tbl_id3152755">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154844" role="tablehead" l10n="U" oldref="49">Options</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154867" role="tablehead" l10n="U" oldref="50">Is inserted as...</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155893" role="tablecontent" l10n="U" oldref="51">$[officename] $[officeversion] Spreadsheet</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149986" role="tablecontent" l10n="U" oldref="52">OLE object - as with <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V or drag-and-drop</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148674" role="tablecontent" l10n="U" oldref="53">GDIMetaFile</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148697" role="tablecontent" l10n="U" oldref="54">Graphic</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153027" role="tablecontent" l10n="U" oldref="55">Bitmap</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148957" role="tablecontent" l10n="U" oldref="56">Graphic</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147104" role="tablecontent" l10n="U" oldref="57">HTML</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147126" role="tablecontent" l10n="U" oldref="58">HTML table</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150223" role="tablecontent" l10n="U" oldref="59">Unformatted text</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150246" role="tablecontent" l10n="U" oldref="60">Text only, tab stops as separators</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145227" role="tablecontent" l10n="U" oldref="61">Formatted text [RTF]</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150938" role="tablecontent" l10n="U" oldref="62">Text table</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150965" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="WIN">DDE link (only under Windows) 
 </caseinline></switchinline></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154377" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="WIN">Table structure and contents, without formatting. With updating 
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154377" role="tablecontent" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="WIN">Table structure and contents, without formatting. With updating 
 </caseinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3151093" xml-lang="en-US" level="3" l10n="CHG" oldref="38">Drag-and-Drop a Cell Range From a Calc Spreadsheet</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="39">Open the $[officename] Calc spreadsheet containing the cell range that you want to insert.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150515" xml-lang="en-US" l10n="U" oldref="69">In the spreadsheet, drag to select the cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150534" xml-lang="en-US" l10n="CHG" oldref="40">Click and hold the mouse button in the selected cells.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147527" xml-lang="en-US" l10n="U" oldref="41">Drag the selected cells into the text document.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/table_select.xhp#table_select"/>
-<embed href="text/swriter/guide/table_delete.xhp#table_delete"/>
-<embed href="text/swriter/guide/borders.xhp#borders"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id3151093" role="heading" level="3" l10n="CHG"
+                 oldref="38">Drag-and-Drop a Cell Range From a Calc Spreadsheet</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3151116" role="listitem" l10n="U" oldref="39">Open the $[officename] Calc spreadsheet containing the cell range that you want to insert.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150515" role="listitem" l10n="U" oldref="69">In the spreadsheet, drag to select the cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150534" role="listitem" l10n="CHG" oldref="40">Click and hold the mouse button in the selected cells.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147527" role="listitem" l10n="U" oldref="41">Drag the selected cells into the text document.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/table_select.xhp#table_select"/>
+      <embed href="text/swriter/guide/table_delete.xhp#table_delete"/>
+      <embed href="text/swriter/guide/borders.xhp#borders"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp b/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
index f1660d8105..acb03f2dd7 100755
--- a/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_repeat_multiple_headers.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,43 +29,44 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetable_repeat_multiple_headersxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Repeating a Table Header on a New Page</title>
-<filename>/text/swriter/guide/table_repeat_multiple_headers.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T13:27:50">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetable_repeat_multiple_headersxml" indexer="include"
+             status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Repeating a Table Header on a New Page</title>
+         <filename>/text/swriter/guide/table_repeat_multiple_headers.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155870"><bookmark_value>tables; heading repetition after page breaks</bookmark_value>
-<bookmark_value>repeating; table headings after page breaks</bookmark_value>
-<bookmark_value>headings; repeating in tables</bookmark_value>
-</bookmark><comment>MW made "table heading repetition..." a two level entry and changed "headers;" to "headings:"</comment>
-<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="E" oldref="5" localize="false"/>
-<paragraph role="heading" id="hd_id3153406" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="table_repeat_multiple_headers"><link href="text/swriter/guide/table_repeat_multiple_headers.xhp" name="Repeating a Table Header on a New Page">Repeating a Table Heading on a New Page</link>
+      <bookmark_value>repeating; table headings after page breaks</bookmark_value>
+      <bookmark_value>headings; repeating in tables</bookmark_value>
+      <bookmark_value>multi-page tables</bookmark_value>
+</bookmark><comment>MW made "table heading repetition..." a two level entry and changed "headers;" to "headings:"</comment><comment>mw added "multi-page tables"</comment>
+<paragraph xml-lang="en-US" id="par_id3155870" role="paragraph" l10n="E" oldref="5"
+                 localize="false"/>
+      <paragraph xml-lang="en-US" id="hd_id3153406" role="heading" level="1" l10n="U" oldref="6"><variable id="table_repeat_multiple_headers"><link href="text/swriter/guide/table_repeat_multiple_headers.xhp" name="Repeating a Table Header on a New Page">Repeating a Table Heading on a New Page</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149636" xml-lang="en-US" l10n="U" oldref="7">You can repeat a table heading on each new page that the table spans.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145098" xml-lang="en-US" l10n="CHG" oldref="8">Choose <emph>Table - Insert - Table</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="CHG" oldref="9">Select the <emph>Heading </emph>and the <emph>Repeat heading </emph>check boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153376" xml-lang="en-US" l10n="U" oldref="10">Select the number of rows and columns for the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153393" xml-lang="en-US" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
-<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149636" role="paragraph" l10n="U" oldref="7">You can repeat a table heading on each new page that the table spans.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145098" role="listitem" l10n="CHG" oldref="8">Choose <emph>Table - Insert - Table</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156240" role="listitem" l10n="CHG" oldref="9">Select the <item type="menuitem">Heading</item>
+               <emph/>and the <item type="menuitem">Repeat heading</item>
+               <emph/>check boxes.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153376" role="listitem" l10n="U" oldref="10">Select the number of rows and columns for the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153393" role="listitem" l10n="U" oldref="11">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
+      <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/table_select.xhp b/helpcontent2/source/text/swriter/guide/table_select.xhp
index 113f7ee0be..6dfb74cf0e 100644
--- a/helpcontent2/source/text/swriter/guide/table_select.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_select.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_select.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
index b0b0b94325..296bc3fc34 100644
--- a/helpcontent2/source/text/swriter/guide/table_sizing.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table_sizing.xhp,v $
- * $Revision: 1.14.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,93 +32,90 @@
  
 	
 <meta>
-<topic id="textswriterguidetable_sizingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Resizing Rows and Columns in a Text Table </title>
-<filename>/text/swriter/guide/table_sizing.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetable_sizingxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Resizing Rows and Columns in a Text Table </title>
+         <filename>/text/swriter/guide/table_sizing.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156108"><bookmark_value>cells; enlarging and reducing in text tables</bookmark_value>
-<bookmark_value>table cells; enlarging/reducing in text</bookmark_value>
-<bookmark_value>keyboard; resizing rows/columns</bookmark_value>
-<bookmark_value>resizing;rows and columns in text tables</bookmark_value>
-<bookmark_value>enlarging columns,cells and table rows</bookmark_value>
-<bookmark_value>reducing rows and columns in text tables</bookmark_value>
-<bookmark_value>tables; resizing</bookmark_value>
-</bookmark><comment>UFI: added "tables;sizing" here, deleted it in swriter/01/050901. Added "tables;arranging"</comment><comment>mw deleted "text tables;enlarging cells",  "tables;changing the size", "tables;arranging" and "arranging;tables". MW changed "tables;sizing" and "table cells;". MW added "reducing rows and columns in text tables"</comment>
-<paragraph role="heading" id="hd_id3156108" xml-lang="en-US" level="1" l10n="CHG" oldref="12"><variable id="table_sizing"><link href="text/swriter/guide/table_sizing.xhp" name="Resizing Rows and Columns in a Text Table">Resizing Rows and Columns in a Text Table</link>
+      <bookmark_value>table cells; enlarging/reducing in text</bookmark_value>
+      <bookmark_value>keyboard; resizing rows/columns</bookmark_value>
+      <bookmark_value>resizing;rows and columns in text tables</bookmark_value>
+      <bookmark_value>enlarging columns,cells and table rows</bookmark_value>
+      <bookmark_value>reducing rows and columns in text tables</bookmark_value>
+      <bookmark_value>tables; resizing/juxtaposing</bookmark_value>
+      <bookmark_value>juxtaposing tables</bookmark_value>
+</bookmark><comment>mw deleted "text tables;enlarging cells",  "tables;changing the size", "tables;arranging" and "arranging;tables". MW changed "tables;sizing" and "table cells;". MW added "reducing rows and columns in text tables"</comment><comment>MW changed "tables;" and added "juxtaposing tables"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156108" role="heading" level="1" l10n="CHG"
+                 oldref="12"><variable id="table_sizing"><link href="text/swriter/guide/table_sizing.xhp" name="Resizing Rows and Columns in a Text Table">Resizing Rows and Columns in a Text Table</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="13">You can resize the width of table cells and columns, as well as change the height of table rows.</paragraph>
 <table id="tbl_id3149640">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149615" xml-lang="en-US" l10n="E">
-<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149622" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149622" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146497" xml-lang="en-US" l10n="U" oldref="22">You can also distribute rows and columns evenly using the icons on the <emph>Optimize</emph> toolbar on the <emph>Table Bar</emph>.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3146497" role="paragraph" l10n="U" oldref="22">You can also distribute rows and columns evenly using the icons on the <item type="menuitem">Optimize</item> toolbar on the <item type="menuitem">Table</item>
+                  <emph/>Bar.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<paragraph role="heading" id="hd_id3145109" xml-lang="en-US" level="2" l10n="U" oldref="24">Changing the Width of Columns and Cells</paragraph>
-<paragraph role="heading" id="hd_id3149574" xml-lang="en-US" level="3" l10n="U" oldref="25">To change the width of a column:</paragraph>
-<paragraph role="paragraph" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="26">Do one of the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156246" xml-lang="en-US" l10n="U" oldref="21">Rest the mouse pointer over the column dividing line until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145390" xml-lang="en-US" l10n="U" oldref="27">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id0918200811260957" xml-lang="en-US" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or below the line.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="14">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+      <paragraph xml-lang="en-US" id="hd_id3145109" role="heading" level="2" l10n="U"
+                 oldref="24">Changing the Width of Columns and Cells</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149574" role="heading" level="3" l10n="U"
+                 oldref="25">To Change the Width of a Column</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149587" role="paragraph" l10n="U" oldref="26">Do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156246" role="listitem" l10n="U" oldref="21">Rest the mouse pointer over the column dividing line until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145390" role="listitem" l10n="U" oldref="27">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id0918200811260957" role="listitem" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or above the line proportionally.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145411" role="listitem" l10n="U" oldref="14">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the left or the right arrow key.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="28">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153364" role="listitem" l10n="U" oldref="28">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3155891" xml-lang="en-US" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
-<paragraph role="heading" id="hd_id3149993" xml-lang="en-US" level="3" l10n="U" oldref="30">To change the width of a cell:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3155891" role="note" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149993" role="heading" level="3" l10n="U"
+                 oldref="30">To Change the Width of a Cell</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148676" role="listitem" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command
 </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153014" xml-lang="en-US" level="2" l10n="U" oldref="32">Changing the Height of a Row</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153035" xml-lang="en-US" l10n="U" oldref="33">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+      <paragraph xml-lang="en-US" id="hd_id3153014" role="heading" level="2" l10n="U"
+                 oldref="32">Changing the Height of a Row</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153035" role="listitem" l10n="U" oldref="33">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option
 </caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the up or the down arrow key.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id8478041" xml-lang="en-US" level="2" l10n="NEW">Resizing a whole Table</paragraph>
-<paragraph role="paragraph" id="par_id3358867" xml-lang="en-US" l10n="NEW">To change the width and height of a table, do one of the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5366679" xml-lang="en-US" l10n="NEW">Click inside the table. In the rulers, drag the border between the white and the gray area to resize the table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1279030" xml-lang="en-US" l10n="NEW">Click inside the table. Choose <item type="menuitem">Table - Table Properties</item> to open a dialog and set the properties to the numbers.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id5009308" xml-lang="en-US" l10n="NEW">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="hd_id8478041" role="heading" level="2" l10n="NEW">Resizing a Whole Table</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3358867" role="paragraph" l10n="NEW">To change the width and height of a table, do one of the following:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id5366679" role="paragraph" l10n="NEW">Click inside the table. In the rulers, drag the border between the white and the gray area to resize the table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1279030" role="paragraph" l10n="NEW">Click inside the table. Choose <item type="menuitem">Table - Table Properties</item> to open a dialog and set the properties to the numbers.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id5009308" role="tip" l10n="NEW">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A twice to select the whole table, then choose <emph>Insert - Frame</emph>.</paragraph>
-<paragraph role="note" id="par_id4190496" xml-lang="en-US" l10n="NEW">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
-<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
-<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
-<embed href="text/swriter/guide/ruler.xhp#ruler"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id4190496" role="note" l10n="NEW">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
+      <embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
+      <embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
+      <embed href="text/swriter/guide/ruler.xhp#ruler"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/tablemode.xhp b/helpcontent2/source/text/swriter/guide/tablemode.xhp
index f82c937ec0..1c04e98742 100755
--- a/helpcontent2/source/text/swriter/guide/tablemode.xhp
+++ b/helpcontent2/source/text/swriter/guide/tablemode.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablemode.xhp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,21 +27,16 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetablemodexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Modifying Rows and Columns by Keyboard</title>
-<filename>/text/swriter/guide/tablemode.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-20T12:16:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetablemodexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Modifying Rows and Columns by Keyboard</title>
+         <filename>/text/swriter/guide/tablemode.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155856"><bookmark_value>table mode selection</bookmark_value>
 <bookmark_value>proportional distribution of tables</bookmark_value>
 <bookmark_value>relative distribution of table cells</bookmark_value>
@@ -52,28 +45,24 @@
 <bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
 <bookmark_value>behavior of rows/columns</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155856" xml-lang="en-US" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149835" xml-lang="en-US" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <emph>Behavior of rows/columns</emph> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with <emph>Fixed</emph> row and column dimensions if space permits.</paragraph>
-<paragraph role="note" id="par_id7344279" xml-lang="en-US" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
-<paragraph role="paragraph" id="par_id3156110" xml-lang="en-US" l10n="U" oldref="8">To set the <emph>Behavior of rows/columns </emph>options for tables in text documents, choose <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph>, or use the <emph>Fixed</emph>, <emph>Fixed/Proportional</emph>, and <emph>Variable</emph> icons on the <emph>Table Bar</emph>. There are three display modes for tables:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="9">
-<emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149613" xml-lang="en-US" l10n="U" oldref="10">
-<emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149864" xml-lang="en-US" l10n="U" oldref="11">
-<emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
-<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
-</body>
+<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link></variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149835" role="paragraph" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <item type="menuitem">Behavior of rows/columns</item> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with fixed row and column dimensions if space permits.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item> Bar. There are three display modes for tables:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9"><emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10"><emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11"><emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+      <embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
+      <embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/template_create.xhp b/helpcontent2/source/text/swriter/guide/template_create.xhp
index 6bab9a5180..84fde465a8 100755
--- a/helpcontent2/source/text/swriter/guide/template_create.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_create.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: template_create.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,49 +27,51 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetemplate_createxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Creating a Document Template</title>
-<filename>/text/swriter/guide/template_create.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-10T10:46:48">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetemplate_createxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Creating a Document Template</title>
+         <filename>/text/swriter/guide/template_create.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149688"><bookmark_value>document templates</bookmark_value>
-<bookmark_value>templates; creating document templates</bookmark_value>
+      <bookmark_value>templates; creating document templates</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="1" l10n="U" oldref="62"><variable id="template_create"><link href="text/swriter/guide/template_create.xhp" name="Creating a Document Template">Creating a Document Template</link>
+<paragraph xml-lang="en-US" id="hd_id3149688" role="heading" level="1" l10n="U"
+                 oldref="62"><variable id="template_create"><link href="text/swriter/guide/template_create.xhp" name="Creating a Document Template">Creating a Document Template</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149492" xml-lang="en-US" l10n="U" oldref="63">You can create a template to use as the basis for creating new text documents.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="64">Create a document and add the content and formatting styles that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>File - Templates - Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="66">In the <emph>New Template </emph>box, type a name for the new template.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156098" xml-lang="en-US" l10n="U" oldref="70">Select a template category in the <emph>Categories </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149281" xml-lang="en-US" l10n="U" oldref="71">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153404" xml-lang="en-US" l10n="U" oldref="67">To create a document based on the template, choose<emph> File - New - Templates and Documents</emph>, select the template, and then click<emph> Open</emph>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/template_default.xhp#template_default"/>
-<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
-<paragraph role="paragraph" id="par_id3149636" xml-lang="en-US" l10n="U" oldref="68"><link href="text/shared/01/01110300.xhp" name="File - Templates - Save">File - Templates - Save</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149492" role="paragraph" l10n="U" oldref="63">You can create a template to use as the basis for creating new text documents.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155915" role="listitem" l10n="U" oldref="64">Create a document and add the content and formatting styles that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147422" role="listitem" l10n="U" oldref="65">Choose <emph>File - Templates - Save</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149829" role="listitem" l10n="U" oldref="66">In the <item type="menuitem">New Template</item>
+               <emph/>box, type a name for the new template.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156098" role="listitem" l10n="U" oldref="70">Select a template category in the <item type="menuitem">Categories</item>
+               <emph/>list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149281" role="listitem" l10n="U" oldref="71">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153404" role="paragraph" l10n="U" oldref="67">To create a document based on the template, choose<emph/>
+         <item type="menuitem">File - New - Templates and Documents</item>, select the template, and then click<emph/>
+         <item type="menuitem">Open</item>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+         <embed href="text/swriter/guide/template_default.xhp#template_default"/>
+         <embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
+         <paragraph xml-lang="en-US" id="par_id3149636" role="paragraph" l10n="U" oldref="68"><link href="text/shared/01/01110300.xhp" name="File - Templates - Save">File - Templates - Save</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/template_default.xhp b/helpcontent2/source/text/swriter/guide/template_default.xhp
index bfd1b47eb6..456f09d541 100755
--- a/helpcontent2/source/text/swriter/guide/template_default.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_default.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: template_default.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,68 +29,67 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetemplate_defaultxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Default Template</title>
-<filename>/text/swriter/guide/template_default.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T13:58:12">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155913"><bookmark_value>default templates; defining</bookmark_value>
-<bookmark_value>defaults; templates</bookmark_value>
-<bookmark_value>templates; default templates</bookmark_value>
-<bookmark_value>text documents;default templates</bookmark_value>
-</bookmark><comment>mw changed "text;" to "text documents;"</comment>
-<paragraph role="heading" id="hd_id3155913" xml-lang="en-US" level="1" l10n="U" oldref="28"><variable id="template_default"><link href="text/swriter/guide/template_default.xhp" name="Changing the Default Template">Changing the Default Template</link>
+      <topic id="textswriterguidetemplate_defaultxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing the Default Template</title>
+         <filename>/text/swriter/guide/template_default.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155913"><bookmark_value>default templates;defining/resetting</bookmark_value>
+      <bookmark_value>defaults; templates</bookmark_value>
+      <bookmark_value>templates; default templates</bookmark_value>
+      <bookmark_value>text documents;default templates</bookmark_value>
+</bookmark><comment>mw changed "text;" to "text documents;"</comment><comment>mw changed "default templates;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155913" role="heading" level="1" l10n="U"
+                 oldref="28"><variable id="template_default"><link href="text/swriter/guide/template_default.xhp" name="Changing the Default Template">Changing the Default Template</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145569" xml-lang="en-US" l10n="U" oldref="68">The default template contains the default formatting information for new text documents. If you want, you can create a new template and use it as the default template.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149838" xml-lang="en-US" l10n="U" oldref="102">Create a document and the content and formatting styles that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156101" xml-lang="en-US" l10n="U" oldref="113">Choose <emph>File - Templates - Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149283" xml-lang="en-US" l10n="U" oldref="106">In the <emph>New Template</emph> box, type a name for the new template.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153409" xml-lang="en-US" l10n="CHG" oldref="114">In the <emph>Categories </emph>list, select "My Templates", and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="107">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149952" xml-lang="en-US" l10n="CHG" oldref="108">In the category list, double-click the "My Templates" folder.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149970" xml-lang="en-US" l10n="U" oldref="105">Right-click the template that you created, and choose <emph>Set as Default Template</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149620" xml-lang="en-US" l10n="U" oldref="115">Click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149867" xml-lang="en-US" level="2" l10n="U" oldref="109">To reset the default template:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145102" xml-lang="en-US" l10n="U" oldref="110">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="111">Right-click a folder in the category list, choose<emph> Reset Default Template - Text Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156245" xml-lang="en-US" l10n="U" oldref="112">Click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/template_create.xhp#template_create"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/shared/guide/standard_template.xhp#standard_template"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145569" role="paragraph" l10n="U" oldref="68">The default template contains the default formatting information for new text documents. If you want, you can create a new template and use it as the default template.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6414990" role="heading" level="2" l10n="NEW">To Create a Default Template</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149838" role="listitem" l10n="U" oldref="102">Create a document and the content and formatting styles that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156101" role="listitem" l10n="U" oldref="113">Choose <emph>File - Templates - Save</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149283" role="listitem" l10n="U" oldref="106">In the <emph>New Template</emph> box, type a name for the new template.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153409" role="listitem" l10n="CHG" oldref="114">In the <item type="menuitem">Categories</item> list, select "My Templates", and then click <item type="menuitem">OK</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="107">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">In the <item type="menuitem">Templates</item> list, double-click the "My Templates" folder.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="105">Right-click the template that you created, and choose <emph>Set as Default Template</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149620" role="listitem" l10n="U" oldref="115">Click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149867" role="heading" level="2" l10n="U"
+                 oldref="109">To Reset the Default Template</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145102" role="listitem" l10n="U" oldref="110">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="111">Right-click a text file in any of the two lists, choose <item type="menuitem">Reset Default Template - Text Document</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156245" role="listitem" l10n="U" oldref="112">Click <emph>Close</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/template_create.xhp#template_create"/>
+      <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+      <embed href="text/shared/guide/standard_template.xhp#standard_template"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/templates_styles.xhp b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
index f64b26f08f..9dec673b75 100644
--- a/helpcontent2/source/text/swriter/guide/templates_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: templates_styles.xhp,v $
- * $Revision: 1.8.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,36 +32,37 @@
  
 	
 <meta>
-<topic id="textswriterguidetemplates_stylesxml" indexer="include">
-<title id="tit" xml-lang="en-US">Templates and Styles</title>
-<filename>/text/swriter/guide/templates_styles.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetemplates_stylesxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Templates and Styles</title>
+         <filename>/text/swriter/guide/templates_styles.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153396"><bookmark_value>formatting styles; styles and templates</bookmark_value>
-<bookmark_value>styles; styles and templates</bookmark_value>
-<bookmark_value>organizing; templates (guide)</bookmark_value>
-<bookmark_value>templates; organizing (guide)</bookmark_value>
+      <bookmark_value>styles; styles and templates</bookmark_value>
+      <bookmark_value>organizing; templates (guide)</bookmark_value>
+      <bookmark_value>templates; organizing (guide)</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153396" xml-lang="en-US" level="1" l10n="U" oldref="15"><variable id="templates_styles"><link href="text/swriter/guide/templates_styles.xhp" name="Templates and Styles">Templates and Styles</link>
+<paragraph xml-lang="en-US" id="hd_id3153396" role="heading" level="1" l10n="U"
+                 oldref="15"><variable id="templates_styles"><link href="text/swriter/guide/templates_styles.xhp" name="Templates and Styles">Templates and Styles</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, objects, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
-<paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="CHG" oldref="18">Unless you specify otherwise, every new $[officename] text document is based on the default template.</paragraph>
-<paragraph role="paragraph" id="par_id3149974" xml-lang="en-US" l10n="U" oldref="3">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph>
-<paragraph role="heading" id="hd_id3149613" xml-lang="en-US" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US" l10n="NEW">Use the <link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link> dialog to copy styles from one document to another.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153377" xml-lang="en-US" l10n="U" oldref="7">To copy a style, drag it to another template or document.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
-<embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
-<embed href="text/swriter/guide/template_default.xhp#template_default"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149635" role="paragraph" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, objects, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149957" role="paragraph" l10n="CHG" oldref="18">Unless you specify otherwise, every new $[officename] text document is based on the default template.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149974" role="paragraph" l10n="U" oldref="3">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149613" role="heading" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106B0" role="listitem" l10n="NEW">Use the <link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link> dialog to copy styles from one document to another.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153377" role="listitem" l10n="U" oldref="7">To copy a style, drag it to another template or document.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
+      <embed href="text/swriter/guide/change_header.xhp#change_header"/>
+      <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
+      <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
+      <embed href="text/swriter/guide/template_default.xhp#template_default"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_animation.xhp b/helpcontent2/source/text/swriter/guide/text_animation.xhp
index 5359247c8f..db7ff4bb14 100755
--- a/helpcontent2/source/text/swriter/guide/text_animation.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_animation.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_animation.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,35 +29,38 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguidetext_animationxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Animating Text</title>
-<filename>/text/swriter/guide/text_animation.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetext_animationxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Animating Text</title>
+         <filename>/text/swriter/guide/text_animation.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151182"><bookmark_value>text animation</bookmark_value>
-<bookmark_value>effects; text animation</bookmark_value>
-<bookmark_value>animations;text</bookmark_value>
-</bookmark><comment>mw made "animating text" a two level entry</comment><paragraph role="heading" id="hd_id3151182" xml-lang="en-US" level="1" l10n="U" oldref="17"><variable id="text_animation"><link href="text/swriter/guide/text_animation.xhp" name="Animating Text">Animating Text</link>
+      <bookmark_value>effects; text animation</bookmark_value>
+      <bookmark_value>animations;text</bookmark_value>
+</bookmark><comment>mw made "animating text" a two level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3151182" role="heading" level="1" l10n="U"
+                 oldref="17"><variable id="text_animation"><link href="text/swriter/guide/text_animation.xhp" name="Animating Text">Animating Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145080" xml-lang="en-US" l10n="CHG" oldref="18">You can only animate text that is contained in a drawing object, such as rectangles, lines, or text objects. For example, draw a rectangle, then double-click the rectangle and enter your text.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="19">Select the drawing object containing the text that you want to animate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155178" xml-lang="en-US" l10n="CHG" oldref="20">Choose <emph>Format - Object - Text Attributes</emph>, and then click the<emph> Text Animation</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="21">In the <emph>Effect </emph>box, select the animation that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="22">Set the properties of the effect, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3145080" role="paragraph" l10n="CHG" oldref="18">You can only animate text that is contained in a drawing object, such as rectangles, lines, or text objects. For example, draw a rectangle, then double-click the rectangle and enter your text.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149811" role="listitem" l10n="U" oldref="19">Select the drawing object containing the text that you want to animate.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155178" role="listitem" l10n="CHG" oldref="20">Choose <item type="menuitem">Format - Object - Text Attributes</item>, and then click the<emph/>
+               <item type="menuitem">Text Animation</item> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149819" role="listitem" l10n="U" oldref="21">In the <item type="menuitem">Effect</item>
+               <emph/>box, select the animation that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145786" role="listitem" l10n="U" oldref="22">Set the properties of the effect, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_capital.xhp b/helpcontent2/source/text/swriter/guide/text_capital.xhp
index 17deff376e..d5f4737585 100755
--- a/helpcontent2/source/text/swriter/guide/text_capital.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_capital.xhp
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 
-
-<!--***********************************************************************
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: text_capital.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,69 +27,54 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
 
 
-	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetext_capitalxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Case of Text</title>
-<filename>/text/swriter/guide/text_capital.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-10T12:42:31">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetext_capitalxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Changing the Case of Text</title>
+         <filename>/text/swriter/guide/text_capital.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155182"><bookmark_value>characters; uppercase or lowercase</bookmark_value>
-<bookmark_value>text; uppercase or lowercase</bookmark_value>
-<bookmark_value>lowercase letters; text</bookmark_value>
-<bookmark_value>uppercase; formatting text</bookmark_value>
-<bookmark_value>capital letters;changing to small letters</bookmark_value>
-<bookmark_value>changing;cases of text</bookmark_value>
-<bookmark_value>initial capitals in titles</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="text_capital"><link href="text/swriter/guide/text_capital.xhp" name="Changing the Case of Text">Changing the Case of Text</link>
+      <bookmark_value>text; uppercase or lowercase</bookmark_value>
+      <bookmark_value>lowercase letters; text</bookmark_value>
+      <bookmark_value>uppercase; formatting text</bookmark_value>
+      <bookmark_value>capital letters;changing to small letters</bookmark_value>
+      <bookmark_value>changing;cases of text</bookmark_value>
+      <bookmark_value>initial capitals in titles</bookmark_value>
+      <bookmark_value>small capitals (guide)</bookmark_value>
+</bookmark><comment>MW added "small capitals"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155182" role="heading" level="1" l10n="U" oldref="1"><variable id="text_capital"><link href="text/swriter/guide/text_capital.xhp" name="Changing the Case of Text">Changing the Case of Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155916" xml-lang="en-US" l10n="U" oldref="2">You can change the case of text, format text with small capitals, or capitalize the first letter of each word in a selection.</paragraph>
-<paragraph role="note" id="par_idN10728" xml-lang="en-US" l10n="NEW">When you apply a formatting to your text by <emph>Format - Character</emph>, the text stays the same, it is only displayed in another way. On the other hand, when you choose <emph>Format - Change Case</emph>, the text is permanently changed.</paragraph>
-<paragraph role="heading" id="hd_id3155861" xml-lang="en-US" level="2" l10n="U" oldref="8">To capitalize text:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147420" xml-lang="en-US" l10n="U" oldref="9">Select the text that you want to capitalize.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="10">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="6">Choose <emph>Format - Change Case - Uppercase</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153414" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Character</emph>, click the <emph>Font Effects</emph> tab, and then select the type of capitalization in the <emph>Effects</emph> box. "Capitals" capitalizes all of the letters in the selection. "Title" capitalizes the first letter of each word in the selection. "Small capitals" capitalizes every letter in the selection, but in a reduced font size.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149644" xml-lang="en-US" level="2" l10n="U" oldref="11">To change text to lowercase:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149964" xml-lang="en-US" l10n="U" oldref="12">Select the text that you want to change to lowercase.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149606" xml-lang="en-US" l10n="U" oldref="13">Do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149855" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Format - Change Case - Lowercase</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145093" xml-lang="en-US" l10n="U" oldref="5">Choose<emph> Format - Character</emph>, click the <emph>Font Effects</emph> tab, and then select "Lowercase" in the<emph> Effects</emph> box.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155916" role="paragraph" l10n="U" oldref="2">You can change the case of text, format text with small capitals, or capitalize the first letter of each word in a selection.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10728" role="note" l10n="NEW">When you apply a formatting to your text by <emph>Format - Character</emph>, the text stays the same, it is only displayed in another way. On the other hand, when you choose <emph>Format - Change Case</emph>, the text is permanently changed.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155861" role="heading" level="2" l10n="U" oldref="8">To Capitalize Text</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147420" role="listitem" l10n="U" oldref="9">Select the text that you want to capitalize.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149841" role="listitem" l10n="U" oldref="10">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1120200910485778" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Change Case - Uppercase</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1120200910485775" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Character</item>, click the Font Effects tab, then select the type of capitalization in the Effects box. "Capitals" capitalizes all letters. "Title" capitalizes the first letter of each word. "Small capitals" capitalizes all letters, but in a reduced font size.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149644" role="heading" level="2" l10n="U"
+                 oldref="11">To Change Text to Lowercase</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149964" role="listitem" l10n="U" oldref="12">Select the text that you want to change to lowercase.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149606" role="listitem" l10n="U" oldref="13">Do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id112020091049000" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Change Case - Lowercase</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id1120200910490034" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Character</item>, click the Font Effects tab, then select "Lowercase" in the Effects box.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_centervert.xhp b/helpcontent2/source/text/swriter/guide/text_centervert.xhp
index 45949dd945..f6f6287041 100644
--- a/helpcontent2/source/text/swriter/guide/text_centervert.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_centervert.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,42 +32,50 @@
  
 	
 <meta>
-<topic id="textswriterguidetext_centervertxml" indexer="include">
-<title id="tit" xml-lang="en-US">Using a Frame to Center Text on a Page</title>
-<filename>/text/swriter/guide/text_centervert.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetext_centervertxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Using a Frame to Center Text on a Page</title>
+         <filename>/text/swriter/guide/text_centervert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155177"><bookmark_value>text frames; centering on pages</bookmark_value>
-<bookmark_value>centering;text frames on pages</bookmark_value>
-<bookmark_value>title pages; centering text on</bookmark_value>
+      <bookmark_value>centering;text frames on pages</bookmark_value>
+      <bookmark_value>title pages; centering text on</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155177" xml-lang="en-US" level="1" l10n="U" oldref="94"><variable id="text_centervert"><link href="text/swriter/guide/text_centervert.xhp" name="Using a Frame to Center Text on a Page">Using a Frame to Center Text on a Page</link>
+<paragraph xml-lang="en-US" id="hd_id3155177" role="heading" level="1" l10n="U"
+                 oldref="94"><variable id="text_centervert"><link href="text/swriter/guide/text_centervert.xhp" name="Using a Frame to Center Text on a Page">Using a Frame to Center Text on a Page</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155920" xml-lang="en-US" l10n="U" oldref="78">Select the text that you want to center on the page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155868" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Insert - Frame</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152765" xml-lang="en-US" l10n="U" oldref="82">In the <emph>Anchor </emph>area, select <emph>To page</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149844" xml-lang="en-US" l10n="U" oldref="95">In the <emph>Size </emph>area, set the dimensions of the frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156114" xml-lang="en-US" l10n="U" oldref="96">In the <emph>Position </emph>area, select "Center" in the <emph>Horizontal </emph>and <emph>Vertical </emph>boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153410" xml-lang="en-US" l10n="U" oldref="97">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3149615" xml-lang="en-US" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <emph>Format - Frame/Object</emph>. Click the <emph>Borders</emph> tab, and then click in the<emph> Set No Border</emph> box in the<emph> Line Arrangement</emph> area.</paragraph>
-<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="83">To resize the frame, drag the edges of the frame.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
-<embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155920" role="listitem" l10n="U" oldref="78">Select the text that you want to center on the page.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155868" role="listitem" l10n="U" oldref="79">Choose <emph>Insert - Frame</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152765" role="listitem" l10n="U" oldref="82">In the <item type="menuitem">Anchor</item>
+               <emph/>area, select <item type="menuitem">To page</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149844" role="listitem" l10n="U" oldref="95">In the <item type="menuitem">Size</item>
+               <emph/>area, set the dimensions of the frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156114" role="listitem" l10n="U" oldref="96">In the <item type="menuitem">Position</item>
+               <emph/>area, select "Center" in the <item type="menuitem">Horizontal</item>
+               <emph/>and <item type="menuitem">Vertical</item>
+               <emph/>boxes.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153410" role="listitem" l10n="U" oldref="97">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3149615" role="note" l10n="U" oldref="84">To hide the borders of the frame, select the frame, and then choose <item type="menuitem">Format - Frame/Object</item>. Click the <item type="menuitem">Borders</item> tab, and then click in the<emph/>
+         <item type="menuitem">Set No Border</item> box in the<emph/>
+         <item type="menuitem">Line Arrangement</item> area.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145098" role="paragraph" l10n="U" oldref="83">To resize the frame, drag the edges of the frame.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
+      <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
index 677f8f98f2..e8c47d25c3 100644
--- a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_direct_cursor.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,20 +27,17 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetext_direct_cursorxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Using the Direct Cursor</title>
-<filename>/text/swriter/guide/text_direct_cursor.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-24T15:16:06">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetext_direct_cursorxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Using the Direct Cursor</title>
+         <filename>/text/swriter/guide/text_direct_cursor.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155178"><bookmark_value>text; cursor</bookmark_value>
 <bookmark_value>entering text with direct cursor</bookmark_value>
 <bookmark_value>direct cursor; settings</bookmark_value>
@@ -50,35 +45,33 @@
 <bookmark_value>cursor;direct cursor</bookmark_value>
 <bookmark_value>settings;direct cursor</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155178" xml-lang="en-US" level="1" l10n="U" oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155908" xml-lang="en-US" l10n="U" oldref="25">The direct cursor allows you to enter text anywhere on a page.</paragraph>
-<paragraph role="paragraph" id="par_id3155921" xml-lang="en-US" l10n="U" oldref="41">To set the behavior of the direct cursor, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW">On the <emph>Tools</emph> bar, click the <emph>Direct Cursor</emph> icon 
-<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149846" xml-lang="en-US">Icon</alt>
-	</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph>
-<paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">
-<image id="img_id5471987" src="res/helpimg/dircursleft.png" width="3.7mm" height="8.2mm"><alt id="alt_id5471987" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1" l10n="U" oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link></variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155908" role="paragraph" l10n="U" oldref="25">The direct cursor allows you to enter text anywhere on a page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155921" role="paragraph" l10n="U" oldref="41">To set the behavior of the direct cursor, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106A3" role="listitem" l10n="NEW">On the <item type="menuitem">Tools</item> bar, click the <item type="menuitem">Direct Cursor</item> icon 
+<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106C5" role="listitem" l10n="NEW">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106C8" role="listitem" l10n="NEW">
+<image id="img_id5471987" src="res/helpimg/dircursleft.png" width="0.1457in" height="0.3228in"><alt xml-lang="en-US" id="alt_id5471987">Icon</alt>
 	</image> Align left</paragraph>
-<paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW">
-<image id="img_id5730253" src="res/helpimg/dircurscent.png" width="6.09mm" height="8.2mm"><alt id="alt_id5730253" xml-lang="en-US">Icon</alt>
+            <paragraph xml-lang="en-US" id="par_idN106E4" role="listitem" l10n="NEW">
+<image id="img_id5730253" src="res/helpimg/dircurscent.png" width="0.2398in" height="0.3228in"><alt xml-lang="en-US" id="alt_id5730253">Icon</alt>
 	</image> Centered</paragraph>
-<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US" l10n="NEW">
-<image id="img_id6953622" src="res/helpimg/dircursright.png" width="3.97mm" height="8.2mm"><alt id="alt_id6953622" xml-lang="en-US">Icon</alt>
+            <paragraph xml-lang="en-US" id="par_idN10700" role="listitem" l10n="NEW">
+<image id="img_id6953622" src="res/helpimg/dircursright.png" width="0.1563in" height="0.3228in"><alt xml-lang="en-US" id="alt_id6953622">Icon</alt>
 	</image> Align right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1071D" xml-lang="en-US" l10n="NEW">Type your text. %PRODUCTNAME automatically inserts the required number of blank lines, and, if the options are enabled, tabs and spaces.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/template_create.xhp#template_create"/>
-<embed href="text/swriter/guide/template_default.xhp#template_default"/>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1071D" role="listitem" l10n="NEW">Type your text. %PRODUCTNAME automatically inserts the required number of blank lines, and, if the options are enabled, tabs and spaces.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+      <embed href="text/swriter/guide/template_create.xhp#template_create"/>
+      <embed href="text/swriter/guide/template_default.xhp#template_default"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_emphasize.xhp b/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
index bb8f2fbfb4..6226d7b683 100644
--- a/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_emphasize.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,39 +32,38 @@
  
 	
 <meta>
-<topic id="textswriterguidetext_emphasizexml" indexer="include">
-<title id="tit" xml-lang="en-US">Emphasizing Text</title>
-<filename>/text/swriter/guide/text_emphasize.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetext_emphasizexml" indexer="include">
+         <title xml-lang="en-US" id="tit">Emphasizing Text</title>
+         <filename>/text/swriter/guide/text_emphasize.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149820"><bookmark_value>text; emphasizing</bookmark_value>
-<bookmark_value>emphasizing text</bookmark_value>
+      <bookmark_value>emphasizing text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="1" l10n="U" oldref="65"><variable id="text_emphasize"><link href="text/swriter/guide/text_emphasize.xhp" name="Emphasizing Text">Emphasizing Text</link>
+<paragraph xml-lang="en-US" id="hd_id3149820" role="heading" level="1" l10n="U"
+                 oldref="65"><variable id="text_emphasize"><link href="text/swriter/guide/text_emphasize.xhp" name="Emphasizing Text">Emphasizing Text</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="66">Here are a few examples of how to emphasize text in a document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="67">Select the text and apply a different font style or effect, such as <emph>bold</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149840" xml-lang="en-US" l10n="U" oldref="68">Right-click in a paragraph, choose <emph>Paragraph, </emph>set the options that you want, for example, the background color, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="69">Select the text, and then choose <emph>Insert Frame</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6924649" xml-lang="en-US" l10n="CHG">Use the Text tool on the Drawing toolbar. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW">Use Fontwork. To open the Fontwork window, click the Fontwork Gallery icon on the Drawing bar.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/fontwork.xhp#fontwork"/>
-<embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
-</body>
+      <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="66">Here are a few examples of how to emphasize text in a document:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="67">Select the text and apply a different font style or effect, such as <emph>bold</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149840" role="listitem" l10n="U" oldref="68">Right-click in a paragraph, choose <emph>Paragraph, </emph>set the options that you want, for example, the background color, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="69">Select the text, and then choose <item type="menuitem">Insert - Frame</item>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id6924649" role="paragraph" l10n="CHG">Use the Text tool on the Drawing toolbar. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106E7" role="paragraph" l10n="NEW">Use Fontwork. To open the Fontwork window, click the Fontwork Gallery icon on the Drawing bar.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/shared/guide/fontwork.xhp#fontwork"/>
+      <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+   </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp
index 27ce10a933..1e5b4514b8 100644
--- a/helpcontent2/source/text/swriter/guide/text_frame.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_frame.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,101 +32,105 @@
  
 	
 <meta>
-<topic id="textswriterguidetext_framexml" indexer="include">
-<title id="tit" xml-lang="en-US">Inserting, Editing, and Linking Text Frames</title>
-<filename>/text/swriter/guide/text_frame.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetext_framexml" indexer="include">
+         <title xml-lang="en-US" id="tit">Inserting, Editing, and Linking Text Frames</title>
+         <filename>/text/swriter/guide/text_frame.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149487"><bookmark_value>text frames; inserting/editing/linking</bookmark_value>
-<bookmark_value>editing;text frames</bookmark_value>
-<bookmark_value>inserting;text frames</bookmark_value>
-<bookmark_value>resizing;text frames, by mouse</bookmark_value>
-<bookmark_value>scaling; text frames, by mouse</bookmark_value>
-<bookmark_value>links;text frames</bookmark_value>
-<bookmark_value>text flow; from frame to frame</bookmark_value>
-<bookmark_value>frames; linking</bookmark_value>
-<bookmark_value>printing;hiding text frames from printing</bookmark_value>
+      <bookmark_value>editing;text frames</bookmark_value>
+      <bookmark_value>inserting;text frames</bookmark_value>
+      <bookmark_value>resizing;text frames, by mouse</bookmark_value>
+      <bookmark_value>scaling; text frames, by mouse</bookmark_value>
+      <bookmark_value>links;text frames</bookmark_value>
+      <bookmark_value>text flow; from frame to frame</bookmark_value>
+      <bookmark_value>frames; linking</bookmark_value>
+      <bookmark_value>printing;hiding text frames from printing</bookmark_value>
 </bookmark><comment>mw deleted "text;" and changed "printing;"</comment>
-<paragraph role="heading" id="hd_id3149487" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Text Frames">Inserting, Editing, and Linking Text Frames</link>
+<paragraph xml-lang="en-US" id="hd_id3149487" role="heading" level="1" l10n="U" oldref="3"><variable id="text_frame"><link href="text/swriter/guide/text_frame.xhp" name="Inserting, Editing, and Linking Text Frames">Inserting, Editing, and Linking Text Frames</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149842" xml-lang="en-US" l10n="U" oldref="65">A text frame is a container for text and graphics that you can place anywhere on a page. You can also use a frame to apply a column layout to text.</paragraph>
-<paragraph role="heading" id="hd_id3156104" xml-lang="en-US" level="2" l10n="U" oldref="64">Inserting Text Frames</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149961" xml-lang="en-US" l10n="CHG" oldref="5">Select the text that you want to include in the frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149602" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Insert - Frame</emph>, and click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145115" xml-lang="en-US" level="2" l10n="U" oldref="66">Editing Text Frames</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="16">To edit the contents of a text frame, click in the frame, and make the changes that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3156239" xml-lang="en-US" l10n="U" oldref="14">To edit a frame, select the frame, right-click, and then choose a formatting option. You can also right-click the selected frame, and choose <emph>Frame</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3156261" xml-lang="en-US" l10n="U" oldref="63">To resize a text frame, click an edge of frame, and drag one of the edges or corners of the frame. Hold down Shift while you drag to maintain the proportion of the frame.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153386" xml-lang="en-US" level="2" l10n="U" oldref="98">Hiding Text From Printing</paragraph>
-<paragraph role="paragraph" id="par_id3154262" xml-lang="en-US" l10n="CHG" oldref="99">Any Writer text frame can be set to a mode which allows viewing the text on screen, but hides the text from printing.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154858" xml-lang="en-US" l10n="U" oldref="100">Select the text frame (you see the eight handles).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155875" xml-lang="en-US" l10n="U" oldref="101">Choose <emph>Format - Frame/Object - Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155899" xml-lang="en-US" l10n="U" oldref="102">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3148701" xml-lang="en-US" level="2" l10n="U" oldref="83">Linking Text Frames</paragraph>
-<paragraph role="paragraph" id="par_id3149986" xml-lang="en-US" l10n="CHG" oldref="84">You can link Writer text frames so that their contents automatically flow from one frame to another.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153025" xml-lang="en-US" l10n="U" oldref="71">Click the edge of a frame that you want to link. Selection handles appear on the edges of the frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150223" xml-lang="en-US" l10n="CHG" oldref="87">On the <emph>Frame</emph> Bar, click the <emph>Link Frames</emph> icon 
-<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt id="alt_id3148968" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+      <paragraph xml-lang="en-US" id="par_id3149842" role="paragraph" l10n="U" oldref="65">A text frame is a container for text and graphics that you can place anywhere on a page. You can also use a frame to apply a column layout to text.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156104" role="heading" level="2" l10n="U"
+                 oldref="64">To Insert a Text Frame</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149961" role="listitem" l10n="CHG" oldref="5">Select the text that you want to include in the frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149602" role="listitem" l10n="CHG" oldref="9">Choose <emph>Insert - Frame</emph>, and click OK.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145115" role="heading" level="2" l10n="U"
+                 oldref="66">To Edit a Text Frame</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="16">To edit the contents of a text frame, click in the frame, and make the changes that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156239" role="listitem" l10n="U" oldref="14">To edit a frame, select the frame, right-click, and then choose a formatting option. You can also right-click the selected frame, and choose <emph>Frame</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156261" role="listitem" l10n="U" oldref="63">To resize a text frame, click an edge of the frame, and drag one of the edges or corners of the frame. Hold down Shift while you drag to maintain the proportion of the frame.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3153386" role="heading" level="2" l10n="U"
+                 oldref="98">To Hide Text From Printing</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154262" role="paragraph" l10n="CHG" oldref="99">Any Writer text frame can be set to a mode which allows viewing the text on screen, but hides the text from printing.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154858" role="listitem" l10n="U" oldref="100">Select the text frame (you see the eight handles).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155875" role="listitem" l10n="U" oldref="101">Choose <emph>Format - Frame/Object - Options</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155899" role="listitem" l10n="U" oldref="102">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3148701" role="heading" level="2" l10n="U"
+                 oldref="83">To Link Text Frames</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149986" role="paragraph" l10n="CHG" oldref="84">You can link Writer text frames so that their contents automatically flow from one frame to another.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153025" role="listitem" l10n="U" oldref="71">Click the edge of a frame that you want to link. Selection handles appear on the edges of the frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150223" role="listitem" l10n="CHG" oldref="87">On the <item type="menuitem">Frame</item> Bar, click the <item type="menuitem">Link Frames</item> icon 
+<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148968">Icon</alt>
 	</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="89">Click the frame that you want to link to.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150947" xml-lang="en-US" l10n="U" oldref="75">You can only link frames if:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150969" xml-lang="en-US" l10n="U" oldref="76">The target frame is empty.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="77">The target frame is not linked to another frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="78">The source and the target frames are in the same section. For example, you cannot link a header frame to a footer frame.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145559" xml-lang="en-US" l10n="U" oldref="79">The source frame does not have a next link.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145577" xml-lang="en-US" l10n="U" oldref="81">The target or the source frame are not contained in each other.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3151083" xml-lang="en-US" l10n="U" oldref="90">When you select a linked frame, a line is displayed that connects the linked frames.</paragraph>
-<paragraph role="note" id="par_id5853144" xml-lang="en-US" l10n="NEW">The Autosize feature is available only for the last frame in a chain of linked frames.</paragraph><comment>UFI: removed 
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150930" role="listitem" l10n="U" oldref="89">Click the frame that you want to link to.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3150947" role="paragraph" l10n="U" oldref="75">You can only link frames if:</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150969" role="listitem" l10n="U" oldref="76">The target frame is empty.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154365" role="listitem" l10n="U" oldref="77">The target frame is not linked to another frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154383" role="listitem" l10n="U" oldref="78">The source and the target frames are in the same section. For example, you cannot link a header frame to a footer frame.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145559" role="listitem" l10n="U" oldref="79">The source frame does not have a next link.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145577" role="listitem" l10n="U" oldref="81">The target or the source frame are not contained in each other.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3151083" role="paragraph" l10n="U" oldref="90">When you select a linked frame, a line is displayed that connects the linked frames.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id5853144" role="note" l10n="NEW">The AutoSize feature is available only for the last frame in a chain of linked frames.</paragraph><comment>UFI: removed 
 id="par_id3147542" l10n="U" oldref="72"You can only change the height of the last frame in a series of linked frames.
 Obviously this works now</comment>
 <section id="relatedtopics">
-<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
-<embed href="text/swriter/guide/text_centervert.xhp#text_centervert"/>
-<embed href="text/swriter/guide/textdoc_inframe.xhp#textdoc_inframe"/>
-<embed href="text/shared/guide/floating_toolbar.xhp#floating_toolbar"/>
-</section>
-</body>
-</helpdocument>
+         <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
+         <embed href="text/swriter/guide/text_centervert.xhp#text_centervert"/>
+         <embed href="text/swriter/guide/textdoc_inframe.xhp#textdoc_inframe"/>
+         <embed href="text/shared/guide/floating_toolbar.xhp#floating_toolbar"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
index 783c010b22..43b63aa773 100755
--- a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_nav_keyb.xhp,v $
- * $Revision: 1.10.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,137 +32,137 @@
  
 	
 <meta>
-<topic id="textswriterguidetext_nav_keybxml" indexer="include">
-<title id="tit" xml-lang="en-US">Navigating and Selecting With the Keyboard</title>
-<filename>/text/swriter/guide/text_nav_keyb.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguidetext_nav_keybxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Navigating and Selecting With the Keyboard</title>
+         <filename>/text/swriter/guide/text_nav_keyb.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159260"><bookmark_value>text; navigating and selecting with keyboard</bookmark_value>
-<bookmark_value>navigating; in text, with keyboard</bookmark_value>
-<bookmark_value>selecting;text, with keyboard</bookmark_value>
-<bookmark_value>keyboard; navigating and selecting in text</bookmark_value>
+      <bookmark_value>navigating; in text, with keyboard</bookmark_value>
+      <bookmark_value>selecting;text, with keyboard</bookmark_value>
+      <bookmark_value>keyboard; navigating and selecting in text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3159260" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="text_nav_keyb"><link href="text/swriter/guide/text_nav_keyb.xhp" name="Navigating and Selecting With the Keyboard">Navigating and Selecting With the Keyboard</link>
+<paragraph xml-lang="en-US" id="hd_id3159260" role="heading" level="1" l10n="U"
+                 oldref="33"><variable id="text_nav_keyb"><link href="text/swriter/guide/text_nav_keyb.xhp" name="Navigating and Selecting With the Keyboard">Navigating and Selecting With the Keyboard</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="13">You can navigate through a document and make selections with the keyboard.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1031200810571916" xml-lang="en-US" l10n="NEW">To move the cursor, press the key or key combination given in the following table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1031200810571929" xml-lang="en-US" l10n="NEW">To select the characters under the moving cursor, additionally hold down the Shift key when you move the cursor.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149487">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="23">Key</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="24">Function</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3156220" xml-lang="en-US" l10n="U" oldref="25">
-<emph>+</emph><switchinline select="sys"><caseinline select="MAC"><emph>Command key</emph>
-</caseinline><defaultinline>
-<emph>Ctrl key</emph></defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="26">Right, left arrow keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150105" xml-lang="en-US" l10n="U" oldref="27">Moves the cursor one character to the left or to the right.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="28">Moves the cursor one word to the left or to the right.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149629" xml-lang="en-US" l10n="U" oldref="29">Up, down arrow keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="30">Moves the cursor up or down one line.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="31">(<switchinline select="sys"><caseinline select="MAC">Command+Option
+      <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph" l10n="U" oldref="13">You can navigate through a document and make selections with the keyboard.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1031200810571916" role="listitem" l10n="NEW">To move the cursor, press the key or key combination given in the following table.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id1031200810571929" role="listitem" l10n="NEW">To select the characters under the moving cursor, additionally hold down the Shift key when you move the cursor.</paragraph>
+         </listitem>
+      </list>
+      <table id="tbl_id3149487">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155918" role="tablehead" l10n="U" oldref="23">Key</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155870" role="tablehead" l10n="U" oldref="24">Function</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156220" role="tablehead" l10n="U" oldref="25">
+                  <emph>+</emph><switchinline select="sys"><caseinline select="MAC"><emph>Command key</emph>
+</caseinline><defaultinline><emph>Ctrl key</emph></defaultinline></switchinline></paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156113" role="tablecontent" l10n="U" oldref="26">Right, left arrow keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3150105" role="tablecontent" l10n="U" oldref="27">Moves the cursor one character to the left or to the right.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153418" role="tablecontent" l10n="U" oldref="28">Moves the cursor one word to the left or to the right.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149629" role="tablecontent" l10n="U" oldref="29">Up, down arrow keys</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149949" role="tablecontent" l10n="U" oldref="30">Moves the cursor up or down one line.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149972" role="tablecontent" l10n="U" oldref="31">(<switchinline select="sys"><caseinline select="MAC">Command+Option
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>) Moves the current paragraph up or down.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149624" xml-lang="en-US" l10n="U" oldref="32">Home</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="56">Moves the cursor to the beginning of the current line.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145108" xml-lang="en-US" l10n="U" oldref="34">Moves the cursor to the beginning of the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149586" xml-lang="en-US" l10n="U" oldref="35">Home</paragraph>
-<paragraph role="tablecontent" id="par_id3156237" xml-lang="en-US" l10n="U" oldref="36">In a table</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156260" xml-lang="en-US" l10n="U" oldref="37">Moves the cursor to the beginning of the contents in the current cell.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145409" xml-lang="en-US" l10n="U" oldref="38">Moves the cursor to the beginning of the contents of the current cell. Press again to move the cursor to the first cell in the table. Press again to move the cursor to the beginning of the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154410" xml-lang="en-US" l10n="U" oldref="41">End</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153372" xml-lang="en-US" l10n="U" oldref="42">Moves the cursor to the end of the current line.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154235" xml-lang="en-US" l10n="U" oldref="43">Moves the cursor to the end of the document</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="44">End</paragraph>
-<paragraph role="tablecontent" id="par_id3154850" xml-lang="en-US" l10n="U" oldref="45">In a table</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154873" xml-lang="en-US" l10n="U" oldref="46">Moves to the end of the contents in the current cell.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155894" xml-lang="en-US" l10n="U" oldref="47">Moves the cursor to the end of the contents of the current cell. Press again to move the cursor to the last cell in the table. Press again to move the cursor to the end of the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155944" xml-lang="en-US" l10n="U" oldref="50">PgUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148678" xml-lang="en-US" l10n="U" oldref="54">Scrolls up one page.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148701" xml-lang="en-US" l10n="U" oldref="52">Moves the cursor to the header.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149998" xml-lang="en-US" l10n="U" oldref="53">PgDn</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153018" xml-lang="en-US" l10n="U" oldref="51">Scroll down one page.</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148949" xml-lang="en-US" l10n="U" oldref="55">Moves the cursor to the footer.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/04/01020000.xhp#text_keys"/>
-<embed href="text/shared/04/01010000.xhp#common_keys"/>
-</body>
-</helpdocument>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149624" role="tablecontent" l10n="U" oldref="32">Home</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149871" role="tablecontent" l10n="U" oldref="56">Moves the cursor to the beginning of the current line.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="34">Moves the cursor to the beginning of the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149586" role="tablecontent" l10n="U" oldref="35">Home</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3156237" role="tablecontent" l10n="U" oldref="36">In a table</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3156260" role="tablecontent" l10n="U" oldref="37">Moves the cursor to the beginning of the contents in the current cell.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3145409" role="tablecontent" l10n="U" oldref="38">Moves the cursor to the beginning of the contents of the current cell. Press again to move the cursor to the first cell in the table. Press again to move the cursor to the beginning of the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154410" role="tablecontent" l10n="U" oldref="41">End</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153372" role="tablecontent" l10n="U" oldref="42">Moves the cursor to the end of the current line.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154235" role="tablecontent" l10n="U" oldref="43">Moves the cursor to the end of the document</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154262" role="tablecontent" l10n="U" oldref="44">End</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154850" role="tablecontent" l10n="U" oldref="45">In a table</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3154873" role="tablecontent" l10n="U" oldref="46">Moves to the end of the contents in the current cell.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155894" role="tablecontent" l10n="U" oldref="47">Moves the cursor to the end of the contents of the current cell. Press again to move the cursor to the last cell in the table. Press again to move the cursor to the end of the document.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3155944" role="tablecontent" l10n="U" oldref="50">PgUp</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148678" role="tablecontent" l10n="U" oldref="54">Scrolls up one page.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148701" role="tablecontent" l10n="U" oldref="52">Moves the cursor to the header.</paragraph>
+            </tablecell>
+         </tablerow>
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149998" role="tablecontent" l10n="U" oldref="53">PgDn</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3153018" role="tablecontent" l10n="U" oldref="51">Scroll down one page.</paragraph>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3148949" role="tablecontent" l10n="U" oldref="55">Moves the cursor to the footer.</paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/04/01020000.xhp#text_keys"/>
+      <embed href="text/shared/04/01010000.xhp#common_keys"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/text_rotate.xhp b/helpcontent2/source/text/swriter/guide/text_rotate.xhp
index 8b686951f1..48301c9cff 100644
--- a/helpcontent2/source/text/swriter/guide/text_rotate.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_rotate.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: text_rotate.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,55 +27,50 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetext_rotatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Rotating Text</title>
-<filename>/text/swriter/guide/text_rotate.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-28T11:40:00">FPE: Changed table to numbered list</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetext_rotatexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Rotating Text</title>
+         <filename>/text/swriter/guide/text_rotate.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155911"><bookmark_value>text; rotating</bookmark_value>
-<bookmark_value>rotating;text</bookmark_value>
+      <bookmark_value>rotating;text</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3155911" xml-lang="en-US" level="1" l10n="U" oldref="65"><variable id="text_rotate"><link href="text/swriter/guide/text_rotate.xhp" name="Rotating Text">Rotating Text</link>
+<paragraph xml-lang="en-US" id="hd_id3155911" role="heading" level="1" l10n="U"
+                 oldref="65"><variable id="text_rotate"><link href="text/swriter/guide/text_rotate.xhp" name="Rotating Text">Rotating Text</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3147410" xml-lang="en-US" l10n="U" oldref="66">You can only rotate text that is contained in a drawing object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153130" xml-lang="en-US" l10n="CHG" oldref="67">Choose <emph>View - Toolbars- Drawing</emph> to open the <emph>Drawing </emph>toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149866" xml-lang="en-US" l10n="CHG" oldref="68">Select the <link href="text/shared/02/01140000.xhp" name="Text"><emph>Text</emph></link> icon 
-<image id="img_id3149600" src="res/commandimagelist/sc_texttoolbox.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149600" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="par_id3147410" role="paragraph" l10n="U" oldref="66">You can only rotate text that is contained in a drawing object.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153130" role="listitem" l10n="CHG" oldref="67">Choose <item type="menuitem">View - Toolbars- Drawing</item> to open the <item type="menuitem">Drawing</item>
+               <emph/>toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149866" role="listitem" l10n="CHG" oldref="68">Select the <link href="text/shared/02/01140000.xhp" name="Text"><item type="menuitem">Text</item></link> icon 
+<image id="img_id3149600" src="res/commandimagelist/sc_texttoolbox.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149600">Icon</alt>
 	</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="69">Drag in your document to draw the text object, and then type your text.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154415" xml-lang="en-US" l10n="CHG" oldref="71">Click outside of the object, then click the text you entered. Click the <link href="text/shared/02/05090000.xhp" name="Object Rotation Mode"><emph>Rotate</emph></link> icon 
-<image id="img_id3145405" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145405" xml-lang="en-US">Icon</alt>
-	</image> on the <emph>Drawing Object Properties</emph> toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154252" xml-lang="en-US" l10n="U" oldref="72">Drag one of the corner handles of the text object.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="73">You can also right-click the text object, choose <emph>Position and Size</emph>, click the <emph>Rotation</emph> tab, and then enter a rotation angle or a new position for the object.</paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
-<paragraph role="paragraph" id="par_id3155888" xml-lang="en-US" l10n="CHG" oldref="74"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149590" role="listitem" l10n="U" oldref="69">Drag in your document to draw the text object, and then type your text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154415" role="listitem" l10n="CHG" oldref="71">Click outside of the object, then click the text you entered. Click the <link href="text/shared/02/05090000.xhp" name="Object Rotation Mode"><item type="menuitem">Rotate</item></link> icon 
+<image id="img_id3145405" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3145405">Icon</alt>
+	</image> on the <item type="menuitem">Drawing Object Properties</item> toolbar.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154252" role="listitem" l10n="U" oldref="72">Drag one of the corner handles of the text object.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3154844" role="tip" l10n="U" oldref="73">You can also right-click the text object, choose <emph>Position and Size</emph>, click the <emph>Rotation</emph> tab, and then enter a rotation angle or a new position for the object.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
+         <paragraph xml-lang="en-US" id="par_id3155888" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp b/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
index 6a954504c2..1f60820ff0 100755
--- a/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
+++ b/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textdoc_inframe.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,62 +29,63 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidetextdoc_inframexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting an Entire Text Document</title>
-<filename>/text/swriter/guide/textdoc_inframe.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:01:31">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidetextdoc_inframexml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Inserting an Entire Text Document</title>
+         <filename>/text/swriter/guide/textdoc_inframe.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155185"><bookmark_value>sections;inserting external content</bookmark_value>
-<bookmark_value>text documents;merging</bookmark_value>
-<bookmark_value>links;inserting text documents as</bookmark_value>
-<bookmark_value>inserting;text documents</bookmark_value>
+      <bookmark_value>text documents;merging</bookmark_value>
+      <bookmark_value>links;inserting text documents as</bookmark_value>
+      <bookmark_value>inserting;text documents</bookmark_value>
 </bookmark><comment>mw deleted "text;"</comment>
-<paragraph role="heading" id="hd_id3155185" xml-lang="en-US" level="1" l10n="U" oldref="23"><variable id="textdoc_inframe"><link href="text/swriter/guide/textdoc_inframe.xhp" name="Inserting an Entire Text Document">Inserting an Entire Text Document</link>
+<paragraph xml-lang="en-US" id="hd_id3155185" role="heading" level="1" l10n="U"
+                 oldref="23"><variable id="textdoc_inframe"><link href="text/swriter/guide/textdoc_inframe.xhp" name="Inserting an Entire Text Document">Inserting an Entire Text Document</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="28">Place the cursor in the document where you want to insert the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Insert - File</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149839" xml-lang="en-US" l10n="U" oldref="31">Locate the text document that you want to insert, and then click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3148858" xml-lang="en-US" l10n="U" oldref="32">The contents of the text document are embedded into the current document and are not updated if the source file is changed. If you want the contents to automatically update when you change the source document, insert the file as a link.</paragraph>
-<paragraph role="heading" id="hd_id3156105" xml-lang="en-US" level="2" l10n="U" oldref="33">Inserting an Entire Text Document as a Link</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150096" xml-lang="en-US" l10n="U" oldref="34">Place the cursor in the document where you want to insert the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153404" xml-lang="en-US" l10n="U" oldref="35">Choose <emph>Insert - Section</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="36">Type a name in the <emph>New Section</emph> box, and then select the <emph>Link</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149642" xml-lang="en-US" l10n="U" oldref="37">In the <emph>File Name </emph>box, type the name of the file that you want to insert, or click the browse button (<emph>...</emph>) and locate the file.</paragraph>
-<paragraph role="listitem" id="par_id3149968" xml-lang="en-US" l10n="U" oldref="38">If the target text document contains sections, you can select the section that you want to insert in the<emph> Sections</emph> box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149619" xml-lang="en-US" l10n="U" oldref="39">If you want, set the formatting options for the section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149862" xml-lang="en-US" l10n="U" oldref="40">Click <emph>Insert</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3145099" xml-lang="en-US" l10n="U" oldref="41">$[officename] automatically updates the contents of the inserted section whenever the source document is changed. To manually update the contents of the section, choose <emph>Tools - Update - Update All</emph>.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id1812799" role="heading" level="2" l10n="NEW">To Insert a Text File</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155855" role="listitem" l10n="U" oldref="28">Place the cursor in the document where you want to insert the file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="30">Choose <emph>Insert - File</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149839" role="listitem" l10n="U" oldref="31">Locate the text document that you want to insert, and then click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3148858" role="paragraph" l10n="U" oldref="32">The contents of the text document are embedded into the current document and are not updated if the source file is changed. If you want the contents to automatically update when you change the source document, insert the file as a link.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3156105" role="heading" level="2" l10n="U"
+                 oldref="33">To Insert an Entire Text Document as a Link</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150096" role="listitem" l10n="U" oldref="34">Place the cursor in the document where you want to insert the file.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153404" role="listitem" l10n="U" oldref="35">Choose <emph>Insert - Section</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153127" role="listitem" l10n="U" oldref="36">Type a name in the <emph>New Section</emph> box, and then select the <emph>Link</emph> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149642" role="listitem" l10n="U" oldref="37">In the <item type="menuitem">File Name</item>
+               <emph/>box, type the name of the file that you want to insert, or click the browse button (<item type="menuitem">...</item>) and locate the file.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149968" role="listitem" l10n="U" oldref="38">If the target text document contains sections, you can select the section that you want to insert in the<emph/>
+               <item type="menuitem">Sections</item> box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149619" role="listitem" l10n="U" oldref="39">If you want, set the formatting options for the section.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149862" role="listitem" l10n="U" oldref="40">Click <emph>Insert</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145099" role="paragraph" l10n="U" oldref="41">$[officename] automatically updates the contents of the inserted section whenever the source document is changed. To manually update the contents of the section, choose <emph>Tools - Update - Update All</emph>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
index e56b4dfb73..488ee7db0b 100644
--- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: using_hyphen.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,100 +31,87 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguideusing_hyphenxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyphenation</title>
-<filename>/text/swriter/guide/using_hyphen.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideusing_hyphenxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Hyphenation</title>
+         <filename>/text/swriter/guide/using_hyphen.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>hyphenation;manual/automatic</bookmark_value>
-<bookmark_value>separation, see hyphenation</bookmark_value>
-<bookmark_value>automatic hyphenation in text</bookmark_value>
-<bookmark_value>manual hyphenation in text</bookmark_value>
-</bookmark><comment>mw transferred 2 entries to hyphen_prevent.xhp</comment><paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="using_hyphen"><link href="text/swriter/guide/using_hyphen.xhp" name="Hyphenation">Hyphenation</link>
+      <bookmark_value>separation, see hyphenation</bookmark_value>
+      <bookmark_value>automatic hyphenation in text</bookmark_value>
+      <bookmark_value>manual hyphenation in text</bookmark_value>
+</bookmark><comment>mw transferred 2 entries to hyphen_prevent.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3149695" role="heading" level="1" l10n="U"
+                 oldref="20"><variable id="using_hyphen"><link href="text/swriter/guide/using_hyphen.xhp" name="Hyphenation">Hyphenation</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="31">By default, $[officename] moves words that do not fit on a line to the next line. If you want, you can use automatic or manual hyphenation to avoid this behavior: </paragraph>
-<paragraph role="heading" id="hd_id3155864" xml-lang="en-US" level="2" l10n="U" oldref="30">Automatic hyphenation</paragraph>
-<paragraph role="paragraph" id="par_id3147414" xml-lang="en-US" l10n="U" oldref="22">Automatic hyphenation inserts hyphens where they are needed in a paragraph. This option is only available for paragraph styles and individual paragraphs.</paragraph>
-<paragraph role="heading" id="hd_id3149832" xml-lang="en-US" level="3" l10n="U" oldref="51">To automatically hyphenate text in a paragraph:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148850" xml-lang="en-US" l10n="U" oldref="32">Right-click in a paragraph, and choose <emph>Paragraph</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156104" xml-lang="en-US" l10n="U" oldref="34">Click the <link href="text/swriter/01/05030200.xhp" name="Text Flow"><emph>Text Flow</emph></link> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150101" xml-lang="en-US" l10n="U" oldref="35">In the <emph>Hyphenation </emph>area, select the <emph>Automatically</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153121" xml-lang="en-US" l10n="U" oldref="52">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149629" xml-lang="en-US" level="3" l10n="U" oldref="53">To automatically hyphenate text in multiple paragraphs:</paragraph>
-<paragraph role="paragraph" id="par_id3149644" xml-lang="en-US" l10n="U" oldref="33">If you want to automatically hyphenate more than one paragraph, use a paragraph style.</paragraph>
-<paragraph role="paragraph" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="48">For example, enable the automatic hyphenation option for the "Default" paragraph style, and then apply the style to the paragraphs that you want to hyphenate.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149611" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149867" xml-lang="en-US" l10n="U" oldref="55">Right-click the paragraph style that you want to hyphenate, and then choose <emph>Modify</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145106" xml-lang="en-US" l10n="U" oldref="56">Click the <emph>Text Flow </emph>tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="57">In the <emph>Hyphenation</emph> area, select the <emph>Automatically</emph> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156250" xml-lang="en-US" l10n="U" oldref="58">Click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145400" xml-lang="en-US" l10n="U" oldref="59">Apply the style to the paragraphs that you want to hyphenate.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145417" xml-lang="en-US" level="2" l10n="U" oldref="36">Manual Hyphenation</paragraph>
-<paragraph role="paragraph" id="par_id3154400" xml-lang="en-US" l10n="U" oldref="23">You can insert a hyphen where you want on a line, or let $[officename] search for the words to hyphenate, and then offer a suggested hyphenation.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24">To quickly insert a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-).</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154244" xml-lang="en-US" l10n="U" oldref="37">If you insert a manual hyphen in a word, the word is only hyphenated at the manual hyphen. No additional automatic hyphenation is applied for this word. A word with a manual hyphen will be hyphenated without regard to the settings on the <emph>Text Flow</emph> tab page.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154847" xml-lang="en-US" level="3" l10n="U" oldref="60">To manually hyphenate text in a selection:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154869" xml-lang="en-US" l10n="U" oldref="61">Select the text that you want to hyphenate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="CHG" oldref="26">Choose <emph>Tools - Language - Hyphenation</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="3">
-<listitem>
-<paragraph role="listitem" id="par_id3155943" xml-lang="en-US" l10n="U" oldref="62">When $[officename] encounters a word to hyphenate, do one of the following:</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153017" xml-lang="en-US" l10n="U" oldref="27">To accept the hyphenation suggestion, click <emph>Hyphenate</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148949" xml-lang="en-US" l10n="U" oldref="63">To insert the hyphen in another part of the word, click the arrow buttons.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
-<embed href="text/swriter/guide/template_default.xhp#template_default"/>
-<embed href="text/swriter/guide/hyphen_prevent.xhp#hyphen_prevent"/>
-<paragraph role="paragraph" id="par_id3154361" xml-lang="en-US" l10n="U" oldref="46"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3155918" role="paragraph" l10n="U" oldref="31">By default, $[officename] moves words that do not fit on a line to the next line. If you want, you can use automatic or manual hyphenation to avoid this behavior: </paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155864" role="heading" level="2" l10n="U"
+                 oldref="30">Automatic Hyphenation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147414" role="paragraph" l10n="U" oldref="22">Automatic hyphenation inserts hyphens where they are needed in a paragraph. This option is only available for paragraph styles and individual paragraphs.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149832" role="heading" level="3" l10n="U"
+                 oldref="51">To Automatically Hyphenate Text in a Paragraph</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3148850" role="listitem" l10n="U" oldref="32">Right-click in a paragraph, and choose <emph>Paragraph</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156104" role="listitem" l10n="U" oldref="34">Click the <link href="text/swriter/01/05030200.xhp" name="Text Flow"><emph>Text Flow</emph></link> tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150101" role="listitem" l10n="U" oldref="35">In the Hyphenation area, select the Automatically check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153121" role="listitem" l10n="U" oldref="52">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149629" role="heading" level="3" l10n="U"
+                 oldref="53">To Automatically Hyphenate Text in Multiple Paragraphs</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149644" role="paragraph" l10n="U" oldref="33">If you want to automatically hyphenate more than one paragraph, use a paragraph style.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149956" role="paragraph" l10n="U" oldref="48">For example, enable the automatic hyphenation option for the "Default" paragraph style, and then apply the style to the paragraphs that you want to hyphenate.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149611" role="listitem" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149867" role="listitem" l10n="U" oldref="55">Right-click the paragraph style that you want to hyphenate, and then choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145106" role="listitem" l10n="U" oldref="56">Click the Text Flow tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="57">In the <emph>Hyphenation</emph> area, select the <emph>Automatically</emph> check box.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3156250" role="listitem" l10n="U" oldref="58">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145400" role="listitem" l10n="U" oldref="59">Apply the style to the paragraphs that you want to hyphenate.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3145417" role="heading" level="2" l10n="U"
+                 oldref="36">Manual Hyphenation</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154400" role="paragraph" l10n="U" oldref="23">You can insert a hyphen where you want on a line, or let $[officename] search for the words to hyphenate, and then offer a suggested hyphenation.</paragraph>
+      <paragraph xml-lang="en-US" id="" role="heading" level="3" l10n="NEW">To Manually Hyphenate Single Words</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153363" role="paragraph" l10n="U" oldref="24">To quickly insert a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-).</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154244" role="paragraph" l10n="U" oldref="37">If you insert a manual hyphen in a word, the word is only hyphenated at the manual hyphen. No additional automatic hyphenation is applied for this word. A word with a manual hyphen will be hyphenated without regard to the settings on the <emph>Text Flow</emph> tab page.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154847" role="heading" level="3" l10n="U"
+                 oldref="60">To Manually Hyphenate Text in a Selection</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154869" role="listitem" l10n="U" oldref="61">Select the text that you want to hyphenate.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="CHG" oldref="26">Choose <emph>Tools - Language - Hyphenation</emph>.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+      <embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
+      <embed href="text/swriter/guide/template_default.xhp#template_default"/>
+      <embed href="text/swriter/guide/hyphen_prevent.xhp#hyphen_prevent"/>
+      <paragraph xml-lang="en-US" id="par_id3154361" role="paragraph" l10n="U" oldref="46"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp b/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
index 9bfc3bb054..fcf05e2b81 100644
--- a/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: using_numbered_lists.xhp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,50 +29,49 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideusing_numbered_listsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Adding Bullets</title>
-<filename>/text/swriter/guide/using_numbered_lists.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideusing_numbered_listsxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Bullets</title>
+         <filename>/text/swriter/guide/using_numbered_lists.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155186"><bookmark_value>bullet lists;turning on and off</bookmark_value>
-<bookmark_value>paragraphs; bulleted</bookmark_value>
-<bookmark_value>bullets;adding and editing</bookmark_value>
-<bookmark_value>formatting;bullets</bookmark_value>
-<bookmark_value>removing;bullets in text documents</bookmark_value>
-<bookmark_value>changing;bulleting symbols</bookmark_value>
-</bookmark><comment>mw deleted "editing;" and "adding;"</comment><paragraph role="heading" id="hd_id3155186" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="using_numbered_lists"><link href="text/swriter/guide/using_numbered_lists.xhp" name="Adding Bullets">Adding Bullets</link>
+      <bookmark_value>paragraphs; bulleted</bookmark_value>
+      <bookmark_value>bullets;adding and editing</bookmark_value>
+      <bookmark_value>formatting;bullets</bookmark_value>
+      <bookmark_value>removing;bullets in text documents</bookmark_value>
+      <bookmark_value>changing;bulleting symbols</bookmark_value>
+</bookmark><comment>mw deleted "editing;" and "adding;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155186" role="heading" level="1" l10n="U" oldref="6"><variable id="using_numbered_lists"><link href="text/swriter/guide/using_numbered_lists.xhp" name="Adding Bullets">Adding Bullets</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U" oldref="7">Select the paragraph(s) that you want to add bullets to.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="CHG" oldref="16">On the <emph>Formatting</emph> Bar, click the <emph>Bullets On/Off</emph> icon 
-<image id="img_id3156108" src="res/commandimagelist/sc_defaultbullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156108" xml-lang="en-US">Icon</alt>
+      <paragraph xml-lang="en-US" id="hd_id3291116" role="heading" level="2" l10n="NEW">To Add Bullets</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149829" role="listitem" l10n="U" oldref="7">Select the paragraph(s) that you want to add bullets to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149635" role="listitem" l10n="CHG" oldref="16">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Bullets On/Off</item> icon 
+<image id="img_id3156108" src="res/commandimagelist/sc_defaultbullet.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156108">Icon</alt>
 	</image>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3145403" xml-lang="en-US" l10n="CHG" oldref="17">To remove bullets, select the bulleted paragraphs, and then click the <emph>Bullets On/Off</emph> icon on the <emph>Formatting</emph> Bar.</paragraph>
-<paragraph role="heading" id="hd_id3154403" xml-lang="en-US" level="2" l10n="U" oldref="26">Formatting Bullets</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3154416" xml-lang="en-US" l10n="CHG" oldref="9">To change the formatting of bulleted list, choose <emph>Format - Bullets and Numbering</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3153390" xml-lang="en-US" l10n="U" oldref="14">For example, to change the bulleting symbol, click the <emph>Options</emph> tab, click the browse button (<emph>...</emph>) next to <emph>Character</emph>, and then select a special character. You can also click the <emph>Graphics</emph> tab, and then click a symbol style in the <emph>Selection </emph>area.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-<embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
-</section>
-</body>
-</helpdocument>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3145403" role="note" l10n="CHG" oldref="17">To remove bullets, select the bulleted paragraphs, and then click the <emph>Bullets On/Off</emph> icon on the <emph>Formatting</emph> Bar.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154403" role="heading" level="2" l10n="U"
+                 oldref="26">To Format Bullets</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154416" role="paragraph" l10n="CHG" oldref="9">To change the formatting of a bulleted list, choose <item type="menuitem">Format - Bullets and Numbering</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153390" role="paragraph" l10n="U" oldref="14">For example, to change the bulleting symbol, click the <item type="menuitem">Options</item> tab, click the browse button (<item type="menuitem">...</item>) next to <item type="menuitem">Character</item>, and then select a special character. You can also click the <item type="menuitem">Graphics</item> tab, and then click a symbol style in the <item type="menuitem">Selection</item>
+         <emph/>area.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+         <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+         <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+         <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+         <embed href="text/swriter/guide/captions.xhp#captions"/>
+         <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+         <embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp b/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
index fdb943e6b2..32d1aa1e21 100644
--- a/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: using_numbered_lists2.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,57 +29,50 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideusing_numbered_lists2xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Numbering</title>
-<filename>/text/swriter/guide/using_numbered_lists2.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideusing_numbered_lists2xml" indexer="include"
+             status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Adding Numbering</title>
+         <filename>/text/swriter/guide/using_numbered_lists2.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147418"><bookmark_value>numbering;paragraphs, on and off</bookmark_value>
-<bookmark_value>paragraphs; numbering on/off</bookmark_value>
-<bookmark_value>formatting;numbered lists</bookmark_value>
-<bookmark_value>inserting;numbering</bookmark_value>
-</bookmark>
-  <comment>MW changed "adding;" to "inserting;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3147418" role="heading" level="1" l10n="U" oldref="15"><variable id="using_numbered_lists2"><link href="text/swriter/guide/using_numbered_lists2.xhp" name="Adding Numbering">Adding Numbering</link> 
+      <bookmark_value>paragraphs; numbering on/off</bookmark_value>
+      <bookmark_value>formatting;numbered lists</bookmark_value>
+      <bookmark_value>inserting;numbering</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147418" role="heading" level="1" l10n="U"
+                 oldref="15"><variable id="using_numbered_lists2"><link href="text/swriter/guide/using_numbered_lists2.xhp" name="Adding Numbering">Adding Numbering</link> 
 </variable></paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3153396" role="paragraph" l10n="U" oldref="23">Select the paragraph(s) that you want to add numbering to.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149968" role="paragraph" l10n="CHG" oldref="24">On the <emph>Formatting</emph> Bar, click the <emph>Numbering On/Off</emph> icon 
-<image id="img_id3153125" src="res/commandimagelist/sc_defaultnumbering.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153125">Icon</alt>
+      <paragraph xml-lang="en-US" id="hd_id4188970" role="heading" level="2" l10n="NEW">To Add Numbering to a List</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="23">Select the paragraph(s) that you want to add numbering to.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149968" role="listitem" l10n="CHG" oldref="24">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item> icon 
+<image id="img_id3153125" src="res/commandimagelist/sc_defaultnumbering.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153125">Icon</alt>
 	</image>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="29">To change the formatting and the hierarchy of a numbered list, click in the list, and then open the <emph>Bullets and Numbering</emph> toolbar.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3153365" role="note" l10n="CHG" oldref="25">To remove numbering, select the numbered paragraphs, and then click the <emph>Numbering On/Off</emph> icon on the <emph>Formatting</emph> Bar.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3154233" role="heading" level="2" l10n="U" oldref="30">Formatting a Numbered List</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3154246" role="paragraph" l10n="CHG" oldref="16">To change the formatting of a numbered list, click in the list, then choose <emph>Format - Bullets and Numbering</emph>.</paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-   <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-   <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-   <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-   <embed href="text/swriter/guide/captions.xhp#captions"/>
-   <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-   <embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
-   
-  </section>
- </body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149573" role="listitem" l10n="CHG" oldref="29">To change the formatting and the hierarchy of a numbered list, click in the list, and then open the <emph>Bullets and Numbering</emph> toolbar.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id3153365" role="note" l10n="CHG" oldref="25">To remove numbering, select the numbered paragraphs, and then click the <emph>Numbering On/Off</emph> icon on the <emph>Formatting</emph> Bar.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3154233" role="heading" level="2" l10n="U"
+                 oldref="30">To Format a Numbered List</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154246" role="paragraph" l10n="CHG" oldref="16">To change the formatting of a numbered list, click in the list, then choose <emph>Format - Bullets and Numbering</emph>.</paragraph>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+         <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+         <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+         <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+         <embed href="text/swriter/guide/captions.xhp#captions"/>
+         <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+         <embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/using_numbering.xhp b/helpcontent2/source/text/swriter/guide/using_numbering.xhp
index ebea827fd8..36bda422bf 100644
--- a/helpcontent2/source/text/swriter/guide/using_numbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_numbering.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: using_numbering.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,81 +29,78 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideusing_numberingxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Numbering and Numbering Styles</title>
-<filename>/text/swriter/guide/using_numbering.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideusing_numberingxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Numbering and Numbering Styles</title>
+         <filename>/text/swriter/guide/using_numbering.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155174"><bookmark_value>numbering; manually/by styles</bookmark_value>
-<bookmark_value>manual numbering in text</bookmark_value>
-<bookmark_value>paragraph styles;numbering</bookmark_value>
-</bookmark>
-  <comment>MW deleted "applying;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155174" role="heading" level="1" l10n="U" oldref="30"><variable id="using_numbering"><link href="text/swriter/guide/using_numbering.xhp" name="Numbering and Numbering Styles">Numbering and Numbering Styles</link> 
+      <bookmark_value>manual numbering in text</bookmark_value>
+      <bookmark_value>paragraph styles;numbering</bookmark_value>
+</bookmark><comment>MW deleted "applying;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3155174" role="heading" level="1" l10n="U"
+                 oldref="30"><variable id="using_numbering"><link href="text/swriter/guide/using_numbering.xhp" name="Numbering and Numbering Styles">Numbering and Numbering Styles</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149818" role="paragraph" l10n="U" oldref="26">You can apply numbering to a paragraph manually or with a paragraph style.</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3155866" role="listitem" l10n="CHG" oldref="33">To apply numbering manually, click in the paragraph, and then click the <emph>Numbering On/Off </emph>icon on the <emph>Formatting</emph> Bar.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_id3153405" role="note" l10n="U" oldref="27">You cannot apply manual numbering to paragraphs that are listed under "Special Styles" in the Styles and Formatting window.</paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10711" role="paragraph" l10n="NEW"><comment>UFI: the following paras moved here from text\shared\01\06050000.xhp</comment>When you press Enter in a numbered or bulleted list, <item type="productname">%PRODUCTNAME</item> automatically numbers the next paragraph. To remove the numbering or bullet from the new paragraph, press Enter again.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">To change the hierarchical level of a bullet in a list, click in front of the paragraph, then press the Tab key.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN1072F" role="paragraph" l10n="NEW">To change the bullets or numbering format for the current paragraph only, select a character or word in the paragraph, choose Bullets and Numbering, and then click a new format. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10733" role="paragraph" l10n="NEW">To change the bullet or numbering format for all paragraphs in the list, ensure that the cursor is in the list, choose Bullets and Numbering, and then click a new format. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10737" role="paragraph" l10n="NEW">To apply the same bullet or numbering format to all paragraphs in the list, select all paragraphs, choose Bullets and Numbering, and then click a format.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN1073A" role="paragraph" l10n="CHG">You can also use the commands on the <link href="text/swriter/main0206.xhp" name="Numbering Object Bar">Bullets and Numbering</link> toolbar to edit a numbered or bulleted list. To change the numbering or bullet format, click the <emph>Bullets and Numbering</emph> icon.</paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3153123" role="heading" level="2" l10n="U" oldref="34">To apply numbering with a Paragraph Style</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153137" role="paragraph" l10n="U" oldref="31">Paragraph Styles give you greater control over numbering that you apply in a document. When you change the numbering format of the style, all paragraphs using the style are automatically updated.</paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149646" role="listitem" l10n="U" oldref="35">Choose <emph>Format - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles </emph>icon.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149599" role="listitem" l10n="U" oldref="36">Right-click the paragraph style that you want to apply numbering to, and then choose <emph>Modify</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149850" role="listitem" l10n="U" oldref="37">Click the <emph>Numbering </emph>tab.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="38">In the <emph>Numbering Styles</emph> box, select the type of numbering that you want to use.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3145113" role="listitem" l10n="U" oldref="39">Click <emph>OK</emph>.</paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149589" role="listitem" l10n="U" oldref="40">Apply the style to the paragraphs that you want to add numbering to.</paragraph>
-   </listitem>
-  </list>
-  <embed href="text/shared/00/00000004.xhp#related"/>
-  <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-  <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-  <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
-  <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-  <embed href="text/swriter/guide/captions.xhp#captions"/>
-  <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-  <embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
-  <embed href="text/swriter/guide/auto_numbering.xhp#auto_numbering"/>
- </body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_id3149818" role="paragraph" l10n="U" oldref="26">You can apply numbering to a paragraph manually or with a paragraph style.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id6140629" role="heading" level="2" l10n="NEW">To Apply Numbering Manually</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155866" role="listitem" l10n="CHG" oldref="33">To apply numbering manually, click in the paragraph, and then click the <item type="menuitem">Numbering On/Off</item>
+         <emph/>icon on the <item type="menuitem">Formatting</item> Bar.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153405" role="note" l10n="U" oldref="27">You cannot apply manual numbering to paragraphs that are listed under "Special Styles" in the Styles and Formatting window.</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10711" role="listitem" l10n="NEW"><comment>UFI: the following paras moved here from text\shared\01\06050000.xhp</comment>When you press Enter in a numbered or bulleted list, <item type="productname">%PRODUCTNAME</item> automatically numbers the next paragraph. To remove the numbering or bullet from the new paragraph, press Enter again.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1072B" role="listitem" l10n="NEW">To change the hierarchical level of a bullet in a list, click in front of the paragraph, then press the Tab key.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1072F" role="listitem" l10n="NEW">To change the bullets or numbering format for the current paragraph only, select a character or word in the paragraph, choose <item type="menuitem">Format - Bullets and Numbering</item>, and then click a new format. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10733" role="listitem" l10n="NEW">To change the bullet or numbering format for all paragraphs in the list, ensure that the cursor is in the list, choose <item type="menuitem">Format - Bullets and Numbering</item>, and then click a new format. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10737" role="listitem" l10n="NEW">To apply the same bullet or numbering format to all paragraphs in the list, select all paragraphs, choose <item type="menuitem">Format - Bullets and Numbering</item>, and then click a format.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1073A" role="paragraph" l10n="CHG">You can also use the commands on the <link href="text/swriter/main0206.xhp" name="Numbering Object Bar">Bullets and Numbering</link> toolbar to edit a numbered or bulleted list. To change the numbering or bullet format, click the <emph>Bullets and Numbering</emph> icon.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3153123" role="heading" level="2" l10n="U"
+                 oldref="34">To Apply Numbering With a Paragraph Style</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153137" role="paragraph" l10n="U" oldref="31">Paragraph Styles give you greater control over numbering that you apply in a document. When you change the numbering format of the style, all paragraphs using the style are automatically updated.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149646" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem">Format - Styles and Formatting</item>, and then click the <item type="menuitem">Paragraph Styles</item>
+               <emph/>icon.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149599" role="listitem" l10n="U" oldref="36">Right-click the paragraph style that you want to apply numbering to, and then choose <emph>Modify</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149850" role="listitem" l10n="U" oldref="37">Click the <item type="menuitem">Outline &amp; Numbering</item>
+               <emph/>tab.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="38">In the <item type="menuitem">Numbering Style</item> box, select the type of numbering that you want to use.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3145113" role="listitem" l10n="U" oldref="39">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149589" role="listitem" l10n="U" oldref="40">Apply the style to the paragraphs that you want to add numbering to.</paragraph>
+         </listitem>
+      </list>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+      <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+      <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+      <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+      <embed href="text/swriter/guide/captions.xhp#captions"/>
+      <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+      <embed href="text/swriter/guide/numbering_paras.xhp#numbering_paras"/>
+      <embed href="text/swriter/guide/auto_numbering.xhp#auto_numbering"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
index b9400f50b4..5471ba9df2 100644
--- a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: using_thesaurus.xhp,v $
- * $Revision: 1.7.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,51 +29,54 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
-<topic id="textswriterguideusing_thesaurusxml" indexer="include">
-<title id="tit" xml-lang="en-US">Thesaurus</title>
-<filename>/text/swriter/guide/using_thesaurus.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideusing_thesaurusxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Thesaurus</title>
+         <filename>/text/swriter/guide/using_thesaurus.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145576"><bookmark_value>thesaurus; related words</bookmark_value>
-<bookmark_value>related words in thesaurus</bookmark_value>
-<bookmark_value>spelling in thesaurus</bookmark_value>
-<bookmark_value>dictionaries; thesaurus</bookmark_value>
-<bookmark_value>lexicon, see thesaurus</bookmark_value>
-<bookmark_value>synonyms in thesaurus</bookmark_value>
-<bookmark_value>searching;synonyms</bookmark_value>
+      <bookmark_value>related words in thesaurus</bookmark_value>
+      <bookmark_value>spelling in thesaurus</bookmark_value>
+      <bookmark_value>dictionaries; thesaurus</bookmark_value>
+      <bookmark_value>lexicon, see thesaurus</bookmark_value>
+      <bookmark_value>synonyms in thesaurus</bookmark_value>
+      <bookmark_value>searching;synonyms</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3145576" xml-lang="en-US" level="1" l10n="U" oldref="15"><variable id="using_thesaurus"><link href="text/swriter/guide/using_thesaurus.xhp" name="Thesaurus">Thesaurus</link>
+<paragraph xml-lang="en-US" id="hd_id3145576" role="heading" level="1" l10n="U"
+                 oldref="15"><variable id="using_thesaurus"><link href="text/swriter/guide/using_thesaurus.xhp" name="Thesaurus">Thesaurus</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149820" xml-lang="en-US" l10n="U" oldref="16">You can use the thesaurus to look up synonyms, and related words.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155920" xml-lang="en-US" l10n="U" oldref="17">Click in the word that you want to look up.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155867" xml-lang="en-US" l10n="CHG" oldref="39">Choose <emph>Tools - Language - Thesaurus</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="par_id3149820" role="paragraph" l10n="U" oldref="16">You can use the thesaurus to look up synonyms or related terms.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155920" role="listitem" l10n="U" oldref="17">Click in the word that you want to look up or replace.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155867" role="listitem" l10n="CHG" oldref="39">Choose <emph>Tools - Language - Thesaurus</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149848" xml-lang="en-US" l10n="U" oldref="40">In the <emph>Meaning </emph>list, select the definition that matches the context of the word.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3153136" xml-lang="en-US" l10n="U" oldref="45">Select the replacement word in the <emph>Synonym </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149644" xml-lang="en-US" l10n="U" oldref="46">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3145113" xml-lang="en-US" l10n="U" oldref="18">To look up the word in a different language, click <emph>Language </emph>in the<emph> Thesaurus</emph> dialog, select one of the installed languages, and then click <emph>OK</emph>. In the <emph>Thesaurus</emph> dialog, click <emph>Search</emph>. The thesaurus may not be available for all installed languages.</paragraph>
-<paragraph role="paragraph" id="par_id3156263" xml-lang="en-US" l10n="U" oldref="19">If you applied a different language setting to individual words, or paragraphs, the thesaurus for the applied language is used.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
-<paragraph role="paragraph" id="par_id3154392" xml-lang="en-US" l10n="U" oldref="41"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
-</body>
-</helpdocument>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="U" oldref="40">In the Alternatives list, click an entry to copy that related term to the "Replace with" text box.</paragraph>
+         </listitem>
+          <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" l10n="U" oldref="45">Optionally double-click an entry to look up related terms for that entry. On your keyboard, you can also press the arrow up or down keys to select an entry. Then press Return to replace, or press the spacebar to look up.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149644" role="listitem" l10n="U" oldref="46">Click <emph>Replace</emph>.</paragraph>
+         </listitem>
+      </list>
+
+
+
+      <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="19">Initially, the thesaurus uses the language of the selected word in the document, if a thesaurus library for that language is installed. The title bar of the Thesaurus dialog displays the language in use.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3196263" role="paragraph" l10n="U" oldref="19">If a thesaurus library is installed for the language of a word, the context menu of the word shows a Synonyms submenu. Select any of the terms from the submenu to replace the word.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+      <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
+      <paragraph xml-lang="en-US" id="par_id3154392" role="paragraph" l10n="U" oldref="41"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index 4d9745cff0..8e52543a18 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: word_completion.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,48 +32,48 @@
  
 	
 <meta>
-<topic id="textswriterguideword_completionxml" indexer="include">
-<title id="tit" xml-lang="en-US">Word Completion for Text Documents</title>
-<filename>/text/swriter/guide/word_completion.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textswriterguideword_completionxml" indexer="include">
+         <title xml-lang="en-US" id="tit">Word Completion for Text Documents</title>
+         <filename>/text/swriter/guide/word_completion.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148882"><bookmark_value>automatic word completion</bookmark_value>
-<bookmark_value>completion of words</bookmark_value>
-<bookmark_value>AutoCorrect function; word completion</bookmark_value>
-<bookmark_value>word completion;using/disabling</bookmark_value>
-<bookmark_value>disabling;word completion</bookmark_value>
-<bookmark_value>switching off;word completion</bookmark_value>
-<bookmark_value>deactivating;word completion</bookmark_value>
-<bookmark_value>refusing word completions</bookmark_value>
-<bookmark_value>rejecting word completions</bookmark_value>
+      <bookmark_value>completion of words</bookmark_value>
+      <bookmark_value>AutoCorrect function; word completion</bookmark_value>
+      <bookmark_value>word completion;using/disabling</bookmark_value>
+      <bookmark_value>disabling;word completion</bookmark_value>
+      <bookmark_value>switching off;word completion</bookmark_value>
+      <bookmark_value>deactivating;word completion</bookmark_value>
+      <bookmark_value>refusing word completions</bookmark_value>
+      <bookmark_value>rejecting word completions</bookmark_value>
 </bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
+<paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
-<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10794" xml-lang="en-US" l10n="NEW">By default, you accept the word completion by pressing the Enter key. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1079B" xml-lang="en-US" l10n="NEW"> To reject the word completion, continue typing with any other key. </paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079E" xml-lang="en-US" level="2" l10n="NEW"> Switching off the word completion </paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph> - Word Completion</emph> . </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107AD" xml-lang="en-US" l10n="NEW"> Clear <emph>Enable word completion</emph> . </paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id7504806" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="par_idN1076F" role="paragraph" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to cycle through the available words. To cycle in the opposite direction, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab. </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1078D" role="heading" level="2" l10n="NEW"> To Accept/Reject a Word Completion</paragraph>
+      <list type="unordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10794" role="listitem" l10n="NEW">By default, you accept the word completion by pressing the Enter key. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1079B" role="listitem" l10n="NEW"> To reject the word completion, continue typing with any other key. </paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_idN1079E" role="heading" level="2" l10n="NEW"> To Switch off the Word Completion </paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107A5" role="listitem" l10n="NEW"> Choose <item type="menuitem">Tools - AutoCorrect Options - Word Completion</item>. </paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107AD" role="listitem" l10n="NEW"> Clear <emph>Enable word completion</emph> . </paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_id7504806" role="paragraph" l10n="NEW"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
index 99d080035d..38cfe8fceb 100644
--- a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: word_completion_adjust.xhp,v $
- * $Revision: 1.5.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,80 +29,58 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textswriterguideword_completion_adjustxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Fine-Tuning the Word Completion for Text Documents</title>
-<filename>/text/swriter/guide/word_completion_adjust.xhp</filename>
-</topic>
-</meta>
-<body>
-  
-  
-  
+      <topic id="textswriterguideword_completion_adjustxhp" indexer="include"
+             status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Fine-Tuning the Word Completion for Text Documents</title>
+         <filename>/text/swriter/guide/word_completion_adjust.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148882"><bookmark_value>settings;word completion</bookmark_value>
-<bookmark_value>word completion;settings</bookmark_value>
-<bookmark_value>text documents;word completion settings</bookmark_value>
-<bookmark_value>weekdays; automatically completing</bookmark_value>
-<bookmark_value>months; automatically completing</bookmark_value>
-</bookmark>
-  <comment>mw copied two entries from word_completion.xhp and created three new entries</comment>
-  <paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link> 
-</variable></paragraph>
-  <comment>MW created this guide by splitting word_completion.xhp</comment>
-  <paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behaviour. If you want, you can also save the current list of collected words so that it can be used in the next session. </paragraph>
-  <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <emph>Tools - AutoCorrect - Word Completion</emph> and select any of the following options: </paragraph>
-  <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW"> Inserting an additional space character </paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW"> Select <emph>Append space</emph>. </paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW"> The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character. </paragraph>
-  <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW"> Selecting the accept key </paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW"> Choose the key to accept the suggested word using the <emph>Accept with</emph> list box. </paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW"> Selecting the number of characters </paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW"> Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list. </paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW"> Selecting the scope of collected words </paragraph>
-  <list type="unordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="NEW"> Select <emph>When closing a document, save the list for later use in other documents</emph>. </paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW"> Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="NEW"> If you do not select the checkbox, the list is only valid as long as the current document is open. </paragraph>
-    <paragraph xml-lang="en-US" id="par_id2634968" role="paragraph" l10n="NEW">If you want the word list to exist longer than the current %PRODUCTNAME session, save it as a document, as described in the following section.</paragraph>
-   </listitem>
-  </list>
-  <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW"> Working with the word list</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW"> If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected. </paragraph>
-  <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW"> Use the word list to always start with a defined set of technical terms for the word completion feature. </paragraph>
-  <list type="ordered">
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN10BA7" role="paragraph" l10n="NEW"> Open the text document that contains the terms that you want to use for word completion. </paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10BAB" role="paragraph" l10n="NEW"> The word completion feature collects the words. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN107ED" role="paragraph" l10n="NEW"> Select all or some of the words in the list. </paragraph>
-   </listitem>
-   <listitem>
-    <paragraph xml-lang="en-US" id="par_idN107F4" role="paragraph" l10n="NEW"> Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words. </paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10BC6" role="paragraph" l10n="NEW"> Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words. </paragraph>
-   </listitem>
-  </list>
-  <section id="relatedtopics">
-   
-   <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion </link></paragraph>
-   <paragraph xml-lang="en-US" id="par_id5458845" role="paragraph" l10n="NEW"><link href="text/swriter/guide/word_completion.xhp">Using Word Completion</link></paragraph>
-   
-  </section>
- </body>
-</helpdocument>
+      <bookmark_value>word completion;settings</bookmark_value>
+      <bookmark_value>text documents;word completion settings</bookmark_value>
+      <bookmark_value>weekdays; automatically completing</bookmark_value>
+      <bookmark_value>months; automatically completing</bookmark_value>
+</bookmark><comment>mw copied two entries from word_completion.xhp and created three new entries</comment>
+<paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link>
+</variable></paragraph><comment>MW created this guide by splitting word_completion.xhp</comment>
+<paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behavior. If you want, you can also save the current list of collected words so that it can be used in the next session.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <item type="menuitem">Tools – AutoCorrect Options - Word Completion</item> and select any of the following options:</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW">To Insert an Additional Space Character</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW">Select <emph>Append space</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW">The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW">To Define the Accept Key</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW">Choose the key to accept the suggested word using the <emph>Accept with</emph> list box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW">To Select the Minimum Number of Characters</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW">Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW">To Select the Scope of Collected Words</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="CHG">Disable the option <emph>When closing a document, remove the words collected from it from the list</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW">Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="CHG">If you enable the checkbox, the list is only valid as long as the current document is open.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2634968" role="paragraph" l10n="NEW">If you want the word list to exist longer than the current %PRODUCTNAME session, save it as a document, as described in the following section.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW">To Use the Word List for Further Sessions</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW">Use the word list to always start with a defined set of technical terms for the word completion feature.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10BA7" role="listitem" l10n="NEW">Open the text document that contains the terms that you want to use for word completion.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10BAB" role="listitem" l10n="NEW">The word completion feature collects the words.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW">Select all or some of the words in the list.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW">Use <switchinline select="sys"><caseinline select="MAC">Command 
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10BC6" role="listitem" l10n="NEW">Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id5458845" role="paragraph" l10n="NEW"><link href="text/swriter/guide/word_completion.xhp">Using Word Completion</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/words_count.xhp b/helpcontent2/source/text/swriter/guide/words_count.xhp
index 0bc28549a4..bf33aedb3c 100755
--- a/helpcontent2/source/text/swriter/guide/words_count.xhp
+++ b/helpcontent2/source/text/swriter/guide/words_count.xhp
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: words_count.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,40 +29,42 @@
  *
  ************************************************************************
  -->
-	
-<helpdocument version="1.0">
+
+
 <meta>
-<topic id="textswriterguidewords_countxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Counting Words</title>
-<filename>/text/swriter/guide/words_count.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T15:19:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidewords_countxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Counting Words</title>
+         <filename>/text/swriter/guide/words_count.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149686"><bookmark_value>words; counting in text</bookmark_value>
-<bookmark_value>number of words</bookmark_value>
-<bookmark_value>documents; number of words/characters</bookmark_value>
-<bookmark_value>text; number of words/characters</bookmark_value>
-<bookmark_value>characters; counting</bookmark_value>
-<bookmark_value>number of characters</bookmark_value>
-<bookmark_value>counting words</bookmark_value>
-<bookmark_value>word counts</bookmark_value>
+      <bookmark_value>number of words</bookmark_value>
+      <bookmark_value>documents; number of words/characters</bookmark_value>
+      <bookmark_value>text; number of words/characters</bookmark_value>
+      <bookmark_value>characters; counting</bookmark_value>
+      <bookmark_value>number of characters</bookmark_value>
+      <bookmark_value>counting words</bookmark_value>
+      <bookmark_value>word counts</bookmark_value>
 </bookmark><comment>MW deleted "character counts"</comment>
-<paragraph role="heading" id="hd_id3149686" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="words_count"><link href="text/swriter/guide/words_count.xhp" name="Counting Words">Counting Words</link>
+<paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="1" l10n="U" oldref="1"><variable id="words_count"><link href="text/swriter/guide/words_count.xhp" name="Counting Words">Counting Words</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN106D1" xml-lang="en-US" l10n="NEW">If you want to count only some text of your document, select the text.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149821" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Tools - Word Count</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN106E2" xml-lang="en-US" l10n="NEW">To get some more statistics about the document, choose <emph>File - Properties - Statistics</emph>.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="U" oldref="4"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
-</body>
-</helpdocument>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN106D1" role="listitem" l10n="NEW">If you want to count only some text of your document, select the text.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149821" role="listitem" l10n="CHG" oldref="5">Choose <emph>Tools - Word Count</emph>.</paragraph>
+         </listitem>
+      </list>
+      <section id="how">
+         <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does $PRODUCTNAME count words?</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph>
+      </section>
+      <paragraph xml-lang="en-US" id="par_idN106E2" role="tip" l10n="NEW">To get some more statistics about the document, choose <emph>File - Properties - Statistics</emph>.</paragraph>
+      <embed href="text/shared/00/00000004.xhp#related"/>
+      <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="U" oldref="4"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/wrap.xhp b/helpcontent2/source/text/swriter/guide/wrap.xhp
index 4da7c9a947..11adbf69aa 100644
--- a/helpcontent2/source/text/swriter/guide/wrap.xhp
+++ b/helpcontent2/source/text/swriter/guide/wrap.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrap.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,75 +27,77 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswriterguidewrapxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Wrapping Text Around Objects</title>
-<filename>/text/swriter/guide/wrap.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-29T14:24:40">FPE: Deleted screenshots</lastedited>
-</history>
-</meta>
-<body>
+      <topic id="textswriterguidewrapxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Wrapping Text Around Objects</title>
+         <filename>/text/swriter/guide/wrap.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154486"><bookmark_value>text wrap around objects</bookmark_value>
-<bookmark_value>contour editor</bookmark_value>
-<bookmark_value>contour wrap</bookmark_value>
-<bookmark_value>text; formatting around objects</bookmark_value>
-<bookmark_value>formatting; contour wrap</bookmark_value>
-<bookmark_value>objects; contour wrap</bookmark_value>
-<bookmark_value>wrapping text;editing contours</bookmark_value>
-<bookmark_value>editors;contour editor</bookmark_value>
+      <bookmark_value>contour editor</bookmark_value>
+      <bookmark_value>contour wrap</bookmark_value>
+      <bookmark_value>text; formatting around objects</bookmark_value>
+      <bookmark_value>formatting; contour wrap</bookmark_value>
+      <bookmark_value>objects; contour wrap</bookmark_value>
+      <bookmark_value>wrapping text;editing contours</bookmark_value>
+      <bookmark_value>editors;contour editor</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3154486" xml-lang="en-US" level="1" l10n="U" oldref="8"><variable id="wrap"><link href="text/swriter/guide/wrap.xhp" name="Wrapping Text Around Objects">Wrapping Text Around Objects</link>
+<paragraph xml-lang="en-US" id="hd_id3154486" role="heading" level="1" l10n="U" oldref="8"><variable id="wrap"><link href="text/swriter/guide/wrap.xhp" name="Wrapping Text Around Objects">Wrapping Text Around Objects</link>
 </variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149696" xml-lang="en-US" l10n="U" oldref="9">Select the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155907" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Format - Wrap</emph>, and then choose the wrapping style that you want to apply.</paragraph>
-<paragraph role="listitem" id="par_id3155859" xml-lang="en-US" l10n="U" oldref="4">The current wrapping style is indicated by a bullet.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3149834" xml-lang="en-US" level="2" l10n="U" oldref="14">Specifying the Wrapping Properties</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154079" xml-lang="en-US" l10n="U" oldref="15">Select the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153396" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Format - Graphics</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="3">
-<listitem>
-<paragraph role="listitem" id="par_id3153370" xml-lang="en-US" l10n="U" oldref="5">Set the options that you want.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="16">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154247" xml-lang="en-US" level="3" l10n="U" oldref="17">To change the wrapping contour of a graphic:</paragraph>
-<paragraph role="paragraph" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="18">You can change the shape that the text wraps around.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="19">Select the graphic, right-click, and then choose <emph>Wrap - Edit Contour</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="listitem" id="par_id3150231" xml-lang="en-US" l10n="U" oldref="7">Use the tools to draw a new contour, and then click the <emph>Apply </emph>icon (green check mark).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150947" xml-lang="en-US" l10n="U" oldref="21">Close the <emph>Contour Editor </emph>window.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<paragraph role="paragraph" id="par_id3150520" xml-lang="en-US" l10n="U" oldref="22"><link href="text/swriter/01/05060201.xhp" name="Contour Editor">Contour Editor</link></paragraph>
-</section>
-</body>
-</helpdocument>
+      <paragraph xml-lang="en-US" id="hd_id4792321" role="heading" level="2" l10n="NEW">To Wrap Text Around an Object</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3149696" role="listitem" l10n="U" oldref="9">Select the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="10">Choose <emph>Format - Wrap</emph>, and then choose the wrapping style that you want to apply.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155859" role="listitem" l10n="U" oldref="4">The current wrapping style is indicated by a bullet.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3149834" role="heading" level="2" l10n="U"
+                 oldref="14">To Specify the Wrapping Properties</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154079" role="listitem" l10n="U" oldref="15">Select the object.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="11">Choose <emph>Format - Graphics</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="3">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153370" role="listitem" l10n="U" oldref="5">Set the options that you want.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3153386" role="listitem" l10n="U" oldref="16">Click <emph>OK</emph>.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="hd_id3154247" role="heading" level="2" l10n="U"
+                 oldref="17">To Change the Wrapping Contour of a Graphic</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154262" role="paragraph" l10n="U" oldref="18">You can change the shape that the text wraps around.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3154860" role="listitem" l10n="U" oldref="19">Select the graphic, right-click, and then choose <emph>Wrap - Edit Contour</emph>.</paragraph>
+         </listitem>
+      </list>
+      <list type="ordered" startwith="2">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150231" role="listitem" l10n="U" oldref="7">Use the tools to draw a new contour, and then click the <item type="menuitem">Apply</item>
+               <emph/>icon (green check mark).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3150947" role="listitem" l10n="U" oldref="21">Close the <item type="menuitem">Contour Editor</item>
+               <emph/>window.</paragraph>
+         </listitem>
+      </list>
+      <section id="relatedtopics">
+         <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
+         <paragraph xml-lang="en-US" id="par_id3150520" role="paragraph" l10n="U" oldref="22"><link href="text/swriter/01/05060201.xhp" name="Contour Editor">Contour Editor</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/main0000.xhp b/helpcontent2/source/text/swriter/main0000.xhp
index 89a15fdf64..1fa9e8885b 100755
--- a/helpcontent2/source/text/swriter/main0000.xhp
+++ b/helpcontent2/source/text/swriter/main0000.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0000.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0100.xhp b/helpcontent2/source/text/swriter/main0100.xhp
index cd43bba990..ff9774974b 100644
--- a/helpcontent2/source/text/swriter/main0100.xhp
+++ b/helpcontent2/source/text/swriter/main0100.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0100.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0101.xhp b/helpcontent2/source/text/swriter/main0101.xhp
index 62646fb8cd..6b1a760ff5 100644
--- a/helpcontent2/source/text/swriter/main0101.xhp
+++ b/helpcontent2/source/text/swriter/main0101.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0101.xhp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0102.xhp b/helpcontent2/source/text/swriter/main0102.xhp
index df834912aa..8c1684b9c4 100755
--- a/helpcontent2/source/text/swriter/main0102.xhp
+++ b/helpcontent2/source/text/swriter/main0102.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp
index 00b1034574..ac5657d92b 100755
--- a/helpcontent2/source/text/swriter/main0103.xhp
+++ b/helpcontent2/source/text/swriter/main0103.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0103.xhp,v $
- * $Revision: 1.6.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp
index 5b79e2079b..5510378888 100755
--- a/helpcontent2/source/text/swriter/main0104.xhp
+++ b/helpcontent2/source/text/swriter/main0104.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 <section id="einfuegen">
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/>
 <paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
-<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, notes, special characters, graphics, and objects from other applications.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, comments, special characters, graphics, and objects from other applications.</ahelp></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3155376" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/swriter/01/04010000.xhp" name="Manual Break">Manual Break</link></paragraph>
 <embed href="text/swriter/01/04010000.xhp#umbruch"/>
@@ -66,7 +63,7 @@
 <embed href="text/swriter/01/04040000.xhp#textmarkeein"/>
 <paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="2" l10n="U" oldref="25"><link href="text/swriter/01/04090002.xhp" name="Cross-reference">Cross-reference</link></paragraph>
 <embed href="text/swriter/01/04090002.xhp#reftext"/>
-<paragraph role="heading" id="hd_id3147569" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04050000.xhp" name="Note">Note</link></paragraph>
+<paragraph role="heading" id="hd_id3147569" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
 <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
 <paragraph role="heading" id="hd_id3147595" xml-lang="en-US" level="2" l10n="U" oldref="24"><link href="text/swriter/01/04200000.xhp" name="Script">Script</link></paragraph>
 <embed href="text/swriter/01/04200000.xhp#scripttext"/>
@@ -77,7 +74,7 @@
 <embed href="text/swriter/01/04130000.xhp#rahm"/>
 <paragraph role="heading" id="hd_id3149917" xml-lang="en-US" level="2" l10n="U" oldref="15"><link href="text/swriter/01/04150000.xhp" name="Table">Table</link></paragraph>
 <embed href="text/swriter/01/04150000.xhp#tabelletext"/>
-<paragraph role="heading" id="hd_id3149944" xml-lang="en-US" level="2" l10n="U" oldref="22"><link href="text/swriter/01/04210000.xhp" name="Horizontal Line">Horizontal Line</link></paragraph>
+<paragraph role="heading" id="hd_id3149944" xml-lang="en-US" level="2" l10n="U" oldref="22"><link href="text/swriter/01/04210000.xhp" name="Horizontal Rule">Horizontal Rule</link></paragraph>
 <embed href="text/swriter/01/04210000.xhp#horizontaltext"/>
 <embed href="text/shared/01/04990000.xhp#grafik"/>
 <embed href="text/shared/01/04150000.xhp#objekt"/>
diff --git a/helpcontent2/source/text/swriter/main0105.xhp b/helpcontent2/source/text/swriter/main0105.xhp
index 21584026c2..86ddf42e62 100644
--- a/helpcontent2/source/text/swriter/main0105.xhp
+++ b/helpcontent2/source/text/swriter/main0105.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0105.xhp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0106.xhp b/helpcontent2/source/text/swriter/main0106.xhp
index 75b6b54b22..9e47acbb77 100755
--- a/helpcontent2/source/text/swriter/main0106.xhp
+++ b/helpcontent2/source/text/swriter/main0106.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0107.xhp b/helpcontent2/source/text/swriter/main0107.xhp
index e8e69b9f5e..bc7b9c9b02 100644
--- a/helpcontent2/source/text/swriter/main0107.xhp
+++ b/helpcontent2/source/text/swriter/main0107.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0107.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0110.xhp b/helpcontent2/source/text/swriter/main0110.xhp
index fe88a53de0..b7b9f4454e 100755
--- a/helpcontent2/source/text/swriter/main0110.xhp
+++ b/helpcontent2/source/text/swriter/main0110.xhp
@@ -7,13 +7,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0110.xhp,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0200.xhp b/helpcontent2/source/text/swriter/main0200.xhp
index 0891409861..a86e3b4e62 100755
--- a/helpcontent2/source/text/swriter/main0200.xhp
+++ b/helpcontent2/source/text/swriter/main0200.xhp
@@ -5,13 +5,10 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0200.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,23 +29,19 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswritermain0200xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Toolbars</title>
 <filename>/text/swriter/main0200.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-18T11:05:53">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="symbolleisten">
 <paragraph role="heading" id="hd_id3145782" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="main0200"><link href="text/swriter/main0200.xhp" name="Toolbars">Toolbars</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145481" xml-lang="en-US" l10n="U" oldref="2">This section provides an overview of the toolbars available in $[officename] Writer.<embedvar href="text/shared/00/00000007.xhp#symbolleistenneu"/>
+<paragraph role="paragraph" id="par_id3145481" xml-lang="en-US" l10n="U" oldref="2">This section provides an overview of the toolbars available in $[officename] Writer. <embedvar href="text/shared/00/00000007.xhp#symbolleistenneu"/>
 </paragraph>
 </section>
 <sort order="asc">
@@ -58,6 +51,9 @@
 <section id="Section2">
 <embed href="text/swriter/main0202.xhp#objektleisteeingabemodus"/>
 </section>
+<section id="Section33">
+<embed href="text/simpress/main0210.xhp#werkzeugleiste"/>
+</section>
 <section id="Section3">
 <embed href="text/swriter/main0203.xhp#objektleistegrafik"/>
 </section>
diff --git a/helpcontent2/source/text/swriter/main0202.xhp b/helpcontent2/source/text/swriter/main0202.xhp
index cabd6b9ad1..6f01a2b7cf 100644
--- a/helpcontent2/source/text/swriter/main0202.xhp
+++ b/helpcontent2/source/text/swriter/main0202.xhp
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0202.xhp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,95 +27,102 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textswritermain0202xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Bar</title>
-<filename>/text/swriter/main0202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T15:13:48">UFI: inserted icons at end of file</lastedited>
-</history>
-</meta>
-<body>
-<section id="objektleisteeingabemodus">
+      <topic id="textswritermain0202xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Formatting Bar</title>
+         <filename>/text/swriter/main0202.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="objektleisteeingabemodus">
 <bookmark xml-lang="en-US" branch="hid/HID_TEXT_TOOLBOX" id="bm_id3154281" localize="false"/>
-<paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0202.xhp" name="Formatting Bar">Formatting Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3147762" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_TEXT_TOOLBOX">The Formatting bar contains several text formatting functions.</ahelp></paragraph>
-</section>
-<embed href="text/shared/02/01230000.xhp#stylist"/>
-<embed href="text/shared/02/01230000.xhp#systylist"/>
-<embed href="text/shared/02/02010000.xhp#benvor"/>
-<embed href="text/shared/02/02010000.xhp#sylistenfeld"/>
-<embed href="text/shared/02/02020000.xhp#schriftart"/>
-<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
-<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<embed href="text/shared/01/05110100.xhp#fett"/>
-<embed href="text/shared/00/00040502.xhp#syfett"/>
-<embed href="text/shared/01/05110200.xhp#kursiv"/>
-<embed href="text/shared/00/00040502.xhp#sykursiv"/>
-<embed href="text/shared/01/05110300.xhp#unter"/>
-<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<embed href="text/shared/01/05080100.xhp#links"/>
-<embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
-<embed href="text/shared/01/05080300.xhp#zentriert"/>
-<embed href="text/shared/00/00040502.xhp#syzentriert"/>
-<embed href="text/shared/01/05080200.xhp#rechts"/>
-<embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
-<embed href="text/shared/01/05080400.xhp#block"/>
-<embed href="text/shared/00/00040502.xhp#syblocksatz"/>
-<embed href="text/swriter/02/02110000.xhp#numerierung"/>
-<embed href="text/swriter/02/02110000.xhp#synumerierung"/>
-<embed href="text/shared/02/06120000.xhp#aufzaehlung"/>
-<embed href="text/shared/02/06120000.xhp#syaufzaehlung"/>
-<embed href="text/shared/02/02130000.xhp#einzvermindern"/>
-<embed href="text/shared/02/02130000.xhp#syeinzvermindern"/>
-<embed href="text/shared/02/02140000.xhp#einzerhoehen"/>
-<embed href="text/shared/02/02140000.xhp#syeinzerhoehen"/>
-<paragraph role="heading" id="hd_id3149593" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/shared/01/05020200.xhp" name="Font Color">Font Color</link></paragraph>
-<embed href="text/shared/01/05020200.xhp#textfarbe"/>
-<embed href="text/shared/00/00000004.xhp#sytxtfarbe"/>
-<embed href="text/shared/02/02160000.xhp#zeichenhintergrund"/>
-<embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
-<paragraph role="heading" id="hd_id3149887" xml-lang="en-US" level="2" l10n="U" oldref="10">Additional icons</paragraph>
-<paragraph role="paragraph" id="par_id3149900" xml-lang="en-US" l10n="CHG" oldref="11">If <link href="text/shared/00/00000005.xhp#ctl" name="CTL">CTL</link> support is enabled, two additional icons are visible.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_PARA_LEFT_TO_RIGHT" id="bm_id2946959" localize="false"/><!-- HID added by script -->
+<paragraph xml-lang="en-US" id="hd_id3154270" role="heading" level="1" l10n="CHG"
+                    oldref="1"><link href="text/swriter/main0202.xhp" name="Formatting Bar">Formatting Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147762" role="paragraph" l10n="CHG" oldref="2"><ahelp hid="HID_TEXT_TOOLBOX">The Formatting bar contains several text formatting functions.</ahelp></paragraph>
+      </section>
+      <embed href="text/shared/02/01230000.xhp#stylist"/>
+      <embed href="text/shared/02/01230000.xhp#systylist"/>
+      <embed href="text/shared/02/02010000.xhp#benvor"/>
+      <embed href="text/shared/02/02010000.xhp#sylistenfeld"/>
+      <embed href="text/shared/02/02020000.xhp#schriftart"/>
+      <embed href="text/shared/02/02020000.xhp#syschriftart"/>
+      <embed href="text/shared/02/02030000.xhp#schriftgroesse"/>
+      <embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
+      <embed href="text/shared/01/05110100.xhp#fett"/>
+      <embed href="text/shared/00/00040502.xhp#syfett"/>
+      <embed href="text/shared/01/05110200.xhp#kursiv"/>
+      <embed href="text/shared/00/00040502.xhp#sykursiv"/>
+      <embed href="text/shared/01/05110300.xhp#unter"/>
+      <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+      <embed href="text/shared/01/05080100.xhp#links"/>
+      <embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
+      <embed href="text/shared/01/05080300.xhp#zentriert"/>
+      <embed href="text/shared/00/00040502.xhp#syzentriert"/>
+      <embed href="text/shared/01/05080200.xhp#rechts"/>
+      <embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
+      <embed href="text/shared/01/05080400.xhp#block"/>
+      <embed href="text/shared/00/00040502.xhp#syblocksatz"/>
+      <embed href="text/swriter/02/02110000.xhp#numerierung"/>
+      <embed href="text/swriter/02/02110000.xhp#synumerierung"/>
+      <embed href="text/shared/02/06120000.xhp#aufzaehlung"/>
+      <embed href="text/shared/02/06120000.xhp#syaufzaehlung"/>
+      <embed href="text/shared/02/02130000.xhp#einzvermindern"/>
+      <embed href="text/shared/02/02130000.xhp#syeinzvermindern"/>
+      <embed href="text/shared/02/02140000.xhp#einzerhoehen"/>
+      <embed href="text/shared/02/02140000.xhp#syeinzerhoehen"/>
+      <paragraph xml-lang="en-US" id="hd_id3149593" role="heading" level="2" l10n="U" oldref="9"><link href="text/shared/01/05020200.xhp" name="Font Color">Font Color</link></paragraph>
+      <embed href="text/shared/01/05020200.xhp#textfarbe"/>
+      <embed href="text/shared/00/00000004.xhp#sytxtfarbe"/>
+      <embed href="text/shared/02/02160000.xhp#zeichenhintergrund"/>
+      <embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
+      <embed href="text/shared/02/02170000.xhp#absatzhintergrund"/>
+      <embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+      <paragraph xml-lang="en-US" id="hd_id3149887" role="heading" level="2" l10n="U"
+                 oldref="10">Additional icons</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Grow" id="bm_id0122200902451213" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0122200903085320" role="heading" level="2" l10n="NEW">Increase Font</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0122200903085371" role="paragraph" l10n="NEW"><ahelp hid=".">Increases the font size of the selected text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Shrink" id="bm_id0122200902452932" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id012220090308532" role="heading" level="2" l10n="NEW">Reduce Font</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0122200903085351" role="paragraph" l10n="NEW"><ahelp hid=".">Reduces the font size of the selected text.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149900" role="paragraph" l10n="CHG" oldref="11">If <link href="text/shared/00/00000005.xhp#ctl" name="CTL">CTL</link> support is enabled, two additional icons are visible.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_PARA_LEFT_TO_RIGHT" id="bm_id2946959" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ParaLeftToRight" id="bm_id3149957" localize="false"/>
-<paragraph role="heading" id="hd_id3149946" xml-lang="en-US" level="2" l10n="U" oldref="12">Left-To-Right</paragraph>
-<table id="tbl_id2270882">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10784" xml-lang="en-US" l10n="NEW">
-<image id="img_id8354747" src="res/commandimagelist/sc_paralefttoright.png" width="0.222inch" height="0.222inch"><alt id="alt_id8354747" xml-lang="en-US">left to right icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149946" role="heading" level="2" l10n="U"
+                 oldref="12">Left-To-Right</paragraph>
+      <table id="tbl_id2270882">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN10784" role="tablecontent" l10n="NEW">
+<image id="img_id8354747" src="res/commandimagelist/sc_paralefttoright.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id8354747">left to right icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149964" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:ParaLeftToRight">The text is entered from left to right.</ahelp></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3149964" role="paragraph" l10n="U" oldref="13"><ahelp hid=".uno:ParaLeftToRight">The text is entered from left to right.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_PARA_RIGHT_TO_LEFT" id="bm_id25480" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_PARA_RIGHT_TO_LEFT" id="bm_id25480" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ParaRightToLeft" id="bm_id3147311" localize="false"/>
-<paragraph role="heading" id="hd_id3147300" xml-lang="en-US" level="2" l10n="U" oldref="14">Right-To-Left</paragraph>
-<table id="tbl_id3011566">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN107DF" xml-lang="en-US" l10n="NEW">
-<image id="img_id2405774" src="res/commandimagelist/sc_pararighttoleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id2405774" xml-lang="en-US">right to left icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3147300" role="heading" level="2" l10n="U"
+                 oldref="14">Right-To-Left</paragraph>
+      <table id="tbl_id3011566">
+         <tablerow>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_idN107DF" role="tablecontent" l10n="NEW">
+<image id="img_id2405774" src="res/commandimagelist/sc_pararighttoleft.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id2405774">right to left icon</alt>
 	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147625" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid=".uno:ParaRightToLeft">The text formatted in a complex text layout language is entered from right to left.</ahelp></paragraph>
-</tablecell>
-</tablerow>
-</table>
+            </tablecell>
+            <tablecell>
+               <paragraph xml-lang="en-US" id="par_id3147625" role="paragraph" l10n="U" oldref="15"><ahelp hid=".uno:ParaRightToLeft">The text formatted in a complex text layout language is entered from right to left.</ahelp></paragraph>
+            </tablecell>
+         </tablerow>
+      </table>
 
-</body>
-</helpdocument>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/main0203.xhp b/helpcontent2/source/text/swriter/main0203.xhp
index f80df6d263..3c6d596cc9 100755
--- a/helpcontent2/source/text/swriter/main0203.xhp
+++ b/helpcontent2/source/text/swriter/main0203.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0203.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp
index a1c1b61a1d..3293d59734 100755
--- a/helpcontent2/source/text/swriter/main0204.xhp
+++ b/helpcontent2/source/text/swriter/main0204.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0204.xhp,v $
- * $Revision: 1.7.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0205.xhp b/helpcontent2/source/text/swriter/main0205.xhp
index 6c59ec9e85..878e88d75b 100755
--- a/helpcontent2/source/text/swriter/main0205.xhp
+++ b/helpcontent2/source/text/swriter/main0205.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0205.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,26 +27,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswritermain0205xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Drawing Object Properties Bar</title>
 <filename>/text/swriter/main0205.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T15:24:10">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="objektleistezeichnung">
 <bookmark xml-lang="en-US" branch="hid/HID_DRAW_TOOLBOX" id="bm_id3147568" localize="false"/>
 <paragraph role="heading" id="hd_id3154275" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0205.xhp" name="Drawing Object Properties Bar">Drawing Object Properties Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3147578" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_DRAW_TOOLBOX">The <emph>Drawing Object Properties</emph> Bar that appears when a drawing object is selected contains functions for editing and positioning the drawing objects.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147578" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_DRAW_TOOLBOX">You can see the <emph>Drawing Object Properties</emph> bar in Writer and Calc. Select the menu View - Toolbars - Drawing Object Properties. The controls are enabled when a drawing object is selected. You see some different icons by default, whether the current document is a text document or a spreadsheet.</ahelp></paragraph>
 </section>
-<embed href="text/shared/01/05270000.xhp#punktebearbeiten"/>
-<embed href="text/shared/00/00040502.xhp#sypunktebearbeiten"/>
+
 <embed href="text/shared/01/05200000.xhp#linie"/>
 <embed href="text/shared/00/00040502.xhp#sylinie"/>
 <embed href="text/shared/02/05020000.xhp#linienendenstil"/>
diff --git a/helpcontent2/source/text/swriter/main0206.xhp b/helpcontent2/source/text/swriter/main0206.xhp
index 39c31c9afe..6085ab95c6 100755
--- a/helpcontent2/source/text/swriter/main0206.xhp
+++ b/helpcontent2/source/text/swriter/main0206.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0206.xhp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0208.xhp b/helpcontent2/source/text/swriter/main0208.xhp
index 08aedc5b15..30d6350e13 100755
--- a/helpcontent2/source/text/swriter/main0208.xhp
+++ b/helpcontent2/source/text/swriter/main0208.xhp
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,30 +31,36 @@
  -->
 
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textswritermain0208xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Status Bar</title>
-<filename>/text/swriter/main0208.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="status">
-<paragraph role="heading" id="hd_id3153397" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153414" xml-lang="en-US" l10n="CHG" oldref="2">The Status Bar contains information about the current document and offers various buttons with special functions. </paragraph>
-</section>
-<embed href="text/swriter/02/08010000.xhp#seitennummer"/>
-<embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/><paragraph role="heading" id="hd_id9648731" xml-lang="en-US" level="2" l10n="NEW">Language<comment>i80434</comment></paragraph>
-<paragraph role="paragraph" id="par_id8193914" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
-<embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
-<embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
-<embed href="text/swriter/02/08080000.xhp#kombinierteanzeige"/>
-<paragraph role="heading" id="hd_id8070314" xml-lang="en-US" level="2" l10n="NEW">Zoom &amp; View Layout</paragraph>
-<paragraph role="paragraph" id="par_id7723929" xml-lang="en-US" l10n="NEW">Three controls on the Writer Status Bar allow to change the zoom and view layout of your text documents. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewLayout" id="bm_id5961180" localize="false"/><paragraph role="paragraph" id="par_id3666188" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The View Layout icons show from left to right: Single column mode. View mode with pages side by side. Book mode with two pages as in an open book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomSlider" id="bm_id6407055" localize="false"/><paragraph role="paragraph" id="par_id8796349" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Drag the Zoom slider to the left to show more pages, drag to the right to zoom into a page and show a smaller area of the page.</ahelp></paragraph>
-<embed href="text/shared/02/20030000.xhp#maszstab"/>
-</body>
-</helpdocument>
+      <topic id="textswritermain0208xml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Status Bar</title>
+         <filename>/text/swriter/main0208.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="status">
+         <paragraph xml-lang="en-US" id="hd_id3153397" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="CHG" oldref="2">The Status Bar contains information about the current document and offers various buttons with special functions. </paragraph>
+      </section>
+      <embed href="text/swriter/02/08010000.xhp#seitennummer"/>
+      <embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/>
+
+<paragraph xml-lang="en-US" id="hd_id9648731" role="heading" level="1" l10n="NEW">Language<comment>i80434</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id8193914" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose Reset to Default Language to re-apply the default language for the selection or the paragraph. <br/>Choose More to open a dialog with more options.</ahelp></paragraph>
+
+      <embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
+      <embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
+      <embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
+      <paragraph xml-lang="en-US" id="hd_id0821200911015962" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0821200911015941" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+      <embed href="text/swriter/02/08080000.xhp#kombinierteanzeige"/>
+      <paragraph xml-lang="en-US" id="hd_id8070314" role="heading" level="2" l10n="NEW">Zoom &amp; View Layout</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7723929" role="paragraph" l10n="NEW">Three controls on the Writer Status Bar allow to change the zoom and view layout of your text documents. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewLayout" id="bm_id5961180" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3666188" role="paragraph" l10n="NEW"><ahelp hid=".">The View Layout icons show from left to right: Single column mode. View mode with pages side by side. Book mode with two pages as in an open book.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ZoomSlider" id="bm_id6407055" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8796349" role="paragraph" l10n="NEW"><ahelp hid=".">Drag the Zoom slider to the left to show more pages, drag to the right to zoom into a page and show a smaller area of the page.</ahelp></paragraph>
+      <embed href="text/shared/02/20030000.xhp#maszstab"/>
+   </body>
+</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/main0210.xhp b/helpcontent2/source/text/swriter/main0210.xhp
index 6dbf3353c5..788775c514 100755
--- a/helpcontent2/source/text/swriter/main0210.xhp
+++ b/helpcontent2/source/text/swriter/main0210.xhp
@@ -4,13 +4,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main0210.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,17 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswritermain0210xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Page Preview</title>
 <filename>/text/swriter/main0210.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T11:16:06">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="seitenansicht">
@@ -68,10 +61,6 @@
 <embed href="text/swriter/02/10030000.xhp#previewzoom"/>
 <embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
 <embed href="text/shared/00/00000403.xhp#syfullscreen"/>
-<embed href="text/swriter/02/10090000.xhp#drucken"/>
-<embed href="text/swriter/02/10090000.xhp#sydrucken"/>
-<embed href="text/swriter/02/10110000.xhp#doptionen"/>
-<embed href="text/swriter/02/10110000.xhp#sydoptionen"/>
-<embed href="text/shared/02/10100000.xhp#schliessen"/>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/main0213.xhp b/helpcontent2/source/text/swriter/main0213.xhp
index 62c0ec019b..ae80cb0024 100755
--- a/helpcontent2/source/text/swriter/main0213.xhp
+++ b/helpcontent2/source/text/swriter/main0213.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0213.xhp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0214.xhp b/helpcontent2/source/text/swriter/main0214.xhp
index 5916da3e2e..a533ebf4bc 100755
--- a/helpcontent2/source/text/swriter/main0214.xhp
+++ b/helpcontent2/source/text/swriter/main0214.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0214.xhp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0215.xhp b/helpcontent2/source/text/swriter/main0215.xhp
index ee6f331f0a..1c770ebfc1 100755
--- a/helpcontent2/source/text/swriter/main0215.xhp
+++ b/helpcontent2/source/text/swriter/main0215.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0215.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0216.xhp b/helpcontent2/source/text/swriter/main0216.xhp
index 7e59c57e77..c1c57164c9 100755
--- a/helpcontent2/source/text/swriter/main0216.xhp
+++ b/helpcontent2/source/text/swriter/main0216.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0216.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0220.xhp b/helpcontent2/source/text/swriter/main0220.xhp
index 7da64a9fdd..49b85e453d 100755
--- a/helpcontent2/source/text/swriter/main0220.xhp
+++ b/helpcontent2/source/text/swriter/main0220.xhp
@@ -5,13 +5,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0220.xhp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/main0503.xhp b/helpcontent2/source/text/swriter/main0503.xhp
index ad021c9a97..6eb904e578 100755
--- a/helpcontent2/source/text/swriter/main0503.xhp
+++ b/helpcontent2/source/text/swriter/main0503.xhp
@@ -6,13 +6,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main0503.xhp,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/makefile.mk b/helpcontent2/source/text/swriter/makefile.mk
index 86b290ab8a..4227006779 100644
--- a/helpcontent2/source/text/swriter/makefile.mk
+++ b/helpcontent2/source/text/swriter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,4 +72,4 @@ XHPFILES = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk